Merge pull request #518 from fermionic/20121029-email-polling-array-size

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

diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
index 6ae19650e02bf5aea7875a4ac3555dfe099e0758..1e14b1e72215128040cdb5e937cdb34027542a5d 100644 (file)
--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@@ -8,7 +8,7 @@
 <!--   <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">
+       <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.login }}
@@ -19,16 +19,16 @@
                <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.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.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 }}
@@ -44,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 }}
@@ -57,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">
@@ -71,7 +71,7 @@
 <!--   <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">
+       <img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
        </a>
        {{ if $nav.introductions }}
        <span id="intro-update" class="nav-ajax-left"></span>
@@ -95,7 +95,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>
@@ -104,7 +104,7 @@
 <!--   <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">
+       <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>