X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Ffrost%2Fnav.tpl;h=adb9c9f073a7c1b210479ae5f322fc3da276ad66;hb=449b44fe4c9049f7bf93e0b2e688a1f7de404c97;hp=da7554257d1c20c238a56906efa585115a35dc4f;hpb=4f13618b183407662912a1722efeeec547729510;p=friendica.git

diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
index da7554257d..adb9c9f073 100644
--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@@ -3,26 +3,32 @@
 
 	<div id="site-location">$sitelocation</div>
 
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
 	<span id="nav-link-wrapper" >
 
 <!--	<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">
-	<img class="system-menu-link" src="/view/theme/frost/images/menu.png">
+	<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">
-			{{ if $nav.manage }}
-			<li>
-			<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-			</li>
-			{{ endif }}
+	<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 }}
+
+		{{ if $nav.register }}
+		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+		{{ endif }}
 
 		{{ if $nav.settings }}
 		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
 		{{ endif }}
 
+		{{ if $nav.manage }}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+		</li>
+		{{ endif }}
+
 		{{ if $nav.profiles }}
 		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
 		{{ endif }}
@@ -38,7 +44,7 @@
 		{{ endif }}
 
 		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
 		{{ endif }}
 		
 		{{ if $nav.logout }}
@@ -51,7 +57,7 @@
 <!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->
 	<div class="nav-button-container">
 	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-	<img rel="#nav-notifications-menu" src="/view/theme/frost/images/notifications.png">
+	<img rel="#nav-notifications-menu" src="$baseurl/view/theme/frost/images/notifications.png">
 	</a>
 	<span id="notify-update" class="nav-ajax-left"></span>
 	<ul id="nav-notifications-menu" class="notifications-menu-popup">
@@ -64,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">
-	<img class="contacts-menu-link" src="/view/theme/frost/images/contacts.png">
+	<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 }}
@@ -89,7 +97,7 @@
 <!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->
 	<div class="nav-button-container">
 	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="/view/theme/frost/images/message.png">
+	<img src="$baseurl/view/theme/frost/images/message.png">
 	</a>
 	<span id="mail-update" class="nav-ajax-left"></span>
 	</div>
@@ -97,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">
-	<img class="network-menu-link" src="/view/theme/frost/images/network.png">
+	<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>
@@ -124,13 +132,19 @@
 	</ul>
 	</div>
 
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+	{{ 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>
+	<!--<span id="nav-end"></span>-->
 	<span id="banner">$banner</span>
 </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>