diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 12:30:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 12:30:13 -0400 |
| commit | e7b920c273efd8c6a70b90f701bd14f5c632d38f (patch) | |
| tree | 1b1aeb8b50a56774dc66ad68765f3462b91b5403 /view/theme/diabook/nav.tpl | |
| parent | f2e2632810ad3ac465edcf4cf80e1dc89e995c82 (diff) | |
| parent | e935b3a2253e2c1078ebecb7b9784029c94fb344 (diff) | |
| download | volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.tar.gz volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.tar.bz2 volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
theme file_as combobox for 2.0
css fixes in diabook-derivates
quattro: style pm pages
message: remove tabs, move new message link to aside, all message with gmail-style
quattro: tpl for "file as"
* master:
Diffstat (limited to 'view/theme/diabook/nav.tpl')
| -rw-r--r-- | view/theme/diabook/nav.tpl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 9acf1032c..99d69ab38 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -66,14 +66,12 @@ <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.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="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li> + {{ 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 }} - <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li> + {{ 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> - <li><a class="$nav.search.2" onClick="restore_boxes()" title="restore third column" style="cursor: pointer;">Restore right-hand column</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 }} @@ -101,7 +99,7 @@ </li> {{ endif }} - {{ if $nav.home }} + {{ if $nav.settings }} <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</a> <span id="home-update" class="nav-notify"></span> |