X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2Fhead.html;h=efb5ddf19d206f819990b8cbe43600a660d856a8;hp=16c939104d3f0cad9ee03021aaded3319981df2a;hb=1b25052b79d18b8b7af4eae95358ae0635da46a1;hpb=49d9495df2c569a03b24925e1b0f3c9bcbd2f379

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index 16c9391..efb5ddf 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -1,123 +1,66 @@
-<div id="sone" class="<%ifnull ! currentSone>online<%else>offline<%/if>">
+<div id="sone">
 
 	<div id="formPassword"><% formPassword|html></div>
+	<div id="currentSoneId" class="hidden"><% currentSone.id|html></div>
+	<div id="loggedIn" class="hidden"><%ifnull !currentSone>true<%else>false<%/if></div>
 
 	<script src="javascript/jquery-1.4.2.js" language="javascript"></script>
+	<script src="javascript/jquery.url.js" language="javascript"></script>
+	<script src="javascript/jquery.fieldselection.js" language="javascript"></script>
 	<script src="javascript/sone.js" language="javascript"></script>
 
-	<script language="javascript">
-		/* this initializes the status update input field. */
-		$(document).ready(function() {
-			registerInputTextareaSwap("#sone #update-status .status-input", "WebInterface.DefaultText.StatusUpdate", "text", false, false);
-		});
-	</script>
+	<div id="offline-marker"></div>
 
-	<script language="javascript">
-		/* these functions are necessary for updating Sone statuses. */
-		$(document).ready(function() {
-			$("#sone .sone").each(function() {
-				watchSone($(this).find(".id").text());
-			});
-		});
-	</script>
-
-	<script language="javascript">
-		/* this initializes all reply input fields. */
-		$(document).ready(function() {
-			registerInputTextareaSwap("#sone input.reply-input", "WebInterface.DefaultText.Reply", "text", false, false);
-			addCommentLinks();
-		});
-	</script>
+	<div id="main">
 
-	<script language="javascript">
-		/* replace all “delete” buttons with javascript. */
-		$(document).ready(function() {
-			$("#sone .post").each(function() {
-				postId = $(this).attr("id");
-				enhanceDeletePostButton("#sone .post#" + postId + " > .status-line .delete button", postId);
-				(function(postId) {
-					$("#sone .post#" + postId + " .reply").each(function() {
-						replyId = $(this).attr("id");
-						(function(postId, reply, replyId) {
-							reply.find(".delete button").each(function() {
-								enhanceDeleteReplyButton("#sone .post#" + postId + " .reply#" + replyId + " .delete button", replyId);
-							})
-						})(postId, $(this), replyId);
-					});
-				})(postId);
-			});
-		});
-	</script>
+		<div id="notification-area">
 
-	<script language="javascript">
-		/* convert all “follow”, “unfollow”, “block”, and “unblock” links to something nicer. */
-		$(document).ready(function() {
-			$("#sone .follow").submit(function() {
-				var followElement = this;
-				$.getJSON("ajax/followSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
-					$(followElement).addClass("hidden");
-					$(followElement).parent().find(".unfollow").removeClass("hidden");
-				});
-				return false;
-			});
-			$("#sone .unfollow").submit(function() {
-				var unfollowElement = this;
-				$.getJSON("ajax/unfollowSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
-					$(unfollowElement).addClass("hidden");
-					$(unfollowElement).parent().find(".follow").removeClass("hidden");
-				});
-				return false;
-			});
-			$("#sone .block").submit(function() {
-				var blockElement = this;
-				$.getJSON("ajax/blockSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
-					$(blockElement).addClass("hidden");
-					$(blockElement).parent().find(".unblock").removeClass("hidden");
-				});
-				return false;
-			});
-			$("#sone .unblock").submit(function() {
-				var unblockElement = this;
-				$.getJSON("ajax/unblockSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
-					$(unblockElement).addClass("hidden");
-					$(unblockElement).parent().find(".block").removeClass("hidden");
-				});
-				return false;
-			});
-		});
-	</script>
+			<div id="notification-hash" class="hidden"><% notificationHash|html></div>
 
-	<script language="javascript">
-		/* convert all “like” buttons to javascript functions. */
-		$(document).ready(function() {
-			$("#sone .post > .status-line .like").submit(function() {
-				likePost(getPostId(this));
-				return false;
-			});
-			$("#sone .post > .status-line .unlike").submit(function() {
-				unlikePost(getPostId(this));
-				return false;
-			});
-			$("#sone .post .reply .status-line .like").submit(function() {
-				likeReply(getReplyId(this));
-				return false;
-			});
-			$("#sone .post .reply .status-line .unlike").submit(function() {
-				unlikeReply(getReplyId(this));
-				return false;
-			});
-		});
-	</script>
+			<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>
 
-	<div id="main">
+			<%foreach notifications notification>
+				<div class="notification" id="<% notification.id|html>" lastUpdatedTime="<%notification.lastUpdatedTime|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>
+					<%include notification>
+				</div>
+			<%/foreach>
+		</div>
 
 		<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
-			<a class="picture" href="index.html">&nbsp;</a>
+			<div class="avatar profile-avatar">
+				<a class="picture" href="index.html">
+					<%ifnull !currentSone>
+						<%ifnull !currentSone.avatar>
+							<%currentSone.avatar|image-link max-width=80 max-height=80 mode=enlarge title="Profile Avatar">
+						<%else>
+							<img src="/WebOfTrust/GetIdenticon?identity=<% currentSone.id|html>&amp;width=80&amp;height=80" width="80" height="80" alt="Profile Avatar" />
+						<%/if>
+					<%else>
+						<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
+					<%/if>
+				</a>
+			</div>
 			<%ifnull ! currentSone>
 				<div id="home-sone">
 					<% currentSone|store key=sone>
 					<%include include/viewSone.html>
-					<%include include/updateStatus.html>
 				</div>
 			<%/if>
+			<form id="search" action="search.html" method="get">
+				<input type="text" name="query" value="" />
+				<button type="submit"><%= View.Search.Button.Search|l10n|html></button>
+			</form>
 		</div>