From: Ant Zucaro <azucaro@gmail.com>
Date: Fri, 24 Jun 2011 20:04:51 +0000 (-0400)
Subject: Add a player index. Change the base template to have a players link.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=29f39e5c40fd3dcf445dfd8248a5d78b26f9c143;p=xonotic%2Fxonstat.git

Add a player index. Change the base template to have a players link.
---

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 386fd0a..fa91e50 100755
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -34,6 +34,13 @@ def main(global_config, **settings):
             pattern="/player/{player_id:\d+}/games/page/{page:\d+}", 
             view=player_game_index, renderer='player_game_index.mako') 
 
+    config.add_route(name="player_index_paged", 
+            pattern="/players/page/{page:\d+}", view=player_index, 
+            renderer='player_index.mako') 
+
+    config.add_route(name="player_index", pattern="/players", view=player_index, 
+            renderer='player_index.mako') 
+
     config.add_route(name="player_info", pattern="/player/{id:\d+}", view=player_info, 
             renderer='player_info.mako') 
 
diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako
old mode 100644
new mode 100755
index 5f96eb8..76b6dc0
--- a/xonstat/templates/base.mako
+++ b/xonstat/templates/base.mako
@@ -16,6 +16,7 @@
             <h3>Player Statistics for Xonotic</h3>
             </%block>
             <ul id="nav">
+                <li><a href="/players" title="Player Index">players</a></li>
                 <li><a href="/games" title="Game Index">games</a></li>
                 <li><a href="" title="Map Index">maps</a></li>
                 <li><a href="" title="Server Index">servers</a></li>
diff --git a/xonstat/templates/player_index.mako b/xonstat/templates/player_index.mako
new file mode 100755
index 0000000..d5f12e1
--- /dev/null
+++ b/xonstat/templates/player_index.mako
@@ -0,0 +1,33 @@
+<%inherit file="base.mako"/>
+
+<%block name="title">
+Player Index - ${parent.title()}
+</%block>
+
+% if not players:
+<h2>Sorry, no players yet. Get playing!</h2>
+
+% else:
+<h2>Player Index</h2>
+<table border="1">
+  <tr>
+    <th>#</th>
+    <th>Nick</th>
+    <th>Joined</th>
+  </tr>
+% for player in players:
+  <tr>
+    <td>${player.player_id}</th>
+    <td>${player.nick_html_colors()}</th>
+    <td>${player.create_dt.strftime('%m/%d/%Y at %H:%M')}</th>
+  </tr>
+% endfor
+</table>
+% endif
+
+% if players.previous_page:
+<a href="${request.route_url("player_index_paged", page=players.previous_page)}" name="Previous Page">Previous</a>
+% endif
+% if players.next_page:
+<a href="${request.route_url("player_index_paged", page=players.next_page)}" name="Next Page">Next</a>
+% endif
diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index 8f8b4d6..7371849 100755
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -15,9 +15,24 @@ def player_index(request):
     """
     Provides a list of all the current players. 
     """
-    players = DBSession.query(Player)
+    if 'page' in request.matchdict:
+        current_page = request.matchdict['page']
+    else:
+        current_page = 1
+
+    try:
+        player_q = DBSession.query(Player).\
+                filter(Player.player_id > 2).\
+                order_by(Player.player_id)
+
+        players = Page(player_q, current_page, url=page_url)
+
+        
+    except Exception as e:
+        players = None
+
+    return {'players':players, }
 
-    return {'players':players}
 
 def player_info(request):
     """