diff options
| author | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
| commit | fb817a29a934a68f194a42c29d3ed11da2da558f (patch) | |
| tree | fdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23 /view/theme/dispy/nav.tpl | |
| parent | fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (diff) | |
| parent | 928e6c7ef78d251429a7d5c1fd4fdb8e6c282d41 (diff) | |
| download | volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.gz volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.bz2 volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/nav.tpl')
| -rw-r--r-- | view/theme/dispy/nav.tpl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 11469dc66..589d68352 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -5,7 +5,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - <div id="nav-floater"> +<div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a> @@ -33,17 +33,23 @@ works --> {{ endif }} {{ if $nav.network }} <a id="nav-network-link" class="nav-link $nav.network.2" - href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> + href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> {{ endif }} {{ if $nav.home }} <a id="nav-home-link" class="nav-link $nav.home.2" - href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> + href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> {{ endif }} {{ if $nav.login }} <a id="nav-login-link" class="nav-login-link $nav.login.2" - href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> + href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }} - </div> + </div> + + <div class="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> + </form> + </div> <div id="user-menu"> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> |