projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.5.2'
[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
1d8e284
..
cd83600
100644
(file)
--- a/
src/main/resources/templates/include/head.html
+++ b/
src/main/resources/templates/include/head.html
@@
-1,8
+1,10
@@
<div id="sone" class="<%ifnull ! currentSone>online<%else>offline<%/if>">
<div id="formPassword"><% formPassword|html></div>
<div id="sone" class="<%ifnull ! currentSone>online<%else>offline<%/if>">
<div id="formPassword"><% formPassword|html></div>
+ <div id="currentSoneId" class="hidden"><% currentSone.id|html></div>
<script src="javascript/jquery-1.4.2.js" language="javascript"></script>
<script src="javascript/jquery-1.4.2.js" language="javascript"></script>
+ <script src="javascript/jquery.url.js" language="javascript"></script>
<script src="javascript/sone.js" language="javascript"></script>
<div id="main">
<script src="javascript/sone.js" language="javascript"></script>
<div id="main">
@@
-26,7
+28,7
@@
<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
</form>
<%/if>
<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
</form>
<%/if>
- <% notification>
+ <%
include
notification>
</div>
<%/foreach>
</div>
</div>
<%/foreach>
</div>
@@
-34,7
+36,7
@@
<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
<a class="picture" href="index.html">
<%ifnull !currentSone>
<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
<a class="picture" href="index.html">
<%ifnull !currentSone>
- <img src="/W
oT
/GetIdenticon?identity=<% currentSone.id|html>&width=80&height=80" width="80" height="80" alt="Profile Avatar" />
+ <img src="/W
ebOfTrust
/GetIdenticon?identity=<% currentSone.id|html>&width=80&height=80" width="80" height="80" alt="Profile Avatar" />
<%else>
<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
<%/if>
<%else>
<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
<%/if>
@@
-43,7
+45,6
@@
<div id="home-sone">
<% currentSone|store key=sone>
<%include include/viewSone.html>
<div id="home-sone">
<% currentSone|store key=sone>
<%include include/viewSone.html>
- <%include include/updateStatus.html>
</div>
<%/if>
</div>
</div>
<%/if>
</div>