Re-add search box in top navigation bar.

diff --git a/data/templates/base.html b/data/templates/base.html
index b164168ee5245b2f3946224fcb983f447412815b..2936a54b146285b0a5893d6aff4cbf9c9fc46b52 100644 (file)
--- 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>