Merge branch 'master' into zykure/approved

diff --git a/xonstat/templates/map_index.mako b/xonstat/templates/map_index.mako
index 62dac7ec2cce07534209102277edbae8ccd2fc90..7c75016cdfabfa2c110719e267f23026616550a9 100644 (file)
--- a/xonstat/templates/map_index.mako
+++ b/xonstat/templates/map_index.mako
@@ -34,7 +34,7 @@ Map Index
         <td><a href="${request.route_url("map_info", id=map.map_id)}" title="Go to this map's info page">${map.name}</a></th>
         <td><span class="abstime" data-epoch="${map.epoch()}" title="${map.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${map.fuzzy_date()}</span></td>
          <td class="tdcenter">
-          <a href="${request.route_url("game_finder", _query={'map_id':map.map_id})}" title="View recent games on this map">
+          <a href="${request.route_url("game_index", _query={'map_id':map.map_id})}" title="View recent games on this map">
             <i class="glyphicon glyphicon-list"></i>
           </a>
         </td>

diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako
index 6daae2e0e6c9fced10513547c40213ba20be7631..5fd152d5ac543e1ebf91c893da3a64235ea342bf 100644 (file)
--- a/xonstat/templates/map_info.mako
+++ b/xonstat/templates/map_info.mako
@@ -188,7 +188,7 @@ ${parent.title()}
         % endfor
       </tbody>
     </table>
-    <p><a href="${request.route_url('game_finder', _query={'map_id':gmap.map_id})}">More...</a></p>
+    <p><a href="${request.route_url('game_index', _query={'map_id':gmap.map_id})}">More...</a></p>
   </div>
 </div>
 % endif

diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
index f105436c165dd868ca84381632c69e49c1daa4f7..7637a3af5f6ddd3b87fae345861ffce5ce16d318 100644 (file)
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -139,7 +139,7 @@ Advanced Search
         <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_finder", _query={'server_id':server.server_id})}" title="View recent games on this server">
+          <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>
@@ -165,7 +165,7 @@ Advanced Search
           <td><a href="${request.route_url("map_info", id=map.map_id)}" title="Go to this map's info page">${map.name}</a></th>
           <td><span class="abstime" data-epoch="${map.epoch()}" title="${map.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${map.fuzzy_date()}</span></td>
            <td class="tdcenter">
-            <a href="${request.route_url("game_finder", _query={'map_id':map.map_id})}" title="View recent games on this map">
+            <a href="${request.route_url("game_index", _query={'map_id':map.map_id})}" title="View recent games on this map">
               <i class="glyphicon glyphicon-list"></i>
             </a>
           </td>

diff --git a/xonstat/templates/server_index.mako b/xonstat/templates/server_index.mako
index d266ba33b864f574d05c9ba956465c1f3ae684be..7c2e210bb28a7e15dbd61a651683b8fc6033213a 100644 (file)
--- a/xonstat/templates/server_index.mako
+++ b/xonstat/templates/server_index.mako
@@ -34,7 +34,7 @@ Server Index
         <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_finder", _query={'server_id':server.server_id})}" title="View recent games on this server">
+          <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>

diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako
index c85e2569e885b464d00d2886e12b8eb5a2cb13d7..5f54070f0e37eeb5c6eebb3df82d83aa570f2b26 100644 (file)
--- a/xonstat/templates/server_info.mako
+++ b/xonstat/templates/server_info.mako
@@ -159,7 +159,7 @@ Server Information
         % endfor
       </tbody>
     </table>
-    <p><a href="${request.route_url('game_finder', _query={'server_id':server.server_id})}">More...</a></p>
+    <p><a href="${request.route_url('game_index', _query={'server_id':server.server_id})}">More...</a></p>
   </div>
 </div>
 % endif