aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-06 18:57:52 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-06 18:57:52 -0500
commitc4c98a998827fb0ec49d5b40d3e4439aa9146e24 (patch)
tree4fae326bc32c1a444cd5e956ae9dd518f2791b7a
parent668892b7a38547210b8162f9988844c99474b051 (diff)
parent05a52b2660a879a97d511b180e26fe12310d0464 (diff)
downloadvolse-hubzilla-c4c98a998827fb0ec49d5b40d3e4439aa9146e24.tar.gz
volse-hubzilla-c4c98a998827fb0ec49d5b40d3e4439aa9146e24.tar.bz2
volse-hubzilla-c4c98a998827fb0ec49d5b40d3e4439aa9146e24.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix in navbar * master:
-rw-r--r--view/theme/diabook/nav.tpl4
1 files changed, 4 insertions, 0 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 3a36e7daa..027a8b7b7 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -142,6 +142,10 @@
<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+ <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
{#