aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/nav.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-06 00:03:24 -0800
committerfriendica <info@friendica.com>2012-12-06 00:03:24 -0800
commitc6b8ab534f4516605ed276b9f8677f9cf578ea45 (patch)
treed920a212cf7cbf583f87d874e47dc98abd271dd7 /view/tpl/nav.tpl
parentd715febf7c981f8b65fddb0952e769df56ba081f (diff)
downloadvolse-hubzilla-c6b8ab534f4516605ed276b9f8677f9cf578ea45.tar.gz
volse-hubzilla-c6b8ab534f4516605ed276b9f8677f9cf578ea45.tar.bz2
volse-hubzilla-c6b8ab534f4516605ed276b9f8677f9cf578ea45.zip
fixed several little nit bugs that cropped up during deployment
Diffstat (limited to 'view/tpl/nav.tpl')
-rw-r--r--view/tpl/nav.tpl31
1 files changed, 16 insertions, 15 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5e909e172..234b20854 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -10,21 +10,6 @@
</li>
{{ endif }}
- {{ if $userinfo }}
- <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
- {{ if $localuser }}
- <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>
- {{ endif }}
- </li>
- {{ endif }}
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu $sel.network">
@@ -72,6 +57,22 @@
</ul>
</li>
+ {{ if $userinfo }}
+ <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+ {{ if $localuser }}
+ <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>
+ {{ endif }}
+ </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>