aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/nav.tpl
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-19 12:24:40 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-19 12:24:40 +0100
commitea4be0db89b5e95b50211e023e94aa008aadae46 (patch)
tree2d0654cae606cb3e543463e5569c2b2e689e45d6 /view/theme/dispy/nav.tpl
parentc30342e2f7bde6fda899193f97ce3051cd8b2fdd (diff)
parent2349852b4abd1638624b541f173f51d1fb1ea011 (diff)
downloadvolse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.gz
volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.bz2
volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'view/theme/dispy/nav.tpl')
-rw-r--r--view/theme/dispy/nav.tpl16
1 files changed, 8 insertions, 8 deletions
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index f6e399ef5..11469dc66 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -57,14 +57,6 @@ works -->
</li>
{{ endif }}
-{{ if $userinfo }}
- <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 }}
- </ul>
-{{ endif }}
-
{{ if $nav.contacts }}
<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
{{ endif }}
@@ -94,6 +86,14 @@ works -->
</ul>
</div>
+{{ if $userinfo }}
+ <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 }}
+ </ul>
+{{ endif }}
+
<div id="notifications">
{{ if $nav.home }}
<a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>