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

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

diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
index 1e14b1e72215128040cdb5e937cdb34027542a5d..adb9c9f073a7c1b210479ae5f322fc3da276ad66 100644 (file)
--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@@ -7,10 +7,10 @@
 
 <!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
        <div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-       <a class="system-menu-link nav-link" href="$nav.settings.0" title="Main Menu">
+       <a class="system-menu-link nav-link nav-menu-icon" href="$nav.settings.0" title="Main Menu" point="#system-menu-list">
        <img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
        </a>
-       <ul id="system-menu-list" class="nav-menu-list">
+       <ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
                {{ if $nav.login }}
                <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
                {{ endif }}
@@ -70,13 +70,15 @@
 
 <!--   <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
        <div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-       <a class="contacts-menu-link nav-link" href="$nav.contacts.0" title="Contacts">
+       <a class="contacts-menu-link nav-link nav-menu-icon" href="$nav.contacts.0" title="Contacts" point="#contacts-menu-list">
        <img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
        </a>
        {{ if $nav.introductions }}
+       <a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >
        <span id="intro-update" class="nav-ajax-left"></span>
+       </a>
        {{ endif }}
-       <ul id="contacts-menu-list" class="nav-menu-list">
+       <ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
                {{ if $nav.contacts }}
                <li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
                {{ endif }}
@@ -103,13 +105,13 @@
 
 <!--   <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
        <div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-       <a class="network-menu-link nav-link" href="$nav.network.0" title="Network">
+       <a class="nav-menu-icon network-menu-link nav-link" href="$nav.network.0" title="Network" point="#network-menu-list">
        <img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
        </a>
        {{ if $nav.network }}
        <span id="net-update" class="nav-ajax-left"></span>
        {{ endif }}
-       <ul id="network-menu-list" class="nav-menu-list">
+       <ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
                {{ if $nav.network }}
                <li>
                <a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
@@ -129,6 +131,14 @@
                {{ endif }}
        </ul>
        </div>
+
+       {{ if $nav.network }}
+       <div class="nav-button-container nav-menu-link" rel="#network-reset-button">
+       <a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">
+       <img class="network-reset-link" src="$baseurl/view/theme/frost/images/net-reset.png">
+       </a>
+       </div>
+       {{ endif }}
                
        </span>
        <!--<span id="nav-end"></span>-->
@@ -136,5 +146,5 @@
 </nav>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-       <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+       <li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>