Fix two missed route_urls to game_finder.

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

diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako
old mode 100755 (executable)
new mode 100644 (file)
index 7e975c1..1e7b50c
--- a/xonstat/templates/map_info.mako
+++ b/xonstat/templates/map_info.mako
@@ -14,6 +14,10 @@ Map Information
 ${parent.title()}
 </%block>
 
+<%block name="css">
+    ${parent.css()}
+    <link href="/static/css/sprites.css" rel="stylesheet">
+</%block>
 
 % if gmap is None:
 <h2>Sorry, that map wasn't found!</h2>
@@ -21,12 +25,12 @@ ${parent.title()}
 % else:
 <h2>${gmap.name}</h2>
 <p>
-  Added on ${gmap.create_dt.strftime('%m/%d/%Y at %H:%M')}
+  Added <span class="abstime" data-epoch="${gmap.epoch()}" title="${gmap.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${gmap.fuzzy_date()}</span>
 </p>
 <div class="row">
   <div class="span4">
     <h3>Top Scoring Players</h3>
-    <table class="table table-bordered table-condensed">
+    <table class="table table-hover table-condensed">
       <thead>
         <tr>
           <th>#</th>
@@ -50,12 +54,13 @@ ${parent.title()}
         % endfor
         </tbody>
     </table>
+    <p class="note">*Most active stats are from the past 7 days</p>
   </div>
 
 
 <div class="span4">
   <h3>Most Active Players</h3>
-  <table class="table table-bordered table-condensed">
+  <table class="table table-hover table-condensed">
     <thead>
       <tr>
         <th>#</th>
@@ -84,7 +89,7 @@ ${parent.title()}
 
 <div class="span4">
   <h3>Most Active Servers</h3>
-  <table class="table table-bordered table-condensed">
+  <table class="table table-hover table-condensed">
     <thead>
       <tr>
         <th>#</th>
@@ -107,48 +112,81 @@ ${parent.title()}
 </div>
 </div> <!-- /row -->
 
+% if len(captimes) > 0:
+<div class="row">
+  <div class="span6">
+    <h3>Best Flag Capture Times</h3>
+    <table class="table table-hover table-condensed">
+      <thead>
+        <tr>
+           <th>Nick</th>
+           <th>Captime</th>
+        </tr>
+      </thead>
+      <tbody>
+      % for c in captimes:
+        <tr>
+          <td>
+          % if c.player_id > 2:
+            <a href="${request.route_url("player_info", id=c.player_id)}"
+             title="Go to the info page for this player">
+            <span class="nick">${c.nick_html_colors|n}</span>
+            </a>
+          % else:
+            <span class="nick">${c.nick_html_colors|n}</span>
+          % endif
+          </td>
+          <td>
+            <a href="${request.route_url("game_info", id=c.game_id)}"
+             title="View the game in which this cap was made">
+              ${round(float(c.fastest_cap.seconds) + (c.fastest_cap.microseconds/1000000.0), 2)}
+            </a>
+          </td>
+        </tr>
+      % endfor
+      </tbody>
+    </table>
+  </div>
+</div>
+% endif
+
 
+% if len(recent_games) > 0:
 <div class="row">
   <div class="span12">
-    <h3>Recent Games</h3>
-    <table class="table table-bordered table-condensed">
+    <h3>Most Recent Games</h3>
+    <table class="table table-hover table-condensed">
       <thead>
         <tr>
           <th></th>
           <th>Type</th>
+          <th>Server</th>
           <th>Time</th>
           <th>Winner</th>
         </tr>
       </thead>
       <tbody>
-        % for (game, srv, map, pgstat) in recent_games:
-        % if game != '-':
+        % for rg in recent_games:
         <tr>
-          <td><a class="btn btn-primary btn-small" href="${request.route_url('game_info', id=game.game_id)}" title="View detailed information about this game">View</a></td>
-          <td class="gt_icon"><img title="${game.game_type_cd}" src="/static/images/icons/24x24/${game.game_type_cd}.png" alt="${game.game_type_cd}" /></td>
-          <td>${game.start_dt.strftime('%m/%d/%Y %H:%M')}</td>
+          <td class="tdcenter"><a class="btn btn-primary btn-small" href="${request.route_url('game_info', id=rg.game_id)}" title="View detailed information about this game">View</a></td>
+          <td class="tdcenter"><span class="sprite sprite-${rg.game_type_cd}" alt="${rg.game_type_cd}" title="${rg.game_type_descr}"></span></td>
+          <td><a href="${request.route_url('server_info', id=rg.server_id)}" title="Go to the detail page for this server">${rg.server_name}</a></td>
+          <td><span class="abstime" data-epoch="${rg.epoch}" title="${rg.start_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${rg.fuzzy_date}</span></td>
           <td>
-            % if pgstat.player_id > 2:
-            <a href="${request.route_url('player_info', id=pgstat.player_id)}" title="Go to the player info page for this player">${pgstat.nick_html_colors()|n}</a>
-          </td>
+            % if rg.player_id > 2:
+            <a href="${request.route_url('player_info', id=rg.player_id)}" title="Go to the player info page for this player">${rg.nick_html_colors|n}</a>
             % else:
-            ${pgstat.nick_html_colors()|n}
-          </td>
+            ${rg.nick_html_colors|n}
             % endif
+          </td>
         </tr>
-        % else:
-        <tr>
-          <td>-</td>
-          <td>-</td>
-          <td>-</td>
-          <td>-</td>
-        </tr>
-        % endif
-    % endfor
-        </tbody>
+        % endfor
+      </tbody>
     </table>
+    <p><a href="${request.route_url('game_index', _query={'map_id':gmap.map_id})}">More...</a></p>
   </div>
 </div>
+% endif
 
 
 % endif