Merge remote branch 'upstream/master'

[friendica.git] / view / theme / dispy-dark / nav.tpl

diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 11469dc6611f15c63567dbcf5f08c01414c0fed6..589d6835215759d539826a6b42a128945dfb1de4 100644 (file)
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/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>