Add advanced search to the top nav.

diff --git a/xonstat/templates/nav.mako b/xonstat/templates/nav.mako
index 9c29100217ce8b01dfd0173de09c4fb4a1f4262e..288fd2e23434d1e62eac364f888edabef584325a 100755 (executable)
--- a/xonstat/templates/nav.mako
+++ b/xonstat/templates/nav.mako
@@ -44,6 +44,7 @@
                 <option>servers</option>
                 <option>maps</option>
               </select>
+            [<a href="${request.route_url('search')}"" title="Advanced search">+</a>]
             </form>
           </div><!--/.nav-collapse -->
         </div>

diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
index ea227dd0237984715dabf0e5b00038cd636cf058..12768f0188d85e727c0fc3f0dfe38a4749105f64 100755 (executable)
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -2,33 +2,34 @@
 <%namespace file="navlinks.mako" import="navlinks" />
 
 % if results == None:
+<h2>Advanced Search</h2>
 <form action="${request.route_url("search")}" method="get">
     <input type="hidden" name="fs" />
-    <table id="search_form" class="table table-bordered table-condensed" border="0">
+    <table style="border: none;" id="search_form" border="0">
         <tr>
-            <td style="text-align:right;">Nick:</td>
-            <td><input type="text" name="nick" /></td>
+            <td style="text-align:right; border: none;">Nick:</td>
+            <td style="border: none;"><input type="text" name="nick" /></td>
         </tr>
-        <tr>
-            <td style="text-align:right;">Server:</td>
-            <td><input type="text" name="server_name" /></td>
+        <tr style="border: none;">
+            <td style="text-align:right; border: none;">Server:</td>
+            <td style="border: none;"><input type="text" name="server_name" /></td>
         </tr>
-        <tr>
-            <td style="text-align:right;">Map:</td>
-            <td><input type="text" name="map_name" /></td>
+        <tr style="border: none;">
+            <td style="text-align:right; border: none;">Map:</td>
+            <td style="border: none;"><input type="text" name="map_name" /></td>
         </tr>
-        <tr>
-            <td style="text-align:right;">Game Type:</td>
-            <td>
+        <tr style="border: none;">
+            <td style="text-align:right; border: none;">Game Type:</td>
+            <td style="border: none;">
                 <input type="checkbox" name="dm" />Deathmatch<br/>
                 <input type="checkbox" name="duel" />Duel<br/>
                 <input type="checkbox" name="ctf" />Capture The Flag<br/>
                 <input type="checkbox" name="tdm" />Team Deathmatch<br/>
             </td>
         </tr>
-        <tr>
-            <td style="text-align:right;"></td>
-            <td><input type="submit" value="search" /></td>
+        <tr style="border: none;">
+            <td style="text-align:right; border: none;"></td>
+            <td style="border: none;"><input type="submit" value="search" /></td>
         </tr>
     </table>
     </form>