Add navlinks to the other index pages.

diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 7bf9a5458e5cb7fe717dc64028abe98251907bc5..7a369a35ee6f9ca8d6c2ca11ba1fdf7b223e59b7 100755 (executable)
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -1,5 +1,6 @@
 <%inherit file="base.mako"/>\r
 <%namespace file="scoreboard.mako" import="scoreboard" />\r
+<%namespace file="navlinks.mako" import="navlinks" />\r
 \r
 <%block name="title">\r
 Game Index - ${parent.title()}\r
@@ -36,12 +37,10 @@ Game Index - ${parent.title()}
        ${scoreboard(game.game_type_cd, pgstats[game.game_id])}\r
        </div>\r
 % endfor\r
+\r
+<!-- navigation links -->\r
+${navlinks("game_index_paged", games.page, games.last_page)}\r
+\r
 </div><!-- #recent-games-list -->\r
 % endif\r
 \r
-% if games.previous_page:\r
-<a href="${request.route_url("game_index_paged", page=games.previous_page)}" name="Previous Page">Previous</a>\r
-% endif\r
-% if games.next_page:\r
-<a href="${request.route_url("game_index_paged", page=games.next_page)}" name="Next Page">Next</a>\r
-% endif\r

diff --git a/xonstat/templates/map_index.mako b/xonstat/templates/map_index.mako
index 7598a4d912600a039319d92925d3f8e387222f24..13eaf4cc24a00e5f4a8501d338ae6d403db38e34 100755 (executable)
--- a/xonstat/templates/map_index.mako
+++ b/xonstat/templates/map_index.mako
@@ -1,4 +1,5 @@
 <%inherit file="base.mako"/>\r
+<%namespace file="navlinks.mako" import="navlinks" />\r
 \r
 <%block name="title">\r
 Map Index - ${parent.title()}\r
@@ -21,9 +22,5 @@ Map Index - ${parent.title()}
 </table>\r
 % endif\r
 \r
-% if maps.previous_page:\r
-<a href="${request.route_url("map_index_paged", page=maps.previous_page)}" name="Previous Page">Previous</a>\r
-% endif\r
-% if maps.next_page:\r
-<a href="${request.route_url("map_index_paged", page=maps.next_page)}" name="Next Page">Next</a>\r
-% endif\r
+<!-- navigation links -->\r
+${navlinks("map_index_paged", maps.page, maps.last_page)}\r

diff --git a/xonstat/templates/server_index.mako b/xonstat/templates/server_index.mako
index dd67c24a6c1622453a015596278c3f64d12cd6c0..a859023878d2bfb5a8c2ce07f891596dd5f18898 100755 (executable)
--- a/xonstat/templates/server_index.mako
+++ b/xonstat/templates/server_index.mako
@@ -1,4 +1,5 @@
 <%inherit file="base.mako"/>\r
+<%namespace file="navlinks.mako" import="navlinks" />\r
 \r
 <%block name="title">\r
 Map Index - ${parent.title()}\r
@@ -23,9 +24,5 @@ Map Index - ${parent.title()}
 </table>\r
 % endif\r
 \r
-% if servers.previous_page:\r
-<a href="${request.route_url("server_index_paged", page=servers.previous_page)}" name="Previous Page">Previous</a>\r
-% endif\r
-% if servers.next_page:\r
-<a href="${request.route_url("server_index_paged", page=servers.next_page)}" name="Next Page">Next</a>\r
-% endif\r
+<!-- navigation links -->\r
+${navlinks("server_index_paged", servers.page, servers.last_page)}\r