Incorporate bootstrap, fix nav and search.

[xonotic/xonstat.git] / xonstat / templates / nav.mako

diff --git a/xonstat/templates/nav.mako b/xonstat/templates/nav.mako
old mode 100755 (executable)
new mode 100644 (file)
index 62786d7..81823e1
--- a/xonstat/templates/nav.mako
+++ b/xonstat/templates/nav.mako
@@ -1,14 +1,16 @@
 <%def name="nav(active)">
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-inverse navbar-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+          <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
           </a>
-          <a class="brand" href="${request.route_url('main_index')}"><img src="/static/css/img/Xonotic_icon.png" /></a>
-          <div class="nav-collapse">
+          <a class="navbar-brand" href="${request.route_url('main_index')}">
+           <img src="/static/css/img/Xonotic_icon.png" />
+          </a>
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li 
                 % if active=="leaderboard":
@@ -36,15 +38,19 @@
                 % endif
                 ><a href="${request.route_url('map_index')}" title="Map Index">Maps</a></li>
             </ul>
-            <form id="navsearch" action="#" method="get">
-              <input type="text" class="input-small" placeholder="search" />
-              <select id="sselect">
-                <option>players</option>
-                <option>servers</option>
-                <option>maps</option>
-              </select>
-            </form>
-          </div><!--/.nav-collapse -->
+          </div>
+
+          <form class="navbar-form pull-right" action="${request.route_url('search')}" method="get">
+            <input type="hidden" name="fs" />
+            <input type="search" class="input-small search" placeholder="search" name="sval"/>
+            <select class="search" name="stype">
+              <option>players</option>
+              <option>servers</option>
+              <option>maps</option>
+            </select>
+          [<a href="${request.route_url('search')}" title="Advanced search">+</a>]
+          </form>
+
         </div>
       </div>
     </div>