diff options
| author | zottel <github@zottel.net> | 2012-04-20 13:42:33 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-20 13:42:33 +0200 |
| commit | 9663299da1be50eef4327778fae619fc6f9edef4 (patch) | |
| tree | 5cd9b93f16c344cf896ac8d4e2a4a818fe21e783 /view/theme/diabook/nav.tpl | |
| parent | 041f74dc775424f686a1cd95c00e0d63bfc4b99c (diff) | |
| parent | 0e25376e4afea4e5d96c233594feef0a35ca314c (diff) | |
| download | volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.gz volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.tar.bz2 volse-hubzilla-9663299da1be50eef4327778fae619fc6f9edef4.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/diabook/nav.tpl')
| -rw-r--r-- | view/theme/diabook/nav.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 522fb22b4..5f316bcdd 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -36,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> @@ -64,6 +62,8 @@ </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 }} @@ -101,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> |