diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
commit | 70709a882594250684c954a21d186877ea6f983c (patch) | |
tree | ee2f364e513f8fd9fa1e12da8f5cd39c36d9b403 /view/theme/diabook/nav.tpl | |
parent | 509ed2604fe6860b83e02984f8b4a280496a22a8 (diff) | |
parent | 42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6 (diff) | |
download | volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.gz volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.bz2 volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
view/de/strings.php
Diffstat (limited to 'view/theme/diabook/nav.tpl')
-rw-r--r-- | view/theme/diabook/nav.tpl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index a098ae8b7..8b32ebe6c 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -26,6 +26,7 @@ <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> + {{ endif }} {{ if $nav.messages }} @@ -140,8 +141,9 @@ <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="report bugs for the theme diabook"/></a></div> +<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div> +<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div> + |