clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

This commit is contained in:
Domovoy 2012-07-29 22:43:49 +02:00
parent 7b2ca538c8 4f13618b18
commit 30d7db5e42
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/theme/frost-mobile/nav.tpl
View File

@ -13,6 +13,11 @@
<img rel="#system-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/menu.png"> <img rel="#system-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/menu.png">
<!-- </a>--> <!-- </a>-->
<ul id="system-menu-list" class="nav-menu-list"> <ul id="system-menu-list" class="nav-menu-list">
{{ if $nav.manage }}
<li>
<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
</li>
{{ endif }}
{{ if $nav.settings }} {{ if $nav.settings }}
<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li> <li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
{{ endif }} {{ endif }}
@ -120,7 +125,6 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }} {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
</span> </span>
<span id="nav-end"></span> <span id="nav-end"></span>
<span id="banner">$banner</span> <span id="banner">$banner</span>

7
view/theme/frost/nav.tpl
View File

@ -13,6 +13,12 @@
<img class="system-menu-link" src="/view/theme/frost/images/menu.png"> <img class="system-menu-link" src="/view/theme/frost/images/menu.png">
</a> </a>
<ul id="system-menu-list" class="nav-menu-list"> <ul id="system-menu-list" class="nav-menu-list">
{{ if $nav.manage }}
<li>
<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
</li>
{{ endif }}
{{ if $nav.settings }} {{ if $nav.settings }}
<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li> <li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
{{ endif }} {{ endif }}
@ -120,7 +126,6 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }} {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
</span> </span>
<span id="nav-end"></span> <span id="nav-end"></span>
<span id="banner">$banner</span> <span id="banner">$banner</span>