From ff7278dc209233d9875ba340f2b5d5b23da8643c Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Thu, 2 Feb 2012 21:55:42 -0500 Subject: [PATCH] Integrate navigation mako file and titles. --- xonstat/templates/base.mako | 28 +++++----------------------- xonstat/templates/game_index.mako | 7 ++++++- xonstat/templates/game_info.mako | 7 ++++++- xonstat/templates/map_index.mako | 7 ++++++- xonstat/templates/map_info.mako | 8 +++++++- xonstat/templates/player_index.mako | 7 ++++++- xonstat/templates/player_info.mako | 7 ++++++- xonstat/templates/server_index.mako | 7 ++++++- xonstat/templates/server_info.mako | 7 ++++++- 9 files changed, 54 insertions(+), 31 deletions(-) diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako index 5673347..cdd47b3 100755 --- a/xonstat/templates/base.mako +++ b/xonstat/templates/base.mako @@ -1,3 +1,4 @@ +<%namespace name="nav" file="nav.mako"/> @@ -10,7 +11,6 @@ - <%block name="css"> + - -
-
-
- - - - - - -
- -
-
-
-
+ <%block name="navigation"> + ${nav.nav("leaderboard")} +
diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako index 7a369a3..1fac682 100755 --- a/xonstat/templates/game_index.mako +++ b/xonstat/templates/game_index.mako @@ -1,9 +1,14 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> <%namespace file="scoreboard.mako" import="scoreboard" /> <%namespace file="navlinks.mako" import="navlinks" /> +<%block name="navigation"> +${nav.nav('games')} + + <%block name="title"> -Game Index - ${parent.title()} +Game Index % if not games: diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako index eeeeb1e..bacc1a0 100755 --- a/xonstat/templates/game_info.mako +++ b/xonstat/templates/game_info.mako @@ -1,9 +1,14 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> <%namespace file="scoreboard.mako" import="scoreboard" /> <%namespace file="accuracy.mako" import="accuracy" /> +<%block name="navigation"> +${nav.nav('games')} + + <%block name="title"> -Game Information - ${parent.title()} +Game Information diff --git a/xonstat/templates/map_index.mako b/xonstat/templates/map_index.mako index 05a76d7..3e155fb 100755 --- a/xonstat/templates/map_index.mako +++ b/xonstat/templates/map_index.mako @@ -1,8 +1,13 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> <%namespace file="navlinks.mako" import="navlinks" /> +<%block name="navigation"> +${nav.nav('maps')} + + <%block name="title"> -Map Index - ${parent.title()} +Map Index % if not maps: diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako index c454e0c..f4f5b45 100755 --- a/xonstat/templates/map_info.mako +++ b/xonstat/templates/map_info.mako @@ -1,8 +1,14 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> +<%namespace file="navlinks.mako" import="navlinks" /> + +<%block name="navigation"> +${nav.nav('maps')} + <%block name="title"> % if gmap: -Map Information for ${gmap.name} - +Map Information for ${gmap.name} % endif ${parent.title()} diff --git a/xonstat/templates/player_index.mako b/xonstat/templates/player_index.mako index 1aa38b5..e82a384 100755 --- a/xonstat/templates/player_index.mako +++ b/xonstat/templates/player_index.mako @@ -1,8 +1,13 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> <%namespace file="navlinks.mako" import="navlinks" /> +<%block name="navigation"> +${nav.nav('players')} + + <%block name="title"> -Player Index - ${parent.title()} +Player Index % if not players: diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako index fe583df..bb2fa89 100755 --- a/xonstat/templates/player_info.mako +++ b/xonstat/templates/player_info.mako @@ -1,6 +1,11 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> <%namespace file="accuracy.mako" import="accuracy" /> +<%block name="navigation"> +${nav.nav('players')} + + <%block name="css"> ${parent.css()} @@ -13,7 +18,7 @@ ${parent.js()} <%block name="title"> % if player: -Player Information for ${player.nick_strip_colors()} - +Player Information for ${player.nick_strip_colors()} % endif ${parent.title()} diff --git a/xonstat/templates/server_index.mako b/xonstat/templates/server_index.mako index c992962..7c21a00 100755 --- a/xonstat/templates/server_index.mako +++ b/xonstat/templates/server_index.mako @@ -1,8 +1,13 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> <%namespace file="navlinks.mako" import="navlinks" /> +<%block name="navigation"> +${nav.nav('servers')} + + <%block name="title"> -Map Index - ${parent.title()} +Server Index % if not servers: diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako index 5f6c2e1..69ca0a7 100755 --- a/xonstat/templates/server_info.mako +++ b/xonstat/templates/server_info.mako @@ -1,8 +1,13 @@ <%inherit file="base.mako"/> +<%namespace name="nav" file="nav.mako" /> + +<%block name="navigation"> +${nav.nav('servers')} + <%block name="title"> % if server: -Server Information for ${server.name} - +Server Information for ${server.name} % endif ${parent.title()} -- 2.39.2