X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=blobdiff_plain;f=xonstat%2Ftemplates%2Fmap_info.mako;h=339525cde4a8c1405e76b2ca67380560313faac0;hp=abbd4b0a80906f9b17ca609b232f32e11b6adde6;hb=e9a2749acba912de98b68328a51a32045a604b5d;hpb=c9a891fdb40cdcf72d75e23c5f5565a30ffd4c84

diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako
index abbd4b0..339525c 100644
--- a/xonstat/templates/map_info.mako
+++ b/xonstat/templates/map_info.mako
@@ -3,189 +3,187 @@
 <%namespace file="navlinks.mako" import="navlinks" />
 
 <%block name="navigation">
-${nav.nav('maps')}
+  ${nav.nav('maps')}
 </%block>
 
 <%block name="title">
-% if gmap:
-Map Information
-% endif
-
-${parent.title()}
-</%block>
+  % if gmap:
+    Map Information
+  % endif
 
-<%block name="css">
-    ${parent.css()}
-    <link href="/static/css/sprites.css" rel="stylesheet">
+  ${parent.title()}
 </%block>
 
 % if gmap is None:
-<h2>Sorry, that map wasn't found!</h2>
+  <h2>Sorry, that map wasn't found!</h2>
 
 % else:
-<h2>${gmap.name}</h2>
-<p>
-  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">
-      <thead>
-        <tr>
-          <th>#</th>
-          <th>Nick</th>
-          <th>Score</th>
-        </tr>
-      </thead>
-      <tbody>
+  <h2>${gmap.name}</h2>
+  <p>
+    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="small-12 large-4 columns">
+      <h5>Top Scoring Players</h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-1">#</th>
+            <th class="small-7">Nick</th>
+            <th class="small-4">Score</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% i = 1 %>
+          % for (score_player_id, score_nick, score_value) in top_scorers:
+            <tr>
+              <td>${i}</td>
+              % if score_player_id != '-':
+                <td class="no-stretch"><a href="${request.route_url('player_info', id=score_player_id)}" title="Go to the player info page for this player">${score_nick|n}</a></td>
+              % else:
+                <td class="no-stretch">${score_nick}</td>
+              % endif
+              <td>${score_value}</td>
+            </tr>
+            <% i = i+1 %>
+          % endfor
+          </tbody>
+      </table>
+    </div>
+
+    <div class="small-12 large-4 columns">
+      <h5>Most Active Players</h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-1">#</th>
+            <th class="small-7">Nick</th>
+            <th class="small-4">Time</th>
+          </tr>
+        </thead>
+        <tbody>
         <% i = 1 %>
-        % for (score_player_id, score_nick, score_value) in top_scorers:
-        <tr>
-          <td>${i}</td>
-          % if score_player_id != '-':
-          <td><a href="${request.route_url('player_info', id=score_player_id)}" title="Go to the player info page for this player">${score_nick|n}</a></td>
-          % else:
-          <td>${score_nick}</td>
-          % endif
-          <td>${score_value}</td>
-        </tr>
-        <% i = i+1 %>
+        % for (player_id, nick, alivetime) in top_players:
+          <tr>
+            <td>${i}</td>
+            % if player_id != '-':
+            <td class="no-stretch"><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick|n}</a></td>
+            % else:
+            <td class="no-stretch">${nick}</td>
+            % endif
+            <td>${alivetime}</td>
+          </tr>
+          <% i = i+1 %>
         % endfor
         </tbody>
-    </table>
-  </div>
-
-
-<div class="span4">
-  <h3>Most Active Players</h3>
-  <table class="table table-bordered table-condensed">
-    <thead>
-      <tr>
-        <th>#</th>
-        <th>Nick</th>
-        <th>Playing Time</th>
-      </tr>
-    </thead>
-    <tbody>
-    <% i = 1 %>
-    % for (player_id, nick, alivetime) in top_players:
-      <tr>
-        <td>${i}</td>
-        % if player_id != '-':
-        <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick|n}</a></td>
-        % else:
-        <td>${nick}</td>
-        % endif
-        <td>${alivetime}</td>
-      </tr>
-      <% i = i+1 %>
-    % endfor
-    </tbody>
-  </table>
-</div>
+      </table>
+    </div>
 
