]> git.mxchange.org Git - friendica.git/blobdiff - view/theme/vier/nav.tpl
Merge pull request #649 from mexon/redirect_fix
[friendica.git] / view / theme / vier / nav.tpl
index 8c872864c2c0e2ad0a1b4c62d1387c3baca9da84..dfb35a62c009997b2a3345f0a16b2034710fe2c2 100644 (file)
@@ -6,20 +6,6 @@
 </header>
 <nav>
        <ul>
-               {{ if $userinfo }}
-                       <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-                               <ul id="nav-user-menu" class="menu-popup">
-                                       {{ for $nav.usermenu as $usermenu }}
-                                               <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-                                       {{ endfor }}
-                                       
-                                       {{ 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>
-                       </li>
-               {{ endif }}
-               
                {{ if $nav.community }}
                        <li id="nav-community-link" class="nav-menu $sel.community">
                                <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
                                <span id="home-update" class="nav-notify"></span>
                        </li>
                {{ endif }}
-               
-               {{ if $nav.notifications }}
-                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
-                               <span id="notify-update" class="nav-notify"></span>
-                               <ul id="nav-notifications-menu" class="menu-popup">
-                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-                                       <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-                                       <li class="empty">$emptynotifications</li>
-                               </ul>
-                       </li>           
-               {{ endif }}             
-               
-               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+               {{ if $nav.messages }}
+                       <li id="nav-messages-linkmenu" class="nav-menu">
+                               <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">$nav.messages.1
+                               <span id="mail-update" class="nav-notify"></span></a>
+                               <ul id="nav-messages-menu" class="menu-popup">
+                                       <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+                                        <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
+                               </ul>
+                        </li>           
+                {{ endif }}
+
+               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></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.help }} <li><a class="$nav.help.2" target="friendica-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>
+                               <li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a></li>
+                               {{ if $nav.delegations }}<li><a class="$nav.delegations.2" href="$nav.delegations.0" title="$nav.delegations.3">$nav.delegations.1</a></li>{{ endif }}
                                {{ if $nav.settings }}<li><a class="$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 }}
 
                                {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
                        </ul>           
                </li>
+               {{ if $nav.notifications }}
+                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify"></span></a>
+                               <span id="notify-update" class="nav-notify"></span>
+                               <ul id="nav-notifications-menu" class="menu-popup">
+                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+                                       <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+                                       <li class="empty">$emptynotifications</li>
+                               </ul>
+                       </li>           
+               {{ endif }}             
                
+<!--           
                {{ if $nav.help }} 
                <li id="nav-help-link" class="nav-menu $sel.help">
-                       <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+                       <a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
                </li>
                {{ endif }}
+-->
 
-               <li id="nav-search-link" class="nav-menu $sel.search">
-                       <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-               </li>
-               <li id="nav-directory-link" class="nav-menu $sel.directory">
-                       <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-               </li>
+               {{ if $userinfo }}
+                       <li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="$sitelocation">$userinfo.name</a>
+                       <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+                               <ul id="nav-user-menu" class="menu-popup">
+                                       {{ for $nav.usermenu as $usermenu }}
+                                               <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+                                       {{ endfor }}
+                                       {{ 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>
+                       </li>
+               {{ endif }}
+               
+               {{ if $nav.search}}
+                <li id="search-box">
+                        <form method="get" action="$nav.search.0">
+                               <input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+                        </form>
+                </li>
+               {{ endif }}
                
                {{ if $nav.apps }}
                        <li id="nav-apps-link" class="nav-menu $sel.apps">
 
 </nav>
 <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>
+       <li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
 {#
 <span id="nav-link-wrapper" >
 
 {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-       
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
        
 {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
 
 {{ endif }}
 
 {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
 {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
 {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}