diff options
| author | friendica <info@friendica.com> | 2013-01-03 17:36:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-03 17:36:03 -0800 |
| commit | b00132339018efe95902900cbe0dabe5e2bbad0e (patch) | |
| tree | cd29918ea0211b499dee43c12d2126a3a03dcc7b /view | |
| parent | 9a8dec548010c0d1b5b18112dc7bbba79a247852 (diff) | |
| download | volse-hubzilla-b00132339018efe95902900cbe0dabe5e2bbad0e.tar.gz volse-hubzilla-b00132339018efe95902900cbe0dabe5e2bbad0e.tar.bz2 volse-hubzilla-b00132339018efe95902900cbe0dabe5e2bbad0e.zip | |
make the menu consistent and eliminate redundancy - though we need icons for mail and events (sorry Thomas if this breaks your themes in a bad way, but at least the menus make sense now).
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 | ||||
| -rw-r--r-- | view/tpl/nav.tpl | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index de51da983..0b3d35f24 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -214,7 +214,7 @@ header #banner #logo-text { -.nav-commlink, .nav-login-link { +.nav-commlink { display: block; height: 15px; margin-top: 67px; @@ -3618,6 +3618,7 @@ nav .nav-notify.show { display: block; } nav #nav-help-link, +nav #nav-login-link, nav #nav-search-link, nav #nav-directory-link, nav #nav-apps-link, diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index fda16540c..f8f9e1c06 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -59,19 +59,16 @@ </li> {{ endif }} - <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> + {{ if $nav.settings }} + <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">$nav.settings.1</span></a> <ul id="nav-site-menu" class="menu-popup"> {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} - {{ 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.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.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 }} - {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} - {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} </ul> </li> - + {{ endif }} {{ if $userinfo }} <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a> {{ if $localuser }} @@ -79,14 +76,17 @@ {{ for $nav.usermenu as $usermenu }} <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li> {{ endfor }} - - {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} - {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} + {{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }} + {{ 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.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} + {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} + </ul> {{ endif }} </li> {{ endif }} + {{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} {{ if $nav.help }} <li id="nav-help-link" class="nav-menu $sel.help"> |