+    <div class="small-12 large-4 columns">
+      <h5>Most Active Servers</h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-1">#</th>
+            <th class="small-7">Name</th>
+            <th class="small-4"># Games</th>
+          </tr>
+        </thead>
+        <tbody>
+        <% i = 1 %>
+        % for (server_id, name, times_played) in top_servers:
+          <tr>
+            <td>${i}</td>
+            <td class="no-stretch" style="max-width:150px;"><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for this server">${name}</a></td>
+            <td>${times_played}</td>
+          </tr>
+          <% i = i+1 %>
+        % endfor
+        </tbody>
+      </table>
+    </div>
+  </div> <!-- /row -->
 
-<div class="span4">
-  <h3>Most Active Servers</h3>
-  <table class="table table-bordered table-condensed">
-    <thead>
-      <tr>
-        <th>#</th>
-        <th>Name</th>
-        <th>Times Played</th>
-      </tr>
-    </thead>
-    <tbody>
-    <% i = 1 %>
-    % for (server_id, name, times_played) in top_servers:
-      <tr>
-        <td>${i}</td>
-        <td><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for this server">${name}</a></td>
-        <td>${times_played}</td>
-      </tr>
-      <% i = i+1 %>
-    % endfor
-    </tbody>
-</table>
-</div>
-</div> <!-- /row -->
-
-% if len(captimes) > 0:
-<div class="row">
-  <div class="span6">
-    <h3>Best Flag Capture Times</h3>
-    <table class="table table-bordered 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 class="row">
+    <div class="small-12 columns">
+      <small>*Most active stats are from the past 7 days</small>
+    </div>
   </div>
-</div>
-% endif
 
-
-% if len(recent_games) > 0:
-<div class="row">
-  <div class="span12">
-    <h3>Most Recent Games</h3>
-    <table class="table table-bordered table-condensed">
-      <thead>
-        <tr>
-          <th></th>
-          <th>Type</th>
-          <th>Server</th>
-          <th>Time</th>
-          <th>Winner</th>
-        </tr>
-      </thead>
-      <tbody>
-        % for rg in recent_games:
-        <tr>
-          <td><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><span class="sprite sprite-${rg.game_type_cd}" alt="${rg.game_type_cd}"></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 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>
+  % if len(captimes) > 0:
+  <div class="row">
+    <div class="small-12 large-6 columns">
+      <h5>Best Flag Capture Times <a href="${request.route_url('map_captimes', id=gmap.map_id)}" title="See more flag capture times for ${gmap.name}"><i class="fa fa-plus-circle"></i></a></h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+             <th class="small-8">Nick</th>
+             <th class="small-4">Captime</th>
+          </tr>
+        </thead>
+        <tbody>
+        % for c in captimes:
+          <tr>
+            <td class="no-stretch">
+            % 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>${c.nick_html_colors|n}</span>
+              </a>
             % else:
-            ${rg.nick_html_colors|n}
+              <span>${c.nick_html_colors|n}</span>
             % endif
-          </td>
-        </tr>
+            </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>
-    <p><a href="${request.route_url('game_finder', _query={'map_id':gmap.map_id})}">More...</a></p>
+        </tbody>
+      </table>
+    </div>
   </div>
-</div>
-% endif
+  % endif
 
+  % if len(recent_games) > 0:
+  <div class="row">
+    <div class="small-12 columns">
+      <h5>Most Recent Games</h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-1 text-center"></th>
+            <th class="small-1">Type</th>
+            <th class="show-for-medium-up small-3">Server</th>
+            <th class="show-for-large-up small-3">Time</th>
+            <th class="small-3">Winner</th>
+          </tr>
+        </thead>
+        <tbody>
+          % for rg in recent_games:
+          <tr>
+            <td class="text-center"><a class="tiny button" href="${request.route_url('game_info', id=rg.game_id)}" title="View detailed information about this game">View</a></td>
+            <td class="text-center"><span class="sprite sprite-${rg.game_type_cd}" alt="${rg.game_type_cd}" title="${rg.game_type_descr}"></span></td>
+            <td class="show-for-medium-up"><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 class="show-for-large-up"><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 class="no-stretch">
+              % 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:
+              ${rg.nick_html_colors|n}
+              % endif
+            </td>
+          </tr>
+          % endfor
+        </tbody>
+      </table>
+      <p><a href="${request.route_url('game_index', _query={'map_id':gmap.map_id})}">More...</a></p>
+    </div>
+  </div>
+  % endif
 
 % endif