Merge branch 'master' into zykure/approved

[xonotic/xonstat.git] / xonstat / templates / server_index.mako

diff --git a/xonstat/templates/server_index.mako b/xonstat/templates/server_index.mako
old mode 100755 (executable)
new mode 100644 (file)
index c992962..7c2e210
--- a/xonstat/templates/server_index.mako
+++ b/xonstat/templates/server_index.mako
@@ -1,33 +1,48 @@
-<%inherit file="base.mako"/>\r
-<%namespace file="navlinks.mako" import="navlinks" />\r
-\r
-<%block name="title">\r
-Map Index - ${parent.title()}\r
-</%block>\r
-\r
-% if not servers:\r
-<h2>Sorry, no servers yet. Get playing!</h2>\r
-\r
-% else:\r
-<h2>Server Index</h2>\r
-<form method="get" action="${request.route_url('search')}">\r
-    <input type="hidden" name="fs" />\r
-    <input type="text" name="server_name" />\r
-    <input type="submit" value="search" />\r
-</form>\r
-<table id="server-index-table" border="1">\r
-  <tr>\r
-    <th>Name</th>\r
-    <th class="create-dt">Added</th>\r
-  </tr>\r
-% for server in servers:\r
-  <tr>\r
-    <td><a href="${request.route_url("server_info", id=server.server_id)}" title="Go to this server's info page">${server.name}</a></th>\r
-    <td>${server.create_dt.strftime('%m/%d/%Y at %H:%M')}</td>\r
-  </tr>\r
-% endfor\r
-</table>\r
-% endif\r
-\r
-<!-- navigation links -->\r
-${navlinks("server_index_paged", servers.page, servers.last_page)}\r
+<%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
+<%namespace file="navlinks.mako" import="navlinks" />
+
+<%block name="navigation">
+${nav.nav('servers')}
+</%block>
+
+<%block name="title">
+Server Index
+</%block>
+
+% if not servers:
+<h2>Sorry, no servers yet. Get playing!</h2>
+
+% else:
+<div class="row">
+  <div class="span8 offset2">
+    <form class="indexform" method="get" action="${request.route_url('search')}">
+      <input type="hidden" name="fs" />
+      <input class="indexbox" type="text" name="server_name" />
+      <input type="submit" value="search" />
+    </form>
+    <table class="table table-hover table-condensed">
+      <tr>
+        <th style="width:60px;">ID</th>
+        <th>Name</th>
+        <th class="create-dt">Added</th>
+        <th></th>
+      </tr>
+    % for server in servers:
+      <tr>
+        <td>${server.server_id}</td>
+        <td><a href="${request.route_url("server_info", id=server.server_id)}" title="Go to this server's info page">${server.name}</a></th>
+        <td><span class="abstime" data-epoch="${server.epoch()}" title="${server.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${server.fuzzy_date()}</span></td>
+        <td class="tdcenter">
+          <a href="${request.route_url("game_index", _query={'server_id':server.server_id})}" title="View recent games on this server">
+            <i class="glyphicon glyphicon-list"></i>
+          </a>
+        </td>
+      </tr>
+    % endfor
+    </table>
+    % endif
+
+    ${navlinks("server_index", servers.page, servers.last_page)}
+  </div> <!-- /span4 -->
+</div> <!-- /row -->