Clean up main page, remove centering and generally remove style where appropriate.

diff --git a/xonstat/templates/accuracy.mako b/xonstat/templates/accuracy.mako
index a540023e05cd3177d890b42f41725d5297034eac..2f07cc372a5b7d5e16be8ddb7aafd604627f29ae 100755 (executable)
--- 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 1dcfd029da765a2a977fee642f0814ddce973d22..9c04c9c3f1b65e3a36ba6810eb0b95210140a1fb 100755 (executable)
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -23,10 +23,8 @@ $(document).ready(function() { $('.scoreboard').dataTable(); } );
 <p>\r
    <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)\r
 \r
-<div align="center">\r
 ## show scoreboard using a def from another file\r
 ${scoreboard(game.game_type_cd, pgstats[game.game_id])}\r
-</div>\r
 \r
 % endfor\r
 % endif\r

diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako
index 4d5b807bc9ece4ac2913e55cd60d049fb51392a2..fb1549275e06ae971f6c51ff405de4772419ebea 100755 (executable)
--- 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 0571483452de2c71cd727186a0f247283408e38c..24eb8274c0bbf7e3cef64316092a3909bbcab527 100755 (executable)
--- a/xonstat/templates/main_index.mako
+++ b/xonstat/templates/main_index.mako
@@ -16,16 +16,18 @@ Main Page - ${parent.title()}
         <th>Nick</th>\r
         <th>Score</th>\r
     </tr>\r
+<% i = 1 %>\r
 % for (player_id, nick, score) in top_players:\r
     <tr>\r
+        <td>${i}</td>\r
         % if player_id != '-':\r
-        <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>\r
+        <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick}</a></td>\r
         % else:\r
-        <td>${player_id}</td>\r
-        % endif\r
         <td>${nick}</td>\r
+        % endif\r
         <td>${score}</td>\r
     </tr>\r
+    <% i = i+1 %>\r
 % endfor\r
 </table>\r
 \r
@@ -39,16 +41,18 @@ Main Page - ${parent.title()}
         <th>Server</th>\r
         <th>Games</th>\r
     </tr>\r
+<% i = 1 %>\r
 % for (server_id, name, count) in top_servers:\r
     <tr>\r
+        <td>${i}</td>\r
         % if server_id != '-':\r
-        <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>\r
+        <td><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for ${name}">${name}</a></td>\r
         % else:\r
-        <td>${server_id}</td>\r
-        % endif\r
         <td>${name}</td>\r
+        % endif\r
         <td>${count}</td>\r
     </tr>\r
+    <% i = i+1 %>\r
 % endfor\r
 </table>\r
 \r
@@ -62,16 +66,18 @@ Main Page - ${parent.title()}
         <th>Map</th>\r
         <th>Times Played</th>\r
     </tr>\r
+<% i = 1 %>\r
 % for (map_id, name, count) in top_maps:\r
     <tr>\r
+        <td>${i}</td>\r
         % if map_id != '-':\r
-        <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>\r
+        <td><a href="${request.route_url('map_info', id=map_id)}" title="Go to the map info page for ${name}">${name}</a></td>\r
         % else:\r
-        <td>${map_id}</td>\r
-        % endif\r
         <td>${name}</td>\r
+        % endif\r
         <td>${count}</td>\r
     </tr>\r
+    <% i = i+1 %>\r
 % endfor\r
 </table>\r
 </div> <!-- END LEADERBOARD -->\r
@@ -85,6 +91,7 @@ Main Page - ${parent.title()}
     </tr>\r
     <tr>\r
         <th>Game #</th>\r
+        <th>Type</th>\r
         <th>Server</th>\r
         <th>Map</th>\r
         <th>Time</th>\r
@@ -93,10 +100,11 @@ Main Page - ${parent.title()}
     % for (game, server, map) in recent_games:\r
     % if game != '-':\r
     <tr>\r
-        <td>${game.game_id}</td>\r
-        <td>${server.name}</td>\r
-        <td>${map.name}</td>\r
-        <td>${game.start_dt}</td>\r
+        <td><a href="${request.route_url('game_info', id=game.game_id)}" title="View detailed information about this game">${game.game_id}</a></td>\r
+        <td>${game.game_type_cd}</td>\r
+        <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>\r
+        <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>\r
+        <td>${game.start_dt.strftime('%m/%d/%Y %H:%M')}</td>\r
         <td>${game.winner}</td>\r
     </tr>\r
     % else:\r
@@ -106,6 +114,7 @@ Main Page - ${parent.title()}
         <td>-</td>\r
         <td>-</td>\r
         <td>-</td>\r
+        <td>-</td>\r
     </tr>\r
     % endif\r
     % endfor\r

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 405f7d2b073c7baccad76f3c2b4bb8cb1362f830..e139f76769d3b20bdcccb7fa954666acce42ef69 100755 (executable)
--- 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 18ad4cb137ebde7b6669d501417b75d1c793d70b..8a79a332be967092d759634e68579f0e4de19106 100755 (executable)
--- 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':