Remove Persona since it was shut down. :(

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

diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 3bcf31fa4ba8c1a3d3b14f81ec431fa615edbf1e..88849c6df5e99a26a7b9b854600391d15b6a1730 100644 (file)
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,35 +1,38 @@
 <%def name="scoreboard(game_type_cd, pgstats, show_elo=False, show_latency=False)">
-<table  class="table table-bordered table-condensed">
-${scoreboard_header(game_type_cd, pgstats[0])}
+<table  class="table-hover table-condensed">
+  ${scoreboard_header(game_type_cd, pgstats[0])}
   <tbody>
   % for pgstat in pgstats:
     <tr class="${pgstat.team_html_color()}">
-      <td>
-      % if pgstat.player_id > 2:
-        <a href="${request.route_url("player_info", id=pgstat.player_id)}"
-         title="Go to the info page for this player">
-        <span class="nick">${pgstat.nick_html_colors()|n}</span>
-        </a>
-      % else:
-        <span class="nick">${pgstat.nick_html_colors()|n}</span>
-      % endif
-      </td>
       % if show_latency and pgstat.avg_latency is not None:
-      <td>
-        ${int(round(pgstat.avg_latency))}
-      </td>
+        <td class="show-for-medium-up text-center">
+          ${int(round(pgstat.avg_latency))}
+        </td>
       % elif show_latency:
-      <td></td>
+        <td class="show-for-medium-up text-center">-</td>
       % endif
+
+      <td class="small-5 medium-3 no-stretch">
+        % if pgstat.player_id > 2:
+          <a href="${request.route_url("player_info", id=pgstat.player_id)}" title="Go to the info page for this player">
+            ${pgstat.nick_html_colors()|n}
+          </a>
+        % else:
+          ${pgstat.nick_html_colors()|n}
+        % endif
+      </td>
+
       ${scoreboard_row(game_type_cd, pgstat)}
+
       % if game_type_cd != 'cts':
-      <td>${pgstat.score}</td>
+        <td class="small-3 player-score">${pgstat.score}</td>
       % endif
+
       % if show_elo:
         % if pgstat.elo_delta is not None:
-        <td>${round(pgstat.elo_delta,2)}</td>
+          <td class="show-for-medium-up">${round(pgstat.elo_delta,2)}</td>
         % else:
-        <td>-</td>
+          <td class="show-for-medium-up">-</td>
         % endif
       % endif
     </tr>
@@ -41,188 +44,201 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
 ##### SCOREBOARD HEADER #####
 <%def name="scoreboard_header(game_type_cd, pgstat)">
 % if game_type_cd == 'as':
-    <thead>
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="suicides">Suicides</th>
-      <th class="objectives">Objectives</th>
-      <th class="score">Score</th>
-      % if show_elo:
+<thead>
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-4">Nick</th>
+    <th>Kills</th>
+    <th>Deaths</th>
+    <th>Suicides</th>
+    <th>Objectives</th>
+    <th class="medium-1">Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm':
-    <thead>
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="suicides">Suicides</th>
-      <th class="score">Score</th>
-      % if show_elo:
-      <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+<thead>
+  <tr>
+    % if show_latency:
+      <th class="show-for-medium-up medium-1">Ping</th>
+    % endif
+    <th class="small-5 medium-3">Nick</th>
+    <th>Kills</th>
+    <th class="show-for-medium-up">Deaths</th>
+    <th class="show-for-medium-up">Suicides</th>
+    <th class="small-3 medium-1">Score</th>
+    % if show_elo:
+      <th class="show-for-medium-up">Elo Change</th>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd == 'cq':
-    <thead>
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="captured">Captured</th>
-      <th class="released">Released</th>
-      <th class="score">Score</th>
-      % if show_elo:
+<thead>
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Kills</th>
+    <th>Deaths</th>
+    <th>Captured</th>
+    <th>Released</th>
+    <th>Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd == 'cts':
-    <thead>
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="fastest">Fastest Time</th>
-      <th class="deaths">Deaths</th>
-    </tr>
-    </thead>
+<thead>
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Fastest Time</th>
+    <th>Deaths</th>
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd == 'ctf':
-    <thead class="ctf ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="captures">Captures</th>
-      <th class="pickups">Pickups</th>
-      <th class="fck" title="Flag Carrier Kill">FCK</th>
-      <th class="returns">Returns</th>
-      <th class="score">Score</th>
-      % if show_elo:
+<thead class="ctf ${pgstat.team_html_color()}">
+  <tr>
+    % if show_latency:
+      <th class="show-for-medium-up medium-1">Ping</th>
+    % endif
+    <th class="small-5 medium-3">Nick</th>
+    <th class="show-for-medium-up">Kills</th>
+    <th>Caps</th>
+    <th class="show-for-medium-up">Pickups</th>
+    <th class="show-for-medium-up" title="Flag Carrier Kill">FCK</th>
+    <th class="show-for-medium-up">Returns</th>
+    <th class="medium-1">Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd == 'dom':
-    <thead class="dom ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="takes">Takes</th>
-      <th class="ticks">Ticks</th>
-      <th class="score">Score</th>
-      % if show_elo:
+<thead class="dom ${pgstat.team_html_color()}">
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Kills</th>
+    <th>Deaths</th>
+    <th>Takes</th>
+    <th>Ticks</th>
+    <th>Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd in 'ft' 'freezetag':
-    <thead class="freezetag ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="revivals">Revivals</th>
-      <th class="score">Score</th>
-      % if show_elo:
+<thead class="freezetag ${pgstat.team_html_color()}">
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Kills</th>
+    <th>Deaths</th>
+    <th>Revivals</th>
+    <th>Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd in 'ka' 'keepaway':
-    <thead>
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="pickups">Pickups</th>
-      <th class="bctime">BC Time</th>
-      <th class="bckills">BC Kills</th>
-      % if show_elo:
+<thead>
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Kills</th>
+    <th>Deaths</th>
+    <th>Pickups</th>
+    <th>BC Time</th>
+    <th>BC Kills</th>
+    <th>Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd == 'kh':
-    <thead class="kh ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="kills">Kills</th>
-      <th class="deaths">Deaths</th>
-      <th class="pickups">Pickups</th>
-      <th class="caps">Captures</th>
-      <th class="losses">Losses</th>
-      <th class="pushes">Pushes</th>
-      <th class="destroys">Destroys</th>
-      <th class="kckills">KC Kills</th>
-      <th class="score">Score</th>
-      % if show_elo:
-      <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+<thead class="kh ${pgstat.team_html_color()}">
+  <tr>
+    % if show_latency:
+      <th class="show-for-medium-up medium-1">Ping</th>
+    % endif
+    <th class="small-5 medium-3">Nick</th>
+    <th class="show-for-medium-up">Kills</th>
+    <th class="show-for-medium-up">Deaths</th>
+    <th class="show-for-medium-up">Pickups</th>
+    <th>Caps</th>
+    <th class="show-for-medium-up">Losses</th>
+    <th class="show-for-medium-up">KC Kills</th>
+    <th class="small-3 medium-1">Score</th>
+    % if show_elo:
+      <th class="show-for-medium-up">Elo Change</th>
+    % endif
+  </tr>
+</thead>
 % endif
 
 % if game_type_cd in 'nb' 'nexball':
-    <thead class="nb ${pgstat.team_html_color()}">
-    <tr>
-      <th class="nick">Nick</th>
-      % if show_latency:
-      <th class="ping">Ping</th>
-      % endif
-      <th class="goals">Goals</th>
-      <th class="faults">Faults</th>
-      <th class="score">Score</th>
-      % if show_elo:
+<thead class="nb ${pgstat.team_html_color()}">
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Goals</th>
+    <th>Faults</th>
+    <th>Score</th>
+    % if show_elo:
       <th>Elo Change</th>
-      % endif
-    </tr>
-    </thead>
+    % endif
+  </tr>
+</thead>
+% endif
+
+% if game_type_cd == 'rc':
+<thead>
+  <tr>
+    % if show_latency:
+      <th class="small-1">Ping</th>
+    % endif
+    <th class="small-2">Nick</th>
+    <th>Laps</th>
+    <th>Fastest Lap</th>
+    <th>Time</th>
+  </tr>
+</thead>
 % endif
 
 </%def>
@@ -230,73 +246,98 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
 ##### SCOREBOARD ROWS #####
 <%def name="scoreboard_row(game_type_cd, pgstat)">
 % if game_type_cd == 'as':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.suicides}</td>
