From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 28 Apr 2011 04:45:26 +0000 (+0200)
Subject: Always show mark-as-read buttons in new-element notifications.
X-Git-Tag: 0.6.3^2~3
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=b0523edd6fbde022ee9c9a20a1e049811e9401c8

Always show mark-as-read buttons in new-element notifications.

This fixes #186.
---

diff --git a/src/main/resources/templates/notify/newPostNotification.html b/src/main/resources/templates/notify/newPostNotification.html
index 54008dc..0cd71ff 100644
--- a/src/main/resources/templates/notify/newPostNotification.html
+++ b/src/main/resources/templates/notify/newPostNotification.html
@@ -1,15 +1,15 @@
+<form class="mark-as-read" action="markAsKnown.html" method="post">
+	<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+	<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+	<input type="hidden" name="type" value="post" />
+	<input type="hidden" name="id" value="<%foreach posts post><% post.id|html><%notlast> <%/notlast><%/foreach>" />
+	<button type="submit" name="mark-read" value="true"><%= Notification.NewPost.Button.MarkRead|l10n|html></button>
+</form>
 <div class="short-text hidden">
 	<%= Notification.NewPost.ShortText|l10n|html>
 	<a class="link" onclick="showNotificationDetails('<%notification.id|html>'); return false;"><%= Notification.ClickHereToRead|l10n|html></a>
 </div>
 <div class="text">
-	<form class="mark-as-read" action="markAsKnown.html" method="post">
-		<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-		<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-		<input type="hidden" name="type" value="post" />
-		<input type="hidden" name="id" value="<%foreach posts post><% post.id|html><%notlast> <%/notlast><%/foreach>" />
-		<button type="submit" name="mark-read" value="true"><%= Notification.NewPost.Button.MarkRead|l10n|html></button>
-	</form>
 	<%= Notification.NewPost.Text|l10n|html>
 	<%foreach posts post>
 		<div class="hidden post-id"><%post.id|html></div>
diff --git a/src/main/resources/templates/notify/newReplyNotification.html b/src/main/resources/templates/notify/newReplyNotification.html
index ee8c410..a4588e5 100644
--- a/src/main/resources/templates/notify/newReplyNotification.html
+++ b/src/main/resources/templates/notify/newReplyNotification.html
@@ -1,15 +1,15 @@
+<form class="mark-as-read" action="markAsKnown.html" method="post">
+	<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+	<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+	<input type="hidden" name="type" value="reply" />
+	<input type="hidden" name="id" value="<%foreach replies reply><% reply.id|html><%notlast> <%/notlast><%/foreach>" />
+	<button type="submit" name="mark-read" value="true"><%= Notification.NewPost.Button.MarkRead|l10n|html></button>
+</form>
 <div class="short-text hidden">
 	<%= Notification.NewReply.ShortText|l10n|html>
 	<a class="link" onclick="showNotificationDetails('<%notification.id|html>'); return false;"><%= Notification.ClickHereToRead|l10n|html></a>
 </div>
 <div class="text">
-	<form class="mark-as-read" action="markAsKnown.html" method="post">
-		<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-		<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-		<input type="hidden" name="type" value="reply" />
-		<input type="hidden" name="id" value="<%foreach replies reply><% reply.id|html><%notlast> <%/notlast><%/foreach>" />
-		<button type="submit" name="mark-read" value="true"><%= Notification.NewPost.Button.MarkRead|l10n|html></button>
-	</form>
 	<%foreach replies reply><div class="hidden reply-id"><%reply.id|html></div><%/foreach>
 	<%= Notification.NewReply.Text|l10n|html>
 	<%foreach replies postGroup|replyGroup>
diff --git a/src/main/resources/templates/notify/newSoneNotification.html b/src/main/resources/templates/notify/newSoneNotification.html
index aaa0d14..03cacf2 100644
--- a/src/main/resources/templates/notify/newSoneNotification.html
+++ b/src/main/resources/templates/notify/newSoneNotification.html
@@ -1,15 +1,15 @@
+<form class="mark-as-read" action="markAsKnown.html" method="post">
+	<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+	<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+	<input type="hidden" name="type" value="sone" />
+	<input type="hidden" name="id" value="<%foreach sones sone><% sone.id|html><%notlast> <%/notlast><%/foreach>" />
+	<button type="submit" name="mark-read" value="true"><%= Notification.NewPost.Button.MarkRead|l10n|html></button>
+</form>
 <div class="short-text hidden">
 	<%= Notification.NewSone.ShortText|l10n|html>
 	<a class="link" onclick="showNotificationDetails('<%notification.id|html>'); return false;"><%= Notification.ClickHereToRead|l10n|html></a>
 </div>
 <div class="text">
-	<form class="mark-as-read" action="markAsKnown.html" method="post">
-		<input type="hidden" name="formPassword" value="<% formPassword|html>" />
-		<input type="hidden" name="returnPage" value="<% request.uri|html>" />
-		<input type="hidden" name="type" value="sone" />
-		<input type="hidden" name="id" value="<%foreach sones sone><% sone.id|html><%notlast> <%/notlast><%/foreach>" />
-		<button type="submit" name="mark-read" value="true"><%= Notification.NewPost.Button.MarkRead|l10n|html></button>
-	</form>
 	<%= Notification.NewSone.Text|l10n|html>
 	<%foreach sones sone>
 		<div class="hidden sone-id"><% sone.id|html></div>