🔀 Merge branch 'release/v82'

[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 ae642dc..71d5b17 100644 (file)
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -4,7 +4,7 @@
        <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-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>
@@ -40,17 +40,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">