X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=blobdiff_plain;f=xonstat%2Ftemplates%2Fserver_info.mako;h=1955130f2d6b1d4c78e285600b879d2e5f62dd28;hp=5f54070f0e37eeb5c6eebb3df82d83aa570f2b26;hb=e9a2749acba912de98b68328a51a32045a604b5d;hpb=5d1a78293f44986ae007f9098a2b00082dc4153f

diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako
index 5f54070..1955130 100644
--- a/xonstat/templates/server_info.mako
+++ b/xonstat/templates/server_info.mako
@@ -2,167 +2,164 @@
 <%namespace name="nav" file="nav.mako" />
 
 <%block name="navigation">
-${nav.nav('servers')}
+  ${nav.nav('servers')}
 </%block>
 
 <%block name="title">
-% if server:
-Server Information
-% endif
+  % if server:
+    Server Information
+  % endif
 </%block>
 
-<%block name="css">
-    ${parent.css()}
-    <link href="/static/css/sprites.css" rel="stylesheet">
-</%block>
+<%def name="empty_rows(list, max_empty_rows)">
+  % for i in range(max_empty_rows - len(list)):
+    <tr>
+      <td>-</td>
+      <td>-</td>
+      <td>-</td>
+    </tr>
+  % endfor
+</%def>
 
 % if server is None:
-<h2>Sorry, that server wasn't found!</h2>
+  <h2>Sorry, that server wasn't found!</h2>
 
 % else:
-<div class="row">
-  <div class="span12">
-    <h2>${server.name}</h2>
-    <p>
-      IP Address: ${server.ip_addr} <br />
-      Revision: ${server.revision} <br />
-      Added <span class="abstime" data-epoch="${server.epoch()}" title="${server.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${server.fuzzy_date()}</span> <br />
-    </p>
+  <div class="row">
+    <div class="small-12 columns">
+      <h2>${server.name}</h2>
+      <p>
+        IP Address: 
+        % if server.port is not None:
+        ${server.ip_addr}:${server.port}
+        % else:
+        ${server.ip_addr}
+        % endif
+        <br />
+        Revision: ${server.revision} <br />
+        Added <span class="abstime" data-epoch="${server.epoch()}" title="${server.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${server.fuzzy_date()}</span> <br />
+      </p>
+    </div>
   </div>
-</div>
 
 
-<div class="row">
-  <div class="span4">
-    <h3>Top Scoring Players</h3>
-      <table class="table table-hover table-condensed">
+  <div class="row">
+    <div class="small-12 large-4 columns">
+      <h5>Top Scoring Players <a href="${request.route_url('server_top_scorers', id=server.server_id)}" title="See more top scoring players for this server"><i class="fa fa-plus-circle"></i></a></h5>
+      <table class="table-hover table-condensed">
         <thead>
           <tr>
-            <th style="width:40px;">#</th>
-            <th style="width:150px;">Nick</th>
-            <th style="width:90px;">Score</th>
+            <th class="small-2">#</th>
+            <th class="small-7">Nick</th>
+            <th class="small-3">Score</th>
           </tr>
         </thead>
         <tbody>
-        <% i = 1 %>
-        % for (score_player_id, score_nick, score_value) in top_scorers:
+        % for ts in top_scorers:
           <tr>
-            <td>${i}</td>
-            % if score_player_id != '-':
-            <td class="nostretch" style="max-width:150px;"><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="nostretch" style="max-width:150px;">${score_nick}</td>
-            % endif
-            <td>${score_value}</td>
+            <td>${ts.rank}</td>
+            <td class="no-stretch"><a href="${request.route_url('player_info', id=ts.player_id)}" title="Go to the player info page for this player">${ts.nick|n}</a></td>
+            <td>${ts.total_score}</td>
           </tr>
-        <% i = i+1 %>
         % endfor
+
+        ${empty_rows(top_scorers, 10)}
+
         </tbody>
       </table>
