X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2Fhead.html;h=41c79716eba62bb393d6fcb60dd4616e7c67a5c8;hb=e938f95daa9b917faeb04dc9b6445a1ced744cf6;hp=cf70729f34a00339864f8a06a91b7cf3a2067156;hpb=0e2b79c53a31b7aaa5e44e02a9c6491b4b973d5e;p=Sone.git

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index cf70729..41c7971 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -172,36 +172,18 @@
 	</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() {
+				ajaxifyNotification($(this));
+			});
 		});
 	</script>
 
 	<script language="javascript">
-		/* process all existing notifications, ajaxify dismiss buttons. */
+		/* activate notification polling. */
 		$(document).ready(function() {
-			$("#sone #notification-area .notification").each(function() {
-				ajaxifyNotificationArea($(this));
-			});
+			setTimeout(getNotifications, 5000);
 		});
 	</script>
 
@@ -214,7 +196,15 @@
 		<%/if>
 
 		<div id="notification-area">
-			<%foreach webInterface.core.notifications.all notification>
+
+			<form id="notification-dismiss-template" class="hidden 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="" />
+				<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
+			</form>
+
+			<%foreach webInterface.notifications.all notification>
 				<div class="notification" id="<% notification.id|html>">
 					<%if notification.dismissable>
 						<form class="dismiss" action="dismissNotification.html" method="post">
@@ -224,7 +214,7 @@
 							<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
 						</form>
 					<%/if>
-					<% notification.render>
+					<% notification>
 				</div>
 			<%/foreach>
 		</div>