diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 14:51:14 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 14:51:14 -0500 |
| commit | d647dbc6af33689d0baf4bafd72031d06dcf7577 (patch) | |
| tree | afd4db159aa0b36bdb1e8f17581283843bd9bcd5 /view/theme/diabook/nav.tpl | |
| parent | 2a3aaca88ded68a8ce926577d3faea2f3ef0ab50 (diff) | |
| parent | a9690dfe2d9358fcbb156644df2d12099ff798c4 (diff) | |
| download | volse-hubzilla-d647dbc6af33689d0baf4bafd72031d06dcf7577.tar.gz volse-hubzilla-d647dbc6af33689d0baf4bafd72031d06dcf7577.tar.bz2 volse-hubzilla-d647dbc6af33689d0baf4bafd72031d06dcf7577.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
remove "smilie" expansion for Diaspora logo
prevent duplicate likes
quattro: theme settings (a bit hackish)
add img
fixes in diabook
finalise spam storage model, begin driver changes.
fixes
template proc: add variable filters
* master:
Diffstat (limited to 'view/theme/diabook/nav.tpl')
| -rw-r--r-- | view/theme/diabook/nav.tpl | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 34a37ad2e..1f2f64f6a 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -1,6 +1,7 @@ <header> - {# $langselector version 0.01#} - + + + <div id="site-location">$sitelocation</div> <div id="banner">$banner</div> </header> @@ -53,7 +54,15 @@ <li class="empty">$emptynotifications</li> </ul> </li> - {{ endif }} + {{ endif }} + + {{ if $nav.search}} + <li id="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="text" value="" name="search"> + </form> + </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> <ul id="nav-site-menu" class="menu-popup"> @@ -61,7 +70,13 @@ {{ 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> + + <li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li> + + + <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li> + + <li><a class="$nav.search.2" href="friendica" title="About" >About</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 }} @@ -123,6 +138,12 @@ </nav> +<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div> +<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div> + + +<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> + <ul id="nav-notifications-template" style="display:none;" rel="template"> |