From fe2c574fdbacd574cfcb99a319224c01df8e38d3 Mon Sep 17 00:00:00 2001
From: Ant Zucaro <azucaro@gmail.com>
Date: Fri, 24 Jun 2011 16:36:29 -0400
Subject: [PATCH] Add server index and template. Fix links on player index and
 template.

---
 xonstat/__init__.py                 |  7 +++++++
 xonstat/templates/base.mako         |  3 ++-
 xonstat/templates/player_index.mako |  2 +-
 xonstat/templates/server_index.mako | 32 +++++++++++++++++++++++++++++
 xonstat/views/__init__.py           |  2 +-
 xonstat/views/player.py             |  2 +-
 xonstat/views/server.py             | 21 +++++++++++++++++++
 7 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100755 xonstat/templates/server_index.mako

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 0633753..49aab4f 100755
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -55,6 +55,13 @@ def main(global_config, **settings):
             renderer='game_info.mako') 
 
     # SERVER ROUTES
+    config.add_route(name="server_index_paged", 
+            pattern="/servers/page/{page:\d+}", view=server_index, 
+            renderer='server_index.mako') 
+
+    config.add_route(name="server_index", pattern="/servers", view=server_index, 
+            renderer='server_index.mako') 
+
     config.add_route(name="server_game_index", 
             pattern="/server/{server_id:\d+}/games/page/{page:\d+}", 
             view=server_game_index, renderer='server_game_index.mako') 
diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako
index 812ec31..473708d 100755
--- a/xonstat/templates/base.mako
+++ b/xonstat/templates/base.mako
@@ -16,10 +16,11 @@
             <h3>Player Statistics for Xonotic</h3>
             </%block>
             <ul id="nav">
+                <li><a href="/" title="Leaderboard">leaderboard</a></li>
                 <li><a href="/players" title="Player Index">players</a></li>
                 <li><a href="/games" title="Game Index">games</a></li>
                 <li><a href="/maps" title="Map Index">maps</a></li>
-                <li><a href="" title="Server Index">servers</a></li>
+                <li><a href="/servers" title="Server Index">servers</a></li>
             </ul>
         </div> <!-- END HEADER -->
         <div id="main">
diff --git a/xonstat/templates/player_index.mako b/xonstat/templates/player_index.mako
index d5f12e1..03f52b9 100755
--- a/xonstat/templates/player_index.mako
+++ b/xonstat/templates/player_index.mako
@@ -18,7 +18,7 @@ Player Index - ${parent.title()}
 % for player in players:
   <tr>
     <td>${player.player_id}</th>
-    <td>${player.nick_html_colors()}</th>
+    <td><a href="${request.route_url("player_info", id=player.player_id)}" title="Go to this player's info page">${player.nick_html_colors()}</a></th>
     <td>${player.create_dt.strftime('%m/%d/%Y at %H:%M')}</th>
   </tr>
 % endfor
diff --git a/xonstat/templates/server_index.mako b/xonstat/templates/server_index.mako
new file mode 100755
index 0000000..93b6f09
--- /dev/null
+++ b/xonstat/templates/server_index.mako
@@ -0,0 +1,32 @@
+<%inherit file="base.mako"/>
+
+<%block name="title">
+Map Index - ${parent.title()}
+</%block>
+
+% if not servers:
+<h2>Sorry, no servers yet. Get playing!</h2>
+
+% else:
+<h2>Server Index</h2>
+<table border="1">
+  <tr>
+    <th>#</th>
+    <th>Name</th>
+    <th>IP Address</th>
+  </tr>
+% for server in servers:
+  <tr>
+    <td>${server.server_id}</th>
+    <td><a href="${request.route_url("server_info", id=server.server_id)}" title="Go to this server's info page">${server.name}</a></th>
+  </tr>
+% endfor
+</table>
+% endif
+
+% if servers.previous_page:
+<a href="${request.route_url("server_index_paged", page=servers.previous_page)}" name="Previous Page">Previous</a>
+% endif
+% if servers.next_page:
+<a href="${request.route_url("server_index_paged", page=servers.next_page)}" name="Next Page">Next</a>
+% endif
diff --git a/xonstat/views/__init__.py b/xonstat/views/__init__.py
index c9fd80d..7fdf4d4 100755
--- a/xonstat/views/__init__.py
+++ b/xonstat/views/__init__.py
@@ -2,5 +2,5 @@ from xonstat.views.submission import stats_submit
 from xonstat.views.player import player_index, player_info, player_game_index
 from xonstat.views.game import game_index, game_info
 from xonstat.views.map import map_info, map_index
-from xonstat.views.server import server_info, server_game_index
+from xonstat.views.server import server_info, server_game_index, server_index
 from xonstat.views.main import main_index
diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index 7371849..c9e5290 100755
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -105,7 +105,7 @@ def player_info(request):
         weapon_stats = None
         game_stats = None
         recent_games = None
-        raise e
+
     return {'player':player, 
             'recent_games':recent_games,
             'weapon_stats':weapon_stats,
diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index 1df6f24..e0dce91 100755
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -9,6 +9,27 @@ from xonstat.util import page_url
 
 log = logging.getLogger(__name__)
 
+def server_index(request):
+    """
+    Provides a list of all the current servers. 
+    """
+    if 'page' in request.matchdict:
+        current_page = request.matchdict['page']
+    else:
+        current_page = 1
+
+    try:
+        server_q = DBSession.query(Server).\
+                order_by(Server.name)
+
+        servers = Page(server_q, current_page, url=page_url)
+
+        
+    except Exception as e:
+        servers = None
+
+    return {'servers':servers, }
+
 
 def server_info(request):
     """
-- 
2.39.2