aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-07 10:05:32 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-07 10:05:32 -0500
commit62fffdb018d7755e62b9bf897f3f6e68f42f3e6e (patch)
tree965444c7def7e3cace18f2a2bbac0dcee9442c3d /view
parentedfa7dbac2ff8ed054fce90cba40efcca6c85529 (diff)
parentdd2ff7c796302648992835940600c18fd200c388 (diff)
downloadvolse-hubzilla-62fffdb018d7755e62b9bf897f3f6e68f42f3e6e.tar.gz
volse-hubzilla-62fffdb018d7755e62b9bf897f3f6e68f42f3e6e.tar.bz2
volse-hubzilla-62fffdb018d7755e62b9bf897f3f6e68f42f3e6e.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix in navbar * master:
Diffstat (limited to 'view')
-rw-r--r--view/theme/diabook/icons/bug-x.gifbin134 -> 0 bytes
-rw-r--r--view/theme/diabook/nav.tpl11
2 files changed, 8 insertions, 3 deletions
diff --git a/view/theme/diabook/icons/bug-x.gif b/view/theme/diabook/icons/bug-x.gif
deleted file mode 100644
index 10936caa7..000000000
--- a/view/theme/diabook/icons/bug-x.gif
+++ /dev/null
Binary files differ
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 027a8b7b7..a77f4ce04 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -136,11 +136,16 @@
</ul>
+
+
</nav>
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
-<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 class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
<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>