From 400a459052ed5a102142944fe9386c9d25438be4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Fri, 15 Apr 2011 06:55:42 +0200
Subject: [PATCH] Move permalinks behind the time, insert comment links after
 permalinks.

---
 src/main/resources/static/javascript/sone.js        | 4 ++--
 src/main/resources/templates/include/viewPost.html  | 6 +++---
 src/main/resources/templates/include/viewReply.html | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index b6987c3..7c3a064 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -769,7 +769,7 @@ function ajaxifyPost(postElement) {
 	});
 
 	/* add “comment” link. */
-	addCommentLink(getPostId(postElement), getPostAuthor(postElement), postElement, $(postElement).find(".post-status-line .time"));
+	addCommentLink(getPostId(postElement), getPostAuthor(postElement), postElement, $(postElement).find(".post-status-line .permalink-author"));
 
 	/* process all replies. */
 	replyIds = [];
@@ -829,7 +829,7 @@ function ajaxifyReply(replyElement) {
 			});
 		});
 	})(replyElement);
-	addCommentLink(getPostId(replyElement), getReplyAuthor(replyElement), replyElement, $(replyElement).find(".reply-status-line .time"));
+	addCommentLink(getPostId(replyElement), getReplyAuthor(replyElement), replyElement, $(replyElement).find(".reply-status-line .permalink-author"));
 
 	/* convert “show source” link into javascript function. */
 	$(replyElement).find(".show-reply-source").each(function() {
diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index 40fa891..8b7ccb8 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -41,11 +41,11 @@
 				</form>
 			</div>
 			<span class='separator'>·</span>
-			<div class="permalink"><a href="post://<%post.id|html>">[<%= View.Post.Permalink|l10n|html>]</a></div>
+			<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
 			<span class='separator'>·</span>
-			<div class="permalink"><a href="sone://<%post.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></div>
+			<div class="permalink permalink-post"><a href="post://<%post.id|html>">[<%= View.Post.Permalink|l10n|html>]</a></div>
 			<span class='separator'>·</span>
-			<div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
+			<div class="permalink permalink-author"><a href="sone://<%post.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></div>
 			<%if ! originalText|match key=parsedText>
 				<span class='separator'>·</span>
 				<div class="show-source"><a href="viewPost.html?post=<% post.id|html>&amp;raw=<%if raw>false<%else>true<%/if>"><%= View.Post.ShowSource|l10n|html></a></div>
diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index c5b087d..2fa4885 100644
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -14,9 +14,9 @@
 			<div class="reply-text text<%if raw> hidden<%/if>"><% parsedText></div>
 		</div>
 		<div class="reply-status-line status-line">
-			<div class="permalink"><a href="sone://<%reply.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></div>
-			<span class='separator'>·</span>
 			<div class="time"><% reply.time|date format="MMM d, yyyy, HH:mm:ss"></div>
+			<span class='separator'>·</span>
+			<div class="permalink permalink-author"><a href="sone://<%reply.sone.id|html>">[<%= View.Post.PermalinkAuthor|l10n|html>]</a></div>
 			<%if ! originalText|match key=parsedText>
 				<span class='separator'>·</span>
 				<div class="show-reply-source"><a href="viewPost.html?post=<% post.id|html>&amp;raw=<%if raw>false<%else>true<%/if>"><%= View.Post.ShowSource|l10n|html></a></div>
-- 
2.7.4