diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-08 10:46:40 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-08 10:46:40 -0500 |
| commit | bc3051e113245f518e40bb1196521c9fc4ab7bbc (patch) | |
| tree | 8f1ef296d13b82a7e27a8eba183152292c885812 /view/theme/diabook/nav.tpl | |
| parent | d90c830332899629a6016f1767bb7dff7d0d56a9 (diff) | |
| parent | 08b5ede5a18647655a0c89f0c40118e2259117be (diff) | |
| download | volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.tar.gz volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.tar.bz2 volse-hubzilla-bc3051e113245f518e40bb1196521c9fc4ab7bbc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add links to /profiles, add some icons to diabook/icons, fixes in css
Update README
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
* master:
Diffstat (limited to 'view/theme/diabook/nav.tpl')
| -rw-r--r-- | view/theme/diabook/nav.tpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index a77f4ce04..aa72c4a5e 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -119,7 +119,8 @@ <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> {{ endfor }} - {{ if $nav.notifications }}<li><a class="menu-sep $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} + {{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }} + {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} </ul> @@ -141,6 +142,11 @@ </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/bluebug.png" 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> |