From f9bdd44032c30ba783b98009581d91d78ddaecc2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Tue, 19 Oct 2010 20:22:37 +0200
Subject: [PATCH] Make the view of a Sone a lot prettier.

---
 src/main/resources/static/css/sone.css             | 60 +++++++++++++---------
 src/main/resources/templates/include/viewSone.html |  8 +--
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index 5a4b009..bfa445a 100644
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -113,7 +113,7 @@
 
 #sone .post .reply {
 	clear: both;
-	background-color: #eef;
+	background-color: #f0f0ff;
 	font-size: 85%;
 	margin: 1ex 0px;
 	padding: 1ex;
@@ -151,7 +151,7 @@
 
 #sone .post .create-reply {
 	clear: both;
-	background-color: #eef;
+	background-color: #f0f0ff;
 	padding: 0.5ex;
 }
 
@@ -159,39 +159,41 @@
 	display: none;
 }
 
+#sone .sone {
+	clear: both;
+	background-color: #f0f0ff;
+	border: 1px solid #ccc;
+	margin-bottom: 0.5ex;
+	padding: 0.5ex;
+}
+
 #sone .sone .profile-link {
-	display: inline;
+	display: block;
 }
 
-#sone .sone .request-uri {
-	display: inline;
+#sone .sone .short-request-uri {
+	clear: both;
+	float: right;
 }
 
 #sone .sone .unknown-marker, #sone .sone .download-marker, #sone .sone .insert-marker, #sone .sone .idle-marker, #sone .sone .modified-marker {
 	display: none;
 }
 
-#sone .sone.unknown .unknown-marker {
-	display: inline;
-}
-
-#sone .sone.idle .idle-marker {
-	display: inline;
-}
-
-#sone .sone.downloading .download-marker {
-	display: inline;
-}
-
-#sone .sone.inserting .insert-marker {
-	display: inline;
-}
-
-#sone .sone.modified .modified-marker {
+#sone .sone.unknown .unknown-marker, #sone .sone.idle .idle-marker, #sone .sone.downloading .download-marker, #sone .sone.inserting .insert-marker, #sone .sone.modified .modified-marker {
 	display: inline;
+	float: right;
+	border: solid 1px #ccc;
+	border-right: none;
+	border-top: none;
+	padding: 0 0.5ex;
+	position: relative;
+	right: -0.5ex;
+	top: -0.5ex
 }
 
 #sone .sone .last-update {
+	float: right;
 	display: inline;
 }
 
@@ -200,6 +202,17 @@
 	font-weight: bold;
 }
 
+#sone .sone form {
+	display: inline;
+	border: solid 1px #ccc;
+	border-left: none;
+	border-bottom: none;
+	padding: 0 0.5ex;
+	position: relative;
+	left: -0.5ex;
+	bottom: -0.5ex
+}
+
 #sone .sone form.block button, #sone .sone form.unblock button, #sone .sone form.follow button, #sone .sone form.unfollow button {
 	display: inline;
 	color: rgb(28, 131, 191);
@@ -214,10 +227,11 @@
 	color: rgb(255, 172, 0);
 }
 
-#sone .sone form {
+#sone .sone .spacer {
 	display: inline;
 }
 
+
 #sone h1 {
 	font-family: inherit;
 	font-size: 200%;
diff --git a/src/main/resources/templates/include/viewSone.html b/src/main/resources/templates/include/viewSone.html
index 5f001ba..dbcfa4d 100644
--- a/src/main/resources/templates/include/viewSone.html
+++ b/src/main/resources/templates/include/viewSone.html
@@ -1,11 +1,12 @@
 <div class="sone <% sone.status><%if sone.modified> modified<%/if>">
-	<div class="profile-link"><a href="viewSone.html?sone=<% sone.id>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
-	<div class="last-update">(<%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss">)</div>
 	<div class="unknown-marker" title="<%= View.Sone.Status.Unknown|l10n|html>">?</div>
 	<div class="modified-marker" title="<%= View.Sone.Status.Modified|l10n|html>">!</div>
 	<div class="download-marker" title="<%= View.Sone.Status.Downloading|l10n|html>">⬊</div>
 	<div class="insert-marker" title="<%= View.Sone.Status.Inserting|l10n|html>">⬈</div>
-	<div class="idle-marker" title="<%= View.Sone.Status.Idle|l10n|html>"></div>
+	<div class="idle-marker" title="<%= View.Sone.Status.Idle|l10n|html>">✔</div>
+	<div class="last-update"><%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss"></div>
+	<div class="profile-link"><a href="viewSone.html?sone=<% sone.id>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
+	<div class="short-request-uri"><% sone.requestUri|substring start=4 length=43|html></div>
 	<%ifnull ! currentSone>
 		<%if ! sone.current>
 			<%if sone.friend>
@@ -36,4 +37,5 @@
 			<%/if>
 		<%/if>
 	<%/if>
+	<div class="spacer">&nbsp;</div>
 </div>
-- 
2.7.4