diff options
| author | zottel <github@zottel.net> | 2012-03-17 01:49:17 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-17 01:49:17 +0100 |
| commit | c56e3c5dd4bcbb949282fd3b4c065ccfd4673726 (patch) | |
| tree | c4574eae6f2aaf68c50ccc1022944e0e1c45760b /view/theme/dispy/nav.tpl | |
| parent | ea4c806c5c3adacb6ef585de657e5f34c2e24c98 (diff) | |
| parent | 8af36b92bb3a78235f5741c764d034dc66b959b2 (diff) | |
| download | volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.gz volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.bz2 volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/nav.tpl')
| -rw-r--r-- | view/theme/dispy/nav.tpl | 16 |
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> |