Merge remote branch 'upstream/master'

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

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index aa72c4a5e96a3a7a21db0381a20e6d7aa8df3084..9acf1032c15cf1a414c6191d9cdce098177b1f56 100644 (file)
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -1,7 +1,4 @@
 <header>
-       
-       
-       
        <div id="site-location">$sitelocation</div>
        <div id="banner">$banner</div>
 </header>
@@ -29,6 +26,7 @@
                                        <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
                                </ul>
                        </li>   
+
                        {{ endif }}
                        
                        {{ if $nav.messages }}
@@ -70,13 +68,11 @@
 
                                {{ 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.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-
-
                                                                                <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
                                                                                
-                                                                               <li><a class="$nav.search.2" href="friendica" title="About" >About</a></li>
+                                                                               <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+                                                                               
+                                                                               <li><a class="$nav.search.2" onClick="restore_boxes()" title="restore third column" style="cursor: pointer;">Restore right-hand column</a></li>
 
                                {{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
                                {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
@@ -143,8 +139,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="Fehlerreport für das Theme diaBook erstellen"/></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>
+
 
 
 
@@ -153,10 +150,6 @@
 </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>
-</ul>
-
 
 {#