-        <td>${pgstat.collects}</td>
+  <td>${pgstat.kills}</td>
+  <td>${pgstat.deaths}</td>
+  <td>${pgstat.suicides}</td>
+  <td>${pgstat.collects}</td>
 % endif
 
 % if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.suicides}</td>
+  <td class="small-3">${pgstat.kills}</td>
+  <td class="show-for-medium-up">${pgstat.deaths}</td>
+  <td class="show-for-medium-up">${pgstat.suicides}</td>
 % endif
 
 % if game_type_cd == 'cq':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.captures}</td>
-        <td>${pgstat.drops}</td>
+  <td>${pgstat.kills}</td>
+  <td>${pgstat.deaths}</td>
+  <td>${pgstat.captures}</td>
+  <td>${pgstat.drops}</td>
 % endif
 
 % if game_type_cd == 'cts':
-        <td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
-        <td>${pgstat.deaths}</td>
+  % if pgstat.fastest is not None:
+    <td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
+  % else:
+    <td>-</td>
+  % endif
+
+  <td>${pgstat.deaths}</td>
 % endif
 
 % if game_type_cd == 'ctf':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.captures}</td>
-        <td>${pgstat.pickups}</td>
-        <td>${pgstat.carrier_frags}</td>
-        <td>${pgstat.returns}</td>
+  <td class="show-for-medium-up">${pgstat.kills}</td>
+  <td>${pgstat.captures}</td>
+  <td class="show-for-medium-up">${pgstat.pickups}</td>
+  <td class="show-for-medium-up">${pgstat.carrier_frags}</td>
+  <td class="show-for-medium-up">${pgstat.returns}</td>
 % endif
 
 % if game_type_cd == 'dom':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.pickups}</td>
