From d7517d0c13b6ac3de5d7dcc6204a68553f034d34 Mon Sep 17 00:00:00 2001
From: Ant Zucaro <azucaro@gmail.com>
Date: Tue, 21 Jun 2011 12:13:04 -0400
Subject: [PATCH 1/1] Clean up main page, remove centering and generally remove
 style where appropriate.

---
 xonstat/templates/accuracy.mako    |  2 +-
 xonstat/templates/game_index.mako  |  2 --
 xonstat/templates/game_info.mako   |  4 +---
 xonstat/templates/main_index.mako  | 35 +++++++++++++++++++-----------
 xonstat/templates/player_info.mako |  4 ++--
 xonstat/templates/scoreboard.mako  |  2 +-
 6 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/xonstat/templates/accuracy.mako b/xonstat/templates/accuracy.mako
index a540023..2f07cc3 100755
--- a/xonstat/templates/accuracy.mako
+++ b/xonstat/templates/accuracy.mako
@@ -11,7 +11,7 @@
 ## [4] = Hit
 ## [5] = Fired
 
-<table class="accuracy-table" border="1" cellpadding="3" align="center">
+<table class="accuracy-table" border="1" cellpadding="3">
 <tr class="table-header">
     <td></td>
     <td>Weapon</td>
diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 1dcfd02..9c04c9c 100755
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -23,10 +23,8 @@ $(document).ready(function() { $('.scoreboard').dataTable(); } );
 <p>
    <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a> (<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a> for this game)
 
-<div align="center">
 ## show scoreboard using a def from another file
 ${scoreboard(game.game_type_cd, pgstats[game.game_id])}
-</div>
 
 % endfor
 % endif
diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako
index 4d5b807..fb15492 100755
--- a/xonstat/templates/game_info.mako
+++ b/xonstat/templates/game_info.mako
@@ -22,15 +22,13 @@ Map: <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info pa
 ##### SCOREBOARD #####
 <h2>Scoreboard</h2>
 ${scoreboard(game.game_type_cd, pgstats)}
-<br />
-<br />
 
 
 ##### ACCURACY #####
 <h2>Accuracy</h2>
 % for pgstat in pgstats:
 % if pgstat.player_game_stat_id in pwstats:
-<a name="accuracy-${pgstat.player_game_stat_id}" />Accuracy for ${pgstat.nick_html_colors()}:
+Accuracy for <a href="${request.route_url('player_info', id=pgstat.player_id)}" title="Go to the player detail page for this player">${pgstat.nick_html_colors()}</a>:
 ${accuracy(pwstats[pgstat.player_game_stat_id][0:5])}
 <br />
 <br />
diff --git a/xonstat/templates/main_index.mako b/xonstat/templates/main_index.mako
index 0571483..24eb827 100755
--- a/xonstat/templates/main_index.mako
+++ b/xonstat/templates/main_index.mako
@@ -16,16 +16,18 @@ Main Page - ${parent.title()}
         <th>Nick</th>
         <th>Score</th>
     </tr>
+<% i = 1 %>
 % for (player_id, nick, score) 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">${player_id}</a></td>
+        <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick}</a></td>
         % else:
-        <td>${player_id}</td>
-        % endif
         <td>${nick}</td>
+        % endif
         <td>${score}</td>
     </tr>
+    <% i = i+1 %>
 % endfor
 </table>
 
@@ -39,16 +41,18 @@ Main Page - ${parent.title()}
         <th>Server</th>
         <th>Games</th>
     </tr>
+<% i = 1 %>
 % for (server_id, name, count) in top_servers:
     <tr>
+        <td>${i}</td>
         % if server_id != '-':
-        <td><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for this server">${server_id}</a></td>
+        <td><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for ${name}">${name}</a></td>
         % else:
-        <td>${server_id}</td>
-        % endif
         <td>${name}</td>
+        % endif
         <td>${count}</td>
     </tr>
+    <% i = i+1 %>
 % endfor
 </table>
 
@@ -62,16 +66,18 @@ Main Page - ${parent.title()}
         <th>Map</th>
         <th>Times Played</th>
     </tr>
+<% i = 1 %>
 % for (map_id, name, count) in top_maps:
     <tr>
+        <td>${i}</td>
         % if map_id != '-':
-        <td><a href="${request.route_url('map_info', id=map_id)}" title="Go to the map info page for this map">${map_id}</a></td>
+        <td><a href="${request.route_url('map_info', id=map_id)}" title="Go to the map info page for ${name}">${name}</a></td>
         % else:
-        <td>${map_id}</td>
-        % endif
         <td>${name}</td>
+        % endif
         <td>${count}</td>
     </tr>
+    <% i = i+1 %>
 % endfor
 </table>
 </div> <!-- END LEADERBOARD -->
@@ -85,6 +91,7 @@ Main Page - ${parent.title()}
     </tr>
     <tr>
         <th>Game #</th>
+        <th>Type</th>
         <th>Server</th>
         <th>Map</th>
         <th>Time</th>
@@ -93,10 +100,11 @@ Main Page - ${parent.title()}
     % for (game, server, map) in recent_games:
     % if game != '-':
     <tr>
-        <td>${game.game_id}</td>
-        <td>${server.name}</td>
-        <td>${map.name}</td>
-        <td>${game.start_dt}</td>
+        <td><a href="${request.route_url('game_info', id=game.game_id)}" title="View detailed information about this game">${game.game_id}</a></td>
+        <td>${game.game_type_cd}</td>
+        <td><a href="${request.route_url('server_info', id=server.server_id)}" title="Go to the detail page for this server">${server.name}</a></td>
+        <td><a href="${request.route_url('map_info', id=map.map_id)}" title="Go to the map detail page for this map">${map.name}</a></td>
+        <td>${game.start_dt.strftime('%m/%d/%Y %H:%M')}</td>
         <td>${game.winner}</td>
     </tr>
     % else:
@@ -106,6 +114,7 @@ Main Page - ${parent.title()}
         <td>-</td>
         <td>-</td>
         <td>-</td>
+        <td>-</td>
     </tr>
     % endif
     % endfor
diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 405f7d2..e139f76 100755
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -41,7 +41,7 @@ ${parent.title()}
 ##### STATS #####
 % if game_stats:
 <h2>Overall Game Stats</h2>
-<table class="accuracy-table" border="1" cellpadding="3" align="center">
+<table class="accuracy-table" border="1" cellpadding="3">
   <tr>
     <td class="header-cell">Playing Time</td><td>${game_stats['total_alivetime']}</td>
     <td class="header-cell">Drops</td><td>${game_stats['total_drops']}</td>
@@ -87,7 +87,7 @@ ${accuracy(weapon_stats)}
 ##### RECENT GAMES (v2) ####
 % if recent_games:
 <h2>Recent Games</h2>
-<table class="accuracy-table" border="1" cellpadding="3" align="center">
+<table border="1" cellpadding="3">
 <tr class='table-header'>
    <td>Game Type</td>
    <td>Map</td>
diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 18ad4cb..8a79a33 100755
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,5 +1,5 @@
 <%def name="scoreboard(game_type_cd, pgstats)">
-<table class="scoreboard" border="1" cellpadding="3" align="center">
+<table class="scoreboard" border="1" cellpadding="3">
 
 ##### CTF #####
 % if game_type_cd == 'ctf':
-- 
2.39.2