Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / theme / diabook / nav.tpl

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 5f316bcdd4f2023e0cfd4fe721c867b42f12d864..4165656bd4d2963f9ef12aec45f824a8979a393e 100644 (file)
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -67,9 +67,7 @@
                <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
                        <ul id="nav-site-menu" class="menu-popup">
                                {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}                           
-
-                               {{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-                                                                               
+                                       
                                {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}                                                                   
                                                                                
                                                                                 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
@@ -138,7 +136,7 @@
 </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 id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></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>