diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-07 10:05:32 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-07 10:05:32 -0500 |
| commit | 62fffdb018d7755e62b9bf897f3f6e68f42f3e6e (patch) | |
| tree | 965444c7def7e3cace18f2a2bbac0dcee9442c3d | |
| parent | edfa7dbac2ff8ed054fce90cba40efcca6c85529 (diff) | |
| parent | dd2ff7c796302648992835940600c18fd200c388 (diff) | |
| download | volse-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:
| -rw-r--r-- | view/theme/diabook/icons/bug-x.gif | bin | 134 -> 0 bytes | |||
| -rw-r--r-- | view/theme/diabook/nav.tpl | 11 |
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 Binary files differdeleted file mode 100644 index 10936caa7..000000000 --- a/view/theme/diabook/icons/bug-x.gif +++ /dev/null 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> |
