Modularize the scoreboard with defs - one for header, the other for the bulk of stat...

diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 9d890925572055faa422a3c0aba36c3be9dedfd0..b62ba06f5f335a8658ceaa0e379b11c4f9126f3f 100755 (executable)
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,18 +1,7 @@
 <%def name="scoreboard(game_type_cd, pgstats)">
 <table class="scoreboard" border="1" cellpadding="3">
 
-##### CTF #####
-% if game_type_cd == 'ctf':
-    <tr class="table-header" style="color:${pgstats[0].team_html_color()}">
-        <td>Nick</td>
-        <td>Kills</td>
-        <td>Captures</td>
-        <td>Pickups</td>
-        <td>Flag Carrier Kills</td>
-        <td>Returns</td>
-        <td>Score</td>
-        <td>Accuracy</td>
-    </tr>
+${scoreboard_header(game_type_cd)}
 
 % for pgstat in pgstats:
     <tr style="background-color:${pgstat.team_html_color()}">
@@ -20,17 +9,13 @@
         % 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()}</span>
+          <span class="nick">${pgstat.nick_html_colors()|n}</span>
           </a>
         % else:
-          <span class="nick">${pgstat.nick_html_colors()}</span>
+          <span class="nick">${pgstat.nick_html_colors()|n}</span>
         % endif
         </td>
-        <td>${pgstat.kills}</td>
-        <td>${pgstat.captures}</td>
-        <td>${pgstat.pickups}</td>
-        <td>${pgstat.carrier_frags}</td>
-        <td>${pgstat.returns}</td>
+       ${scoreboard_row(game_type_cd, pgstat)}
         <td><span style="color:#FFFF00;">${pgstat.score}</span></td>
         <td>
         % if pgstat.player_id > 1:
@@ -42,46 +27,79 @@
         </td>
     </tr>
 % endfor
-% endif
+</table>
+</%def>
 
-##### DM #####
-% if game_type_cd == 'dm':
+##### SCOREBOARD HEADER #####
+<%def name="scoreboard_header(game_type_cd)">
+% if game_type_cd == 'dm' or game_type_cd == 'tdm':
     <tr class="table-header" style="color:black;}">
-        <td>Nick</td>
-        <td>Kills</td>
-        <td>Deaths</td>
-        <td>Suicides</td>
-        <td>Score</td>
-        <td>Accuracy</td>
+        <th>Nick</th>
+        <th>Kills</th>
+        <th>Deaths</th>
+        <th>Suicides</th>
+        <th>Score</th>
+        <th>Accuracy</th>
     </tr>
+% endif
 
-% for pgstat in pgstats:
-    <tr style="background-color:${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">
-          ${pgstat.nick_html_colors()}
-          </a>
-        % else:
-          ${pgstat.nick_html_colors()}
-        % endif
-        </td>
+% if game_type_cd == 'ctf':
+    <tr class="table-header" style="color:${pgstats[0].team_html_color()}">
+        <th>Nick</th>
+        <th>Kills</th>
+        <th>Captures</th>
+        <th>Pickups</th>
+        <th>Flag Carrier Kills</th>
+        <th>Returns</th>
+        <th>Score</th>
+        <th>Accuracy</th>
+    </tr>
+% endif
+
+% if game_type_cd == 'ca':
+    <tr class="table-header" style="color:${pgstats[0].team_html_color()}">
+        <th>Nick</th>
+        <th>Kills</th>
+        <th>Score</th>
+        <th>Accuracy</th>
+    </tr>
+% endif
+
+% if game_type_cd == 'freezetag':
+    <tr style="color:${pgstats[0].team_html_color()}">
+        <th>Nick</th>
+        <th>Kills</th>
+        <th>Deaths</th>
+        <th>Suicides</th>
+        <th>Score</th>
+        <th>Accuracy</th>
+    </tr>
+% endif
+</%def>
+
+##### SCOREBOARD ROWS #####
+<%def name="scoreboard_row(game_type_cd, pgstat)">
+% if game_type_cd == 'dm' or game_type_cd == 'tdm':
         <td>${pgstat.kills}</td>
         <td>${pgstat.deaths}</td>
         <td>${pgstat.suicides}</td>
-        <td><span style="color:#FFFF00;">${pgstat.score}</span></td>
-        <td>
-        % if pgstat.player_id > 1:
-          <a href="${request.route_url("game_info", id=pgstat.game_id)}#accuracy-${pgstat.player_game_stat_id}"
-           title="View weapon accuracy details for this player in this game">
-          View
-          </a>
-        % endif
-        </td>
-    </tr>
-% endfor
 % endif
 
-</table>
+% 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>
+% endif
+
+% if game_type_cd == 'ca':
+        <td>${pgstat.kills}</td>
+% endif
+
+% if game_type_cd == 'freezetag':
+        <td>${pgstat.kills}</td>
+        <td>${pgstat.deaths}</td>
+        <td>${pgstat.suicides}</td>
+% endif
 </%def>