Standardize game presentation in templates. Add link to the player game index from...

diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 7ecf25b047cb19ca068e511e015ffb2eeaea9853..2e908406e7e11ff7b7fe3ed67ffa4416e11c2cce 100755 (executable)
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -11,7 +11,7 @@ Game Index - ${parent.title()}
 <h2>Recent Games</h2>\r
 <ul>\r
 % for (game, server, map) in games:\r
-   <li>game <a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <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></li>\r
+   <li><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <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></li>\r
 % endfor\r
 </ul>\r
 % endif\r

diff --git a/xonstat/templates/player_game_index.mako b/xonstat/templates/player_game_index.mako
index 3cbbf68122f8967c3b26032149bf73ce4ecb531a..7b23bf2017844866d7903abe09d76bab731a0a8f 100755 (executable)
--- a/xonstat/templates/player_game_index.mako
+++ b/xonstat/templates/player_game_index.mako
@@ -11,7 +11,7 @@ Player Game Index for ${player.nick} - ${parent.title()}
 <h2>Recent Games by ${player.nick}</h2>
 <ul>
 % for (playergamestat, game, server, map) in games:
-   <li>game <a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a></li>
+   <li><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a></li>
 % endfor
 </ul>
 % endif

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 62319684839ad657b3135bd1ad6c1af126474870..7d046f458fa19a793883f2cd713c2c28746e5622 100755 (executable)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -24,8 +24,8 @@ ${parent.title()}
 <h2>Recent Games</h2>
 <ul>
 % for (gamestat, game, server, map) in recent_games:
-   <li>game <a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <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></li>
+   <li><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <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></li>
 % endfor
 </ul>
-More games played by ${player.nick}...
+<a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="Game index for ${player.nick}">More games</a> played by ${player.nick}...
 % endif

diff --git a/xonstat/templates/server_game_index.mako b/xonstat/templates/server_game_index.mako
index 62e62b4e0ea4ac4286ba8fd4642704efb7b92d36..f098fb68afd630f2470e32d270e061635f605148 100644 (file)
--- a/xonstat/templates/server_game_index.mako
+++ b/xonstat/templates/server_game_index.mako
@@ -11,7 +11,7 @@ Server Game Index for ${server.name} - ${parent.title()}
 <h2>Games on ${server.name}</h2>
 <ul>
 % for (game, theserver, map) in games:
-   <li>game <a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a></li>
+   <li><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a></li>
 % endfor
 </ul>
 % endif

diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako
index 27443bfe3db1a6faff2f2a95aeee0b6832008c16..aa20b9cf31365e629864d6896919a4b4015448ef 100755 (executable)
--- a/xonstat/templates/server_info.mako
+++ b/xonstat/templates/server_info.mako
@@ -23,7 +23,7 @@ ${parent.title()}
 <h2>Recent Games</h2>
 <ul>
 % for (game, theserver, map) in recent_games:
-   <li><a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> (game <a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}</a>)</li>
+   <li><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}</a>: <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a></li>
 % endfor
 </ul>
 <a href="${request.route_url("server_game_index", server_id=server.server_id, page=1)}" name="Game index page for server #${server.name}">More games played on ${server.name}...</a>