X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2Fhead.html;h=1b8974797fe688014958c985fe5f403584769366;hb=8f17578011b4a87bafed326bd039a0786713e193;hp=80614097ee52662fe85c5faaabc2684fd7ef4eb9;hpb=f0ee21d46819b4e242e9876bde3cfa911ad3a910;p=Sone.git

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index 8061409..1b89747 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -18,7 +18,7 @@
 		/* these functions are necessary for updating Sone statuses. */
 		$(document).ready(function() {
 			$("#sone .sone").each(function() {
-				watchSone($(this).find(".id").text());
+				watchSone($(this).find(".id").text(), $(this).hasClass("local"));
 			});
 		});
 	</script>
@@ -172,27 +172,11 @@
 	</script>
 
 	<script language="javascript">
-		/* display large notification about new replies and posts. */
+		/* process all existing notifications, ajaxify dismiss buttons. */
 		$(document).ready(function() {
-			newPostCount = $("#sone .post.new").length;
-			newReplyCount = $("#sone .reply.new").length;
-			if ((newPostCount + newReplyCount) == 0) {
-				return;
-			}
-			if (newPostCount > 0) {
-				postNotification = $("<div></div>").addClass("notification");
-				getTranslation("WebInterface.Notification.NewPostCount", function(text) {
-					postNotification.append($("<div></div>").text(text)).append($("<div></div>").addClass("post-count").text(newPostCount));
-				});
-				postNotification.appendTo("#sone #notification-area");
-			}
-			if (newReplyCount > 0) {
-				replyNotification = $("<div></div>").addClass("notification");
-				getTranslation("WebInterface.Notification.NewReplyCount", function(text) {
-					replyNotification.append($("<div></div>").text(text)).append($("<div></div>").addClass("post-count").text(newReplyCount));
-				});
-				replyNotification.appendTo("#sone #notification-area");
-			}
+			$("#sone #notification-area .notification").each(function() {
+				ajaxifyNotificationArea($(this));
+			});
 		});
 	</script>
 
@@ -204,7 +188,21 @@
 			</div>
 		<%/if>
 
-		<div id="notification-area"></div>
+		<div id="notification-area">
+			<%foreach webInterface.notifications.all notification>
+				<div class="notification" id="<% notification.id|html>">
+					<%if notification.dismissable>
+						<form class="dismiss" action="dismissNotification.html" method="post">
+							<input type="hidden" name="formPassword" value="<% formPassword|html>" />
+							<input type="hidden" name="returnPage" value="<% request.uri|html>" />
+							<input type="hidden" name="notification" value="<% notification.id|html>" />
+							<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
+						</form>
+					<%/if>
+					<% notification>
+				</div>
+			<%/foreach>
+		</div>
 
 		<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
 			<a class="picture" href="index.html">