diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-21 19:26:24 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-21 19:26:24 +0200 |
| commit | 71e2dbf3522dcf076458805ee65dc976fb35a6f3 (patch) | |
| tree | 5c11d463eff15245458f5033d7d425671df8f1d0 /view/theme/diabook-blue/nav.tpl | |
| parent | a147d6113c081694d4209002fa5e57106d4c6f41 (diff) | |
| parent | bdbe068b95e8c302179530dff7583997ff35f246 (diff) | |
| download | volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.gz volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.bz2 volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/diabook-blue/nav.tpl')
| -rw-r--r-- | view/theme/diabook-blue/nav.tpl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index fd29d9309..5f316bcdd 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -26,6 +26,7 @@ <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> + {{ endif }} {{ if $nav.messages }} @@ -35,8 +36,6 @@ <span id="mail-update" class="nav-notify"></span></a> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li> - <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> </li> @@ -63,16 +62,18 @@ </li> {{ endif }} + <li style="width: 1%; height: 1px;float: right;"></li> + <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> <ul id="nav-site-menu" class="menu-popup"> {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} {{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }} - - {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} + + {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li> - + {{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} @@ -82,13 +83,13 @@ </ul> </li> + {{ if $nav.directory }} <li id="nav-directory-link" class="nav-menu $sel.directory"> <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> </li> {{ endif }} - {{ if $nav.apps }} <li id="nav-apps-link" class="nav-menu $sel.apps"> <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a> @@ -100,7 +101,7 @@ </li> {{ endif }} - {{ if $nav.settings }} + {{ if $nav.home }} <li id="nav-home-link" class="nav-menu $sel.home"> <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1 <span id="home-update" class="nav-notify"></span></a> @@ -143,6 +144,7 @@ + <ul id="nav-notifications-template" style="display:none;" rel="template"> <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> </ul> |