]> git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fb00269)
Integrate navigation mako file and titles.
authorAnt Zucaro <azucaro@gmail.com>
Fri, 3 Feb 2012 02:55:42 +0000 (21:55 -0500)
committerAnt Zucaro <azucaro@gmail.com>
Fri, 3 Feb 2012 02:55:42 +0000 (21:55 -0500)
xonstat/templates/base.mako patch | blob | history
xonstat/templates/game_index.mako patch | blob | history
xonstat/templates/game_info.mako patch | blob | history
xonstat/templates/map_index.mako patch | blob | history
xonstat/templates/map_info.mako patch | blob | history
xonstat/templates/player_index.mako patch | blob | history
xonstat/templates/player_info.mako patch | blob | history
xonstat/templates/server_index.mako patch | blob | history
xonstat/templates/server_info.mako patch | blob | history

diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako
index 567334770fb8a7fcbc856e2552a2a69eef030eee..cdd47b39c48952a01c6c084b53abca7e08b9b4ec 100755 (executable)
--- a/xonstat/templates/base.mako
+++ b/xonstat/templates/base.mako
@@ -1,3 +1,4 @@
+<%namespace name="nav" file="nav.mako"/>
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -10,7 +11,6 @@
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <link href="/static/css/style.css" rel="stylesheet">
     <style type="text/css">
       body {
         padding-top: 60px;
@@ -19,32 +19,14 @@
     </style>
     <%block name="css">
     <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="/static/css/style.css" rel="stylesheet">
     </%block>
   </head>
 
   <body>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-          </a>
-          <a class="brand" href="#"><img src="/static/css/img/Xonotic_icon.png" /></a>
-          <div class="nav-collapse">
-            <ul class="nav">
-              <li class="active"><a href="${request.route_url('main_index')}" title="Leaderboard">Leaderboard</a></li>
-              <li><a href="${request.route_url('player_index')}" title="Player Index">Players</a></li>
-              <li><a href="${request.route_url('game_index')}" title="Game Index">Games</a></li>
-              <li><a href="${request.route_url('server_index')}" title="Server Index">Servers</a></li>
-              <li><a href="${request.route_url('map_index')}" title="Map Index">Maps</a></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
+    <%block name="navigation">
+    ${nav.nav("leaderboard")}
+    </%block>
 
     <div class="container">
 
diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 7a369a35ee6f9ca8d6c2ca11ba1fdf7b223e59b7..1fac682e5cc36b50cb0289aad26afa6313319c31 100755 (executable)
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -1,9 +1,14 @@
 <%inherit file="base.mako"/>\r
+<%namespace name="nav" file="nav.mako" />\r
 <%namespace file="scoreboard.mako" import="scoreboard" />\r
 <%namespace file="navlinks.mako" import="navlinks" />\r
 \r
+<%block name="navigation">\r
+${nav.nav('games')}\r
+</%block>\r
+\r
 <%block name="title">\r
-Game Index - ${parent.title()}\r
+Game Index\r
 </%block>\r
 \r
 % if not games:\r
diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako
index eeeeb1e277a719710e24d2e303e9241c366da351..bacc1a04ac297ac846cfbe5c1d26abde3a5f4d79 100755 (executable)
--- 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>
+
 <%block name="title">
-Game Information - ${parent.title()}
+Game Information
 </%block>
 
 
diff --git a/xonstat/templates/map_index.mako b/xonstat/templates/map_index.mako
index 05a76d75a8216f4d88c87a836580afe55e07d402..3e155fb87bb42c8dfafd520dda24e49f0de4ada1 100755 (executable)
--- a/xonstat/templates/map_index.mako
+++ b/xonstat/templates/map_index.mako
@@ -1,8 +1,13 @@
 <%inherit file="base.mako"/>\r
+<%namespace name="nav" file="nav.mako" />\r
 <%namespace file="navlinks.mako" import="navlinks" />\r
 \r
+<%block name="navigation">\r
+${nav.nav('maps')}\r
+</%block>\r
+\r
 <%block name="title">\r
-Map Index - ${parent.title()}\r
+Map Index\r
 </%block>\r
 \r
 % if not maps:\r
diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako
index c454e0ce186057f56d7d19914f2718e89562c8c5..f4f5b451e8d3e95e12649d20f95bd35c6008f7c9 100755 (executable)
--- 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>
 
 <%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 1aa38b5ec6399086afd0e318a7e11a6ebe344a77..e82a384422b8b35b50888fb9401c616096ec7ae8 100755 (executable)
--- a/xonstat/templates/player_index.mako
+++ b/xonstat/templates/player_index.mako
@@ -1,8 +1,13 @@
 <%inherit file="base.mako"/>\r
+<%namespace name="nav" file="nav.mako" />\r
 <%namespace file="navlinks.mako" import="navlinks" />\r
 \r
+<%block name="navigation">\r
+${nav.nav('players')}\r
+</%block>\r
+\r
 <%block name="title">\r
-Player Index - ${parent.title()}\r
+Player Index\r
 </%block>\r
 \r
 % if not players:\r
diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index fe583df2f2983c9e7ccad1be0a75f3281fda47e5..bb2fa8919ed59e5e8a3dc1c70d80daf139c94d97 100755 (executable)
--- 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>
+
 <%block name="css">
 ${parent.css()}
 <link rel="stylesheet" href="/static/css/colorbox.css" type="text/css" media="screen" />
@@ -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 c9929625619fb74ce5025357d348f9dad5edd1f2..7c21a00d9a94a2be19281503faf70a6e204214ca 100755 (executable)
--- a/xonstat/templates/server_index.mako
+++ b/xonstat/templates/server_index.mako
@@ -1,8 +1,13 @@
 <%inherit file="base.mako"/>\r
+<%namespace name="nav" file="nav.mako" />\r
 <%namespace file="navlinks.mako" import="navlinks" />\r
 \r
+<%block name="navigation">\r
+${nav.nav('servers')}\r
+</%block>\r
+\r
 <%block name="title">\r
-Map Index - ${parent.title()}\r
+Server Index\r
 </%block>\r
 \r
 % if not servers:\r
diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako
index 5f6c2e1e577454b799a549eadd9615ceaff00c81..69ca0a75ab9d9bc3d916c6393e9ddcc7cb8590e6 100755 (executable)
--- 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>
 
 <%block name="title">
 % if server:
-Server Information for ${server.name} - 
+Server Information for ${server.name}
 % endif
 
 ${parent.title()}