diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-17 08:44:36 +0100 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-17 08:44:36 +0100 |
commit | 96da328acf838faff3fe823f3dd7557d16fe1d8b (patch) | |
tree | fb26adfc9fc61077033fa707fae24ba70ee9876a /view/theme/dispy/nav.tpl | |
parent | 74c64ef2d244df47b2bea6527bbeb5cc62ca8845 (diff) | |
parent | 057a142b8cd01cd8ab6212e9d958989c82dfccc3 (diff) | |
download | volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.gz volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.bz2 volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.zip |
Merge branch 'master' of https://github.com/friendica/friendica
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> |