From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 23 Oct 2016 14:12:41 +0000 (-0400)
Subject: Add links to the tables, rename the template to be consistent.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b5f3a39ba78031d83e9a2f84088f30d4bd4cfb2;p=xonotic%2Fxonstat.git

Add links to the tables, rename the template to be consistent.
---

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 3f9a43d..2b26e29 100644
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -146,10 +146,10 @@ def main(global_config, **settings):
     config.add_view(view=ServerTopMaps, route_name="server_top_maps", attr="json", renderer="json",
                     accept="text/json")
 
-    config.add_route("server_top_players", "/server/{id:\d+}/topactive")
-    config.add_view(view=ServerTopPlayers, route_name="server_top_players", attr="html",
-                    renderer="server_top_players_index.mako", accept="text/html")
-    config.add_view(view=ServerTopPlayers, route_name="server_top_players", attr="json",
+    config.add_route("server_top_active", "/server/{id:\d+}/topactive")
+    config.add_view(view=ServerTopPlayers, route_name="server_top_active", attr="html",
+                    renderer="server_top_active.mako", accept="text/html")
+    config.add_view(view=ServerTopPlayers, route_name="server_top_active", attr="json",
                     renderer="json", accept="text/json")
 
     config.add_route("server_top_scorers", "/server/{id:\d+}/topscorers")
diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako
index a6ae731..5893f91 100644
--- a/xonstat/templates/server_info.mako
+++ b/xonstat/templates/server_info.mako
@@ -45,7 +45,7 @@
 
   <div class="row">
     <div class="small-12 large-4 columns">
-      <h5>Top Scoring Players</h5>
+      <h5>Top Scoring Players <a href="${request.route_url('server_top_scorers', id=server.server_id)}" title="See more top scoring players for this server"><i class="fa fa-plus-circle"></i></a></h5>
       <table class="table-hover table-condensed">
         <thead>
           <tr>
@@ -70,7 +70,7 @@
     </div>
 
     <div class="small-12 large-4 columns">
-      <h5>Most Active Players</h5>
+      <h5>Most Active Players <a href="${request.route_url('server_top_active', id=server.server_id)}" title="See more active players for this server"><i class="fa fa-plus-circle"></i></a></h5>
       <table class="table-hover table-condensed">
         <thead>
           <tr>
@@ -95,7 +95,7 @@
     </div>
 
     <div class="small-12 large-4 columns">
-      <h5>Most Active Maps</h5>
+      <h5>Most Active Maps <a href="${request.route_url('server_top_maps', id=server.server_id)}" title="See more top maps for this server"><i class="fa fa-plus-circle"></i></a></h5>
       <table class="table-hover table-condensed">
         <thead>
           <tr>
diff --git a/xonstat/templates/server_top_active.mako b/xonstat/templates/server_top_active.mako
new file mode 100644
index 0000000..8613c5d
--- /dev/null
+++ b/xonstat/templates/server_top_active.mako
@@ -0,0 +1,57 @@
+<%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
+
+<%block name="navigation">
+  ${nav.nav('servers')}
+</%block>
+
+<%block name="title">
+  Server Active Players Index
+</%block>
+
+% if not top_players and start is not None:
+  <h2 class="text-center">Sorry, no more active players!</h2>
+
+% elif not top_players and start is None:
+  <h2 class="text-center">No active players found. Yikes, get playing!</h2>
+
+% else:
+  ##### ACTIVE PLAYERS #####
+  <div class="row">
+    <div class="small-12 large-6 large-offset-3 columns">
+      <table class="table-hover table-condensed">
+        <thead>
+          <tr>
+            <th class="small-2">#</th>
+            <th class="small-7">Nick</th>
+            <th class="small-3">Play Time</th>
+          </tr>
+        </thead>
+
+        <tbody>
+        % for tp in top_players:
+          <tr>
+            <td>${tp.rank}</td>
+            <td class="no-stretch"><a href="${request.route_url('player_info', id=tp.player_id)}" title="Go to the player info page for this player">${tp.nick|n}</a></td>
+            <td>${tp.alivetime}</td>
+          </tr>
+        % endfor
+        </tbody>
+      </table>
+      <p class="text-center"><small>Note: these figures are from the past ${lifetime} days</small>
+    </div>
+  </div>
+
+  % if len(top_players) == 20:
+    <div class="row">
+      <div class="small-12 large-6 large-offset-3 columns">
+        <ul class="pagination">
+          <li>
+            <a  href="${request.route_url('server_top_active', id=server_id, _query=query)}" name="Next Page">Next <i class="fa fa-arrow-right"></i></a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  % endif
+
+% endif
diff --git a/xonstat/templates/server_top_players_index.mako b/xonstat/templates/server_top_players_index.mako
deleted file mode 100644
index 344a02e..0000000
--- a/xonstat/templates/server_top_players_index.mako
+++ /dev/null
@@ -1,57 +0,0 @@
-<%inherit file="base.mako"/>
-<%namespace name="nav" file="nav.mako" />
-
-<%block name="navigation">
-  ${nav.nav('servers')}
-</%block>
-
-<%block name="title">
-  Server Active Players Index
-</%block>
-
-% if not top_players and start is not None:
-  <h2 class="text-center">Sorry, no more active players!</h2>
-
-% elif not top_players and start is None:
-  <h2 class="text-center">No active players found. Yikes, get playing!</h2>
-
-% else:
-  ##### ACTIVE PLAYERS #####
-  <div class="row">
-    <div class="small-12 large-6 large-offset-3 columns">
-      <table class="table-hover table-condensed">
-        <thead>
-          <tr>
-            <th class="small-2">#</th>
-            <th class="small-7">Nick</th>
-            <th class="small-3">Play Time</th>
-          </tr>
-        </thead>
-
-        <tbody>
-        % for tp in top_players:
-          <tr>
-            <td>${tp.rank}</td>
-            <td class="no-stretch"><a href="${request.route_url('player_info', id=tp.player_id)}" title="Go to the player info page for this player">${tp.nick|n}</a></td>
-            <td>${tp.alivetime}</td>
-          </tr>
-        % endfor
-        </tbody>
-      </table>
-      <p class="text-center"><small>Note: these figures are from the past ${lifetime} days</small>
-    </div>
-  </div>
-
-  % if len(top_players) == 20:
-    <div class="row">
-      <div class="small-12 large-6 large-offset-3 columns">
-        <ul class="pagination">
-          <li>
-            <a  href="${request.route_url('server_top_players', id=server_id, _query=query)}" name="Next Page">Next <i class="fa fa-arrow-right"></i></a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  % endif
-
-% endif