-        <td>${pgstat.drops}</td>
+  <td>${pgstat.kills}</td>
+  <td>${pgstat.deaths}</td>
+  <td>${pgstat.pickups}</td>
+  <td>${pgstat.drops}</td>
 % endif
 
 % if game_type_cd in 'ft' 'freezetag':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.revivals}</td>
+  <td>${pgstat.kills}</td>
+  <td>${pgstat.deaths}</td>
+  <td>${pgstat.revivals}</td>
 % endif
 
 % if game_type_cd in 'ka' 'keepaway':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.pickups}</td>
-        <td>${pgstat.time}</td>
-        <td>${pgstat.fckills}</td>
+  <td>${pgstat.kills}</td>
+  <td>${pgstat.deaths}</td>
+  <td>${pgstat.pickups}</td>
+
+  % if pgstat.time is not None:
+    <td>${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}</td>
+  % else:
+    <td>-</td>
+  % endif
+
+  <td>${pgstat.carrier_frags}</td>
 % endif
 
 % if game_type_cd == 'kh':
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.deaths}</td>
-        <td>${pgstat.pickups}</td>
-        <td>${pgstat.captures}</td>
-        <td>${pgstat.drops}</td>
-        <td>${pgstat.pushes}</td>
-        <td>${pgstat.destroys}</td>
-        <td>${pgstat.carrier_kills}</td>
+  <td class="show-for-medium-up">${pgstat.kills}</td>
+  <td class="show-for-medium-up">${pgstat.deaths}</td>
+  <td class="show-for-medium-up">${pgstat.pickups}</td>
+  <td class="show-for-medium-up">${pgstat.captures}</td>
+  <td class="show-for-medium-up">${pgstat.drops}</td>
+  <td>${pgstat.carrier_frags}</td>
 % endif
 
 % if game_type_cd in 'nb' 'nexball':
-        <td>${pgstat.captures}</td>
-        <td>${pgstat.drops}</td>
+  <td>${pgstat.captures}</td>
+  <td>${pgstat.drops}</td>
+% endif
+
+% if game_type_cd == 'rc':
+  <td>${pgstat.laps}</td>
+
+  % if pgstat.fastest is not None:
+    <td>${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)}</td>
+  % else:
+    <td>-</td>
+  % endif
+
+  % if pgstat.time is not None:
+    <td>${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)}</td>
+  % else:
+    <td>-</td>
+  % endif
 % endif
 
 </%def>