Merge of zykure's player_info JSON object plus a few bugfixes.

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

diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
index c364c7423e923e710f632e26e1c5b72fcee59201..2b9fb0c9d92150fc19fd4e1d05e0e27380082029 100644 (file)
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -1,28 +1,41 @@
 <%inherit file="base.mako"/>
+<%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="form_submitted" />
-    <table id="search_form" border="0">
+    <input type="hidden" name="fs" />
+    <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;"></td>
-            <td><input type="submit" /></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 style="border: none;">
+            <td style="text-align:right; border: none;"></td>
+            <td style="border: none;"><input type="submit" value="search" /></td>
         </tr>
     </table>
     </form>
-% endif
+% elif len(results) == 0:
+    <h1>Sorry, nothing found!</h1>
+% else:
 
 ##### player-only results #####
 % if result_type == "player":
@@ -34,7 +47,7 @@
     % for player in results:
     <tr>
         <td><a href="${request.route_url("player_info", id=player.player_id)}" name="Player info page for player #${player.player_id}">${player.nick_html_colors()|n}</a></td>
-        <td>${player.joined_pretty_date()}</td>
+        <td><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${player.joined_pretty_date()}</span></td>
     </tr>
     % endfor
 </table>
@@ -50,7 +63,7 @@
     % for server in results:
     <tr>
         <td><a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for server #${server.server_id}">${server.name}</a></td>
-        <td>${server.create_dt.strftime('%m/%d/%Y at %I:%M %p')}</td>
+        <td><span class="abstime" data-epoch="${server.epoch()}" title="${server.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${server.fuzzy_date()}</span></td>
     </tr>
     % endfor
 </table>
@@ -61,13 +74,43 @@
 <table>
     <tr>
         <th>Map</th>
-        <th>Created</th>
+        <th>Added</th>
     </tr>
     % for map in results:
     <tr>
         <td><a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for map #${map.map_id}">${map.name}</a></td>
-        <td>${map.create_dt.strftime('%m/%d/%Y at %I:%M %p')}</td>
+        <td><span class="abstime" data-epoch="${map.epoch()}" title="${map.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${map.fuzzy_date()}</span></td>
     </tr>
     % endfor
 </table>
 % endif
+
+##### game results #####
+% if result_type == "game":
+<table>
+    <tr>
+        <th></th>
+        <th>Map</th>
+        <th>Server</th>
+        <th>Time</th>
+    </tr>
+    % for (game, server, gmap) in results:
+    <tr>
+        <td><a class="btn btn-primary btn-small" href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">View</a></td>
+        <td><a href="${request.route_url("map_info", id=gmap.map_id)}" name="Map info page for map #${gmap.map_id}">${gmap.name}</a></td>
+        <td><a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for server #${server.server_id}">${server.name}</a></td>
+        <td><span class="abstime" data-epoch="${game.epoch()}" title="${game.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${game.fuzzy_date()}</span></td>
+    </tr>
+    % endfor
+</table>
+% endif
+
+<!-- navigation links -->
+${navlinks("search", results.page, results.last_page, search_query=query)}
+% endif
+
+<%block name="js">
+${parent.js()}
+</%block>
+
+