X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2Fhead.html;h=7e731ad3e0c41d6b997c05f6e19e6764df2dd6ab;hb=5848b2358570c2ba83ec4e158b0285fbe3230f94;hp=e006967d76cf0cbb6f199196c0f78ad42cf841b9;hpb=361453d9f99f1580ec79b6618bddd6a379523318;p=Sone.git

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index e006967..7e731ad 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -1,21 +1,66 @@
 <div id="sone">
 
-	<script src="javascript/jquery-1.4.2.js" language="javascript"></script>
+	<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.9.0.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/jquery-migrate-1.4.1.js"></script>
 	<script src="javascript/sone.js" language="javascript"></script>
 
-	<script language="javascript">
-		$(document).ready(function() {
-			registerInputTextareaSwap("#sone #update-status .status-input", "What are you doing?");
-		});
-	</script>
+	<div id="offline-marker"></div>
 
 	<div id="main">
 
+		<div id="notification-area">
+
+			<div id="notification-hash" class="hidden"><% notificationHash|html></div>
+
+			<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 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"></a>
-			<div class="nice-name profile-link"><a href="viewSone.html?sone=<% currentSone.id|html>"><% currentSone.niceName|html></a></div>
-			<div class="edit-profile-link"><a href="editProfile.html"><%= View.Head.ProfileLink.Text|l10n|html></a></div>
+			<div class="avatar profile-avatar">
+				<a class="picture" href="index.html">
+					<%ifnull !currentSone>
+						<%ifnull !currentSone.profile.avatar>
+							<%currentSone.profile.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>
-				<%include include/updateStatus.html>
+				<div id="home-sone">
+					<%include include/viewSone.html sone=currentSone>
+				</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>