From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Dec 2012 13:59:07 +0000 (+0100)
Subject: Re-add search box in top navigation bar.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b0f751763fed423d13179b631ae11dc8d285872;p=people%2Fjschlag%2Fpbs.git

Re-add search box in top navigation bar.
---

diff --git a/data/templates/base.html b/data/templates/base.html
index b164168..2936a54 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -116,14 +116,8 @@
 								</ul>
 							</li>
 						</ul>
-					
-						<ul class="nav pull-right">
-							<li>
-								<a href="/search">
-									<i class="icon-search icon-white"></i>
-								</a>
-							</li>
 
+						<ul class="nav pull-right">
 							<li class="divider-vertical"></li>
 
 							{% if current_user %}
@@ -194,6 +188,10 @@
 								</li>
 							{% end %}
 						</ul>
+
+						<form class="navbar-search pull-right" method="GET" action="/search">
+							<input type="text" class="search-query" id="search" placeholder="{{ _("Search...") }}" name="q">
+						</form>
 					</div>
 				</div>
 			</div>