Show custom avatar where applicable.

[Sone.git] / src / main / resources / templates / include / head.html

diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index ef3b34b..efb5ddf 100644 (file)
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -1,16 +1,22 @@
-<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>
 
+       <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 +24,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,13 +40,19 @@
                </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.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>