X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fresources%2Ftemplates%2Finclude%2Fhead.html;h=71d5b17c1f0885ec598967f98db3f2d33b795f7a;hb=faf66247a34f64946990a985d2ea3003465969cb;hp=612440ac1eb0f53ff69ac5fa8eb930931a6469c8;hpb=f3eae8bc4cbba40b5774227360a4a632a41a0b78;p=Sone.git

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index 612440a..71d5b17 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -1,19 +1,65 @@
 <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-3.4.1.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>
 
-	<div id="sidebar">
-		
-		<div id="profile">
-			<div class="picture"><img src="images/sone.png" width="80" height="80" alt="Sone Logo" /></div>
-			<div class="nice-name profile-link"><a href="viewSone.html?sone=<% currentSone.id>"><% currentSone.niceName|html></a></div>
-			<div><a href="editProfile.html"><%= View.Head.ProfileLink.Text|l10n|html></a></div>
+	<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="links">
+
+		<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
+			<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">
+					<%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>
-		
-	</div>
-	
-	<div id="main">