X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Fsearch.mako;h=7637a3af5f6ddd3b87fae345861ffce5ce16d318;hb=56b928c935f3114a3d9c12c2f97c15d45b0f293e;hp=edbf7d0b2be53a37d6f64b7bfe24aba292b043c2;hpb=47fa38ae6fc3c0efc9299fd18e0468a10d3ddfbd;p=xonotic%2Fxonstat.git

diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
old mode 100755
new mode 100644
index edbf7d0..7637a3a
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -1,100 +1,209 @@
 <%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
 <%namespace file="navlinks.mako" import="navlinks" />
 
+<%block name="navigation">
+${nav.nav('games')}
+</%block>
+
 % if results == None:
-<form action="${request.route_url("search")}" method="get">
-    <input type="hidden" name="fs" />
-    <table id="search_form" border="0">
-        <tr>
-            <td style="text-align:right;">Nick:</td>
-            <td><input type="text" name="nick" /></td>
-        </tr>
-        <tr>
-            <td style="text-align:right;">Server:</td>
-            <td><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>
-        <tr>
-            <td style="text-align:right;"></td>
-            <td><input type="submit" /></td>
-        </tr>
-    </table>
+
+<%block name="title">
+Advanced Search
+</%block>
+
+<div class="row">
+  <div class="span6 offset3">
+
+
+    <form style="margin-top: 20px;" class="form-horizontal">
+      <fieldset>
+
+        <!-- Form submitted? -->
+        <input type="hidden" name="fs" />
+
+        <!-- Text input-->
+        <div class="control-group">
+          <label class="control-label">Nick</label>
+          <div class="controls">
+            <input id="nick" name="nick" type="text" placeholder="player nick" class="input-xlarge">
+            <p class="help-block"></p>
+          </div>
+        </div>
+
+        <!-- Text input-->
+        <div class="control-group">
+          <label class="control-label">Server</label>
+          <div class="controls">
+            <input id="server_name" name="server_name" type="text" placeholder="server name" class="input-xlarge">
+            <p class="help-block"></p>
+          </div>
+        </div>
+
+        <!-- Text input-->
+        <div class="control-group">
+          <label class="control-label">Map</label>
+          <div class="controls">
+            <input id="map_name" name="map_name" type="text" placeholder="map name" class="input-xlarge">
+            <p class="help-block"></p>
+          </div>
+        </div>
+
+        <!-- Multiple Checkboxes -->
+        <div class="control-group">
+          <label class="control-label">Game Types</label>
+          <div class="controls">
+            <label class="checkbox">
+              <input type="checkbox" name="dm" value="Deathmatch">
+              Deathmatch
+            </label>
+            <label class="checkbox">
+              <input type="checkbox" name="duel" value="Duel">
+              Duel
+            </label>
+            <label class="checkbox">
+              <input type="checkbox" name="ctf" value="Capture The Flag">
+              Capture The Flag
+            </label>
+            <label class="checkbox">
+              <input type="checkbox" name="tdm" value="Team Deathmatch">
+              Team Deathmatch
+            </label>
+          </div>
+        </div>
+
+        <!-- Button -->
+        <div class="control-group">
+          <label class="control-label"></label>
+          <div class="controls">
+            <button id="submit" name="submit" type="submit" class="btn btn-primary">Submit</button>
+          </div>
+        </div>
+
+      </fieldset>
     </form>
-% elif len(results) == 0:
-    <h1>Sorry, nothing found!</h1>
-% else:
+
+  </div>
+</div>
+
+
+    % elif len(results) == 0:
+<div class="row">
+  <div class="span6 offset3">
+    <h1 class="text-center">Sorry, nothing found!</h1>
+  </div>
+</div>
+    % else:
+
 
 ##### player-only results #####
 % if result_type == "player":
-<table>
-    <tr>
-        <th>Player</th>
-        <th>Joined</th>
-    </tr>
-    % 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>
-    </tr>
-    % endfor
-</table>
+<div class="row">
+  <div class="span6 offset3">
+    <table class="table table-hover table-condensed">
+      <tr>
+        <th style="width:100px;">Player ID</th>
+        <th>Nick</th>
+        <th class="create-dt">Joined</th>
+        <th></th>
+      </tr>
+      % for player in results:
+      <tr>
+        <td>${player.player_id}</th>
+        <td class="player-nick"><a href="${request.route_url("player_info", id=player.player_id)}" title="Go to this player's info page">${player.nick_html_colors()|n}</a></th>
+        <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></th>
+        <td class="tdcenter">
+          <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="View recent games by this player">
+            <i class="glyphicon glyphicon-list"></i>
+          </a>
+        </td>
+      </tr>
+      % endfor
+    </table>
 % endif
 
 ##### server-only results #####
 % if result_type == "server":
-<table>
-    <tr>
-        <th>Server</th>
-        <th>Created</th>
-    </tr>
-    % 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>
-    </tr>
-    % endfor
-</table>
+<div class="row">
+  <div class="span8 offset2">
+    <table class="table table-hover table-condensed">
+      <tr>
+        <th style="width:60px;">ID</th>
+        <th>Name</th>
+        <th class="create-dt">Added</th>
+        <th></th>
+      </tr>
+      % for server in results:
+      <tr>
+        <td>${server.server_id}</td>
+        <td><a href="${request.route_url("server_info", id=server.server_id)}" title="Go to this server's info page">${server.name}</a></th>
+        <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>
+        <td class="tdcenter">
+          <a href="${request.route_url("game_index", _query={'server_id':server.server_id})}" title="View recent games on this server">
+            <i class="glyphicon glyphicon-list"></i>
+          </a>
+        </td>
+      </tr>
+      % endfor
+    </table>
 % endif
 
 ##### map-only results #####
 % if result_type == "map":
-<table>
-    <tr>
-        <th>Map</th>
-        <th>Created</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>
-    </tr>
-    % endfor
-</table>
+<div class="row">
+  <div class="span6 offset3">
+      <table class="table table-hover table-condensed">
+        <tr>
+          <th style="width:70px;">ID</th>
+          <th>Name</th>
+          <th>Added</th>
+          <th></th>
+        </tr>
+        % for map in results:
+        <tr>
+          <td>${map.map_id}</td>
+          <td><a href="${request.route_url("map_info", id=map.map_id)}" title="Go to this map's info page">${map.name}</a></th>
+          <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>
+           <td class="tdcenter">
+            <a href="${request.route_url("game_index", _query={'map_id':map.map_id})}" title="View recent games on this map">
+              <i class="glyphicon glyphicon-list"></i>
+            </a>
+          </td>
+        </tr>
+        % endfor
+      </table>
 % endif
 
 ##### game results #####
 % if result_type == "game":
-<table>
-    <tr>
-        <th>Game ID</th>
+<div class="row">
+  <div class="span12">
+    <table class="table table-hover table-condensed">
+      <tr>
+        <th></th>
         <th>Map</th>
         <th>Server</th>
-        <th>Played On</th>
-    </tr>
-    % for (game, server, gmap) in results:
-    <tr>
-        <td><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">${game.game_id}</a></td>
+        <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>${game.create_dt.strftime('%m/%d/%Y at %I:%M %p')}</td>
-    </tr>
-    % endfor
-</table>
+        <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_paged", results.page, results.last_page, query)}
+${navlinks("search", results.page, results.last_page, search_query=query)}
+  </div>
+</div>
 % endif
+
+<%block name="js">
+${parent.js()}
+</%block>
+
+