From 36af6a6efdac06222844893180d39f611dd29a42 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Wed, 19 Jan 2011 15:57:00 +0100
Subject: [PATCH] =?utf8?q?Add=20=E2=80=9Cmark=20as=20read=E2=80=9D=20butto?=
 =?utf8?q?ns=20to=20new=20post,=20reply,=20and=20Sone=20notifications.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/i18n/sone.en.properties                    |  1 +
 src/main/resources/static/css/sone.css                        |  4 ++++
 src/main/resources/static/javascript/sone.js                  |  5 +++++
 src/main/resources/templates/include/head.html                |  2 +-
 src/main/resources/templates/notify/newPostNotification.html  | 11 +++++++++--
 src/main/resources/templates/notify/newReplyNotification.html | 11 +++++++++--
 src/main/resources/templates/notify/newSoneNotification.html  | 11 +++++++++--
 7 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 7b8450f..e608358 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -233,6 +233,7 @@ Notification.NewSone.ShortText=New Sones have been discovered:
 Notification.NewSone.Text=New Sones have been discovered:
 Notification.NewPost.ShortText=New posts have been discovered.
 Notification.NewPost.Text=New posts have been discovered by the following Sones:
+Notification.NewPost.Button.MarkRead=Mark as read
 Notification.NewReply.ShortText=New replies have been discovered.
 Notification.NewReply.Text=New replies have been discovered by the following Sones:
 Notification.SoneIsBeingRescued.Text=The following Sones are currently being rescued:
diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index 323cb0e..a83d3a1 100644
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -108,6 +108,10 @@ textarea {
 	margin-left: 1ex;
 }
 
+#sone #notification-area .notification .mark-as-read {
+	float: right;
+}
+
 #sone #plugin-warning {
 	border: solid 0.5em red;
 	padding: 0.5em;
diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 9d00c5a..b48dac3 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -680,6 +680,11 @@ function ajaxifyNotification(notification) {
 	notification.find("form.dismiss").submit(function() {
 		return false;
 	});
+	notification.find("input[name=returnPage]").val($.url.attr("relative"));
+	if (notification.find(".short-text").length > 0) {
+		notification.find(".short-text").removeClass("hidden");
+		notification.find(".text").addClass("hidden");
+	}
 	notification.find("form.dismiss button").click(function() {
 		$.getJSON("dismissNotification.ajax", { "formPassword" : getFormPassword(), "notification" : notification.attr("id") }, function(data, textStatus) {
 			/* dismiss in case of error, too. */
diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index 4e43da4..aec46cf 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -27,7 +27,7 @@
 							<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
 						</form>
 					<%/if>
-					<% notification>
+					<%include notification request=request>
 				</div>
 			<%/foreach>
 		</div>
diff --git a/src/main/resources/templates/notify/newPostNotification.html b/src/main/resources/templates/notify/newPostNotification.html
index 94f7a1f..e5d7792 100644
--- a/src/main/resources/templates/notify/newPostNotification.html
+++ b/src/main/resources/templates/notify/newPostNotification.html
@@ -1,8 +1,15 @@
-<div class="short-text">
+<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 hidden">
+<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>
 		<a href="viewPost.html?post=<% post.id|html>"><% post.sone.niceName|html></a><%notlast>,<%/notlast><%last>.<%/last>
diff --git a/src/main/resources/templates/notify/newReplyNotification.html b/src/main/resources/templates/notify/newReplyNotification.html
index d6d0670..2a194f2 100644
--- a/src/main/resources/templates/notify/newReplyNotification.html
+++ b/src/main/resources/templates/notify/newReplyNotification.html
@@ -1,8 +1,15 @@
-<div class="short-text">
+<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 hidden">
+<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>
 	<%= Notification.NewReply.Text|l10n|html>
 	<%foreach replies reply>
 		<a href="viewPost.html?post=<% reply.post.id|html>"><% reply.sone.niceName|html></a><%notlast>,<%/notlast><%last>.<%/last>
diff --git a/src/main/resources/templates/notify/newSoneNotification.html b/src/main/resources/templates/notify/newSoneNotification.html
index 8389f7a..45357b1 100644
--- a/src/main/resources/templates/notify/newSoneNotification.html
+++ b/src/main/resources/templates/notify/newSoneNotification.html
@@ -1,8 +1,15 @@
-<div class="short-text">
+<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 hidden">
+<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>
 		<a href="viewSone.html?sone=<% sone.id|html>" title="<% sone.requestUri|html>"><% sone.niceName|html></a><%notlast>,<%/notlast><%last>.<%/last>
-- 
2.7.4