-  </div> <!-- /span4 -->
-
-
-  <div class="span4">
-    <h3>Most Active Players</h3>
-    <table class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th style="width:40px;">#</th>
-          <th style="width:150px;">Nick</th>
-          <th style="width:90px;">Playing Time</th>
-        </tr>
-      </thead>
-      <tbody>
-      <% i = 1 %>
-      % for (player_id, nick, alivetime) in top_players:
-        <tr>
-          <td>${i}</td>
-          % if player_id != '-':
-          <td class="nostretch" style="max-width:150px;"><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="nostretch" style="max-width:150px;">${nick}</td>
-          % endif
-          <td>${alivetime}</td>
-        </tr>
-        <% i = i+1 %>
-      % endfor
-      </tbody>
-    </table>
-  </div> <!-- /span4 -->
-
-
-  <div class="span4">
-    <h3>Most Active Maps</h3>
-    <table class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th style="width:40px;">#</th>
-          <th style="width:150px;">Map</th>
-          <th style="width:120px;"># Games</th>
-        </tr>
-      </thead>
-      <tbody>
-      <% i = 1 %>
-      % for (map_id, name, count) in top_maps:
-        <tr>
-          <td>${i}</td>
-          % if map_id != '-':
-          <td class="nostretch" style="max-width:150px;"><a href="${request.route_url('map_info', id=map_id)}" title="Go to the map info page for ${name}">${name}</a></td>
-          % else:
-          <td class="nostretch" style="max-width:150px;">${name}</td>
-          % endif
-          <td>${count}</td>
-        </tr>
-        <% i = i+1 %>
-      % endfor
-      </tbody>
-    </table>
-  </div> <!-- /span4 -->
-
-</div> <!-- /row -->
-<div class="row">
-  <div class="span12">
-    <p class="note">*Most active stats are from the past 7 days</p>
-  </div>
-</div>
-
-
-% if len(recent_games) > 0:
-<div class="row">
-  <div class="span12">
-    <h3>Most Recent Games</h2>
-    <table class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th></th>
-          <th>Type</th>
-          <th>Map</th>
-          <th>Time</th>
-          <th>Winner</th>
-        </tr>
-      </thead>
-      <tbody>
-        % for rg in recent_games:
-        <tr>
-          <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('map_info', id=rg.map_id)}" title="Go to the map detail page for this map">${rg.map_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 class="nostretch">
-            % 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>
+    </div>
+
+    <div class="small-12 large-4 columns">
+      <h5>Most Active Players <a href="${request.route_url('server_top_active', id=server.server_id)}" title="See more active players for this server"><i class="fa fa-plus-circle"></i></a></h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-2">#</th>
+            <th class="small-7">Nick</th>
+            <th class="small-3">Time</th>
+          </tr>
+        </thead>
+        <tbody>
+        % for tp in top_players:
+          <tr>
+            <td>${tp.rank}</td>
+            <td class="no-stretch"><a href="${request.route_url('player_info', id=tp.player_id)}" title="Go to the player info page for this player">${tp.nick|n}</a></td>
+            <td>${tp.alivetime}</td>
+          </tr>
         % endfor
-      </tbody>
-    </table>
-    <p><a href="${request.route_url('game_index', _query={'server_id':server.server_id})}">More...</a></p>
+
+        ${empty_rows(top_players, 10)}
+
+        </tbody>
+      </table>
+    </div>
+
+    <div class="small-12 large-4 columns">
+      <h5>Most Active Maps <a href="${request.route_url('server_top_maps', id=server.server_id)}" title="See more top maps for this server"><i class="fa fa-plus-circle"></i></a></h5>
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-2">#</th>
+            <th class="small-7">Map</th>
+            <th class="small-3">Games</th>
+          </tr>
+        </thead>
+        <tbody>
+        % for tm in top_maps:
+          <tr>
+            <td>${tm.rank}</td>
+            <td class="no-stretch"><a href="${request.route_url('map_info', id=tm.map_id)}" title="Go to the map info page for ${tm.name}">${tm.name}</a></td>
+            <td>${tm.times_played}</td>
+          </tr>
+        % endfor
+
+        ${empty_rows(top_maps, 10)}
+
+        </tbody>
+      </table>
+    </div> 
+  </div>
+
+  <div class="row">
+    <div class="small-12 columns">
+      <small>*Most active stats are from the past ${lifetime} days</small>
+    </div>
   </div>
-</div>
-% endif
 
 
+  % if len(recent_games) > 0:
+    <div class="row">
+      <div class="small-12 columns">
+        <h5>Most Recent Games <a href="${request.route_url('game_index', _query={'server_id':server.server_id})}"><i class="fa fa-plus-circle"></i></a></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">Map</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('map_info', id=rg.map_id)}" title="Go to the map detail page for this map">${rg.map_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>
+      </div>
+    </div>
+  % endif
 % endif