X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2Fhead.html;h=e4334e6cd6701c54c6543363fc4b65f84222ff08;hb=469ed8586f976dc6414229ec5334950a3cc98986;hp=ef3b34b63068f8a615bdd7597892b2070181979f;hpb=99202fc71976dda021446626a0147431e419299e;p=Sone.git

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index ef3b34b..e4334e6 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -1,16 +1,23 @@
-<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-1.6.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>
 
+	<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>" />
@@ -18,7 +25,7 @@
 				<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
 			</form>
 
-			<%foreach webInterface.notifications.all notification>
+			<%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">
@@ -34,17 +41,22 @@
 		</div>
 
 		<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
-			<a class="picture" href="index.html">
-				<%ifnull !currentSone>
-					<img src="/WebOfTrust/GetIdenticon?identity=<% currentSone.id|html>&amp;width=80&amp;height=80" width="80" height="80" alt="Profile Avatar" />
-				<%else>
-					<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
-				<%/if>
-			</a>
+			<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>
 				<div id="home-sone">
-					<% currentSone|store key=sone>
-					<%include include/viewSone.html>
+					<%include include/viewSone.html sone=currentSone>
 				</div>
 			<%/if>
 			<form id="search" action="search.html" method="get">