X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Fmain_index.mako;h=c4e4cd6c824c0fe21d204e7dc81809e92362dbe5;hb=fb0026972b887555782c4e7ede4d6ca8c4705914;hp=04e510b47c68594556dbaab4b30113bb69c074e3;hpb=1e6f8c5ce0dfe99c86df0f4ef1e2fca3f53b162b;p=xonotic%2Fxonstat.git

diff --git a/xonstat/templates/main_index.mako b/xonstat/templates/main_index.mako
index 04e510b..c4e4cd6 100755
--- a/xonstat/templates/main_index.mako
+++ b/xonstat/templates/main_index.mako
@@ -1,130 +1,242 @@
 <%inherit file="base.mako"/>
 
 <%block name="title">
-Main Page - ${parent.title()}
+Leaderboard
 </%block>
 
-<div id="sidebar" class="leaderboard left">
+<div class="row">
+  <div class="span4">
+    ##### DUEL RANKS #####
+    <h3>Duel Ranks</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Nick</th>
+          <th>Elo</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% i = 1 %>
+      % for (player_id, nick, elo) in duel_ranks:
+        <tr>
+          <td>${i}</td>
+          % if player_id != '-':
+          <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick}</a></td>
+          % else:
+          <td>${nick}</td>
+          % endif
+          % if elo != '-':
+          <td>${round(elo, 3)}</td>
+          % else:
+          <td>${elo}</td>
+          % endif
+        </tr>
+        <% i = i+1 %>
+      % endfor
+      </tbody>
+    </table>
+    <p class="note"><a href="${request.route_url('rank_index', page=1, game_type_cd='duel')}" title="See more duel rankings">More...</a></p>
+  </div> <!-- /span4 -->
 
-##### TOP PLAYERS #####
-<h2>Top Players</h2>
-<table id="top-players">
-	<thead>
-		<tr>
-			<th>#</th>
-			<th>Nick</th>
-			<th>Score</th>
-		</tr>
-	</thead>
-	<tbody>
-	<% i = 1 %>
-	% for (player_id, nick, score) in top_players:
-		<tr>
-			<td>${i}</td>
-			% if player_id != '-':
-			<td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick|n}</a></td>
-			% else:
-			<td>${nick}</td>
-			% endif
-			<td>${score}</td>
-		</tr>
-		<% i = i+1 %>
-	% endfor
-	</tbody>
-</table>
+  <div class="span4">
+    ##### CTF RANKS #####
+    <h3>CTF Ranks</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Nick</th>
+          <th>Elo</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% i = 1 %>
+      % for (player_id, nick, elo) in ctf_ranks:
+        <tr>
+          <td>${i}</td>
+          % if player_id != '-':
+          <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick}</a></td>
+          % else:
+          <td>${nick}</td>
+          % endif
+          % if elo != '-':
+          <td>${round(elo, 3)}</td>
+          % else:
+          <td>${elo}</td>
+          % endif
+        </tr>
+        <% i = i+1 %>
+      % endfor
+      </tbody>
+    </table>
+    <p class="note"><a href="${request.route_url('rank_index', page=1, game_type_cd='ctf')}" title="See more CTF rankings">More...</a></p>
+  </div> <!-- /span4 -->
 
-##### TOP SERVERS #####
-<h2>Top Servers</h2>
-<table id="top-servers">
-	<thead>
-		<tr>
-			<th>#</th>
-			<th>Server</th>
-			<th>Games</th>
-		</tr>
-	</thead>
-	<tbody>
-	<% i = 1 %>
-	% for (server_id, name, count) in top_servers:
-		<tr>
-			<td>${i}</td>
-			% if server_id != '-':
-			<td><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for ${name}">${name}</a></td>
-			% else:
-			<td>${name}</td>
-			% endif
-			<td>${count}</td>
-		</tr>
-		<% i = i+1 %>
-	% endfor
-	</tbody>
-</table>
+  <div class="span4">
+    ##### DM RANKS #####
+    <h3>DM Ranks</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Nick</th>
+          <th>Elo</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% i = 1 %>
+      % for (player_id, nick, elo) in dm_ranks:
+        <tr>
+          <td>${i}</td>
+          % if player_id != '-':
+          <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick}</a></td>
+          % else:
+          <td>${nick}</td>
+          % endif
+          % if elo != '-':
+          <td>${round(elo, 3)}</td>
+          % else:
+          <td>${elo}</td>
+          % endif
+        </tr>
+        <% i = i+1 %>
+      % endfor
+    </tbody>
+  </table>
+  <p class="note"><a href="${request.route_url('rank_index', page=1, game_type_cd='dm')}" title="See more deathmatch rankings">More...</a></p>
+  </div> <!-- /span4 -->
+</div> <!-- /row -->
 
-##### TOP MAPS #####
-<h2>Top Maps</h2>
-<table id="top-maps">
-	<thead>
-		<tr>
-			<th>#</th>
-			<th>Map</th>
-			<th>Times Played</th>
-		</tr>
-	</thead>
-	<tbody>
-	<% i = 1 %>
-	% for (map_id, name, count) in top_maps:
-		<tr>
-			<td>${i}</td>
-			% if map_id != '-':
-			<td><a href="${request.route_url('map_info', id=map_id)}" title="Go to the map info page for ${name}">${name}</a></td>
-			% else:
-			<td>${name}</td>
-			% endif
-			<td>${count}</td>
-		</tr>
-		<% i = i+1 %>
-	% endfor
-	</tbody>
-</table>
-</div> <!-- END LEADERBOARD -->
+<div class="row">
+  <div class="span4">
+    <h3>Most Active Players</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Nick</th>
+          <th class="play-time">Play Time</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% i = 1 %>
+      % for (player_id, nick, alivetime) in top_players:
+        <tr>
+          <td>${i}</td>
+          % if player_id != '-':
+          <td><a href="${request.route_url('player_info', id=player_id)}" title="Go to the player info page for this player">${nick|n}</a></td>
+          % else:
+          <td>${nick}</td>
+          % endif
+          <td class="play-time">${alivetime}</td>
+        </tr>
+        <% i = i+1 %>
+      % endfor
+      </tbody>
+    </table>
+    <p class="note">*Most active stats are from the past 7 days</p>
+  </div> <!-- /span4 -->
 
-<div id="main" class="right">
+  <div class="span4">
+    <h3>Most Active Servers</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Server</th>
+          <th>Games</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% i = 1 %>
+      % for (server_id, name, count) in top_servers:
+        <tr>
+          <td>${i}</td>
+          % if server_id != '-':
+          <td><a href="${request.route_url('server_info', id=server_id)}" title="Go to the server info page for ${name}">${name}</a></td>
+          % else:
+          <td>${name}</td>
+          % endif
+          <td>${count}</td>
+        </tr>
+        <% i = i+1 %>
+      % endfor
+      </tbody>
+    </table>
+  </div> <!-- /span4 -->
 
-##### RECENT GAMES #####
-<h2>Recent Games</h2>
-<table id="recent-games">
-	<thead>
-		<tr>
-			<th>Game #</th>
-			<th>Type</th>
-			<th>Server</th>
-			<th>Map</th>
-			<th>Time</th>
-			<th>Winner</th>
-		</tr>
-	</thead>
-	<tbody>
-	% for (game, server, map) in recent_games:
-		% if game != '-':
-		<tr>
-			<td><a href="${request.route_url('game_info', id=game.game_id)}" title="View detailed information about this game">${game.game_id}</a></td>
-			<td>${game.game_type_cd}</td>
-			<td><a href="${request.route_url('server_info', id=server.server_id)}" title="Go to the detail page for this server">${server.name}</a></td>
-			<td><a href="${request.route_url('map_info', id=map.map_id)}" title="Go to the map detail page for this map">${map.name}</a></td>
-			<td>${game.start_dt.strftime('%m/%d/%Y %H:%M')}</td>
-			<td>${game.winner}</td>
-		</tr>
-		% else:
-		<tr>
-			<td>-</td>
-			<td>-</td>
-			<td>-</td>
-			<td>-</td>
-			<td>-</td>
-			<td>-</td>
-		</tr>
-		% endif
-    % endfor
-    </tbody>
-</table>
-</div> <!-- END RECENT GAMES -->
+  <div class="span4">
+    <h3>Most Active Maps</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>Map</th>
+          <th>Games</th>
+        </tr>
+      </thead>
+      <tbody>
+      <% i = 1 %>
+      % for (map_id, name, count) in top_maps:
+        <tr>
+          <td>${i}</td>
+          % if map_id != '-':
+          <td><a href="${request.route_url('map_info', id=map_id)}" title="Go to the map info page for ${name}">${name}</a></td>
+          % else:
+          <td>${name}</td>
+          % endif
+          <td>${count}</td>
+        </tr>
+        <% i = i+1 %>
+      % endfor
+      </tbody>
+    </table>
+  </div> <!-- /span4 -->
+</div> <!-- /row -->
+
+<div class="row">
+  <div class="span12">
+    <h3>Recent Games</h3>
+    <table class="table table-bordered table-condensed">
+      <thead>
+        <tr>
+          <th>Game #</th>
+          <th>Type</th>
+          <th>Server</th>
+          <th>Map</th>
+          <th>Time</th>
+          <th>Winner</th>
+        </tr>
+      </thead>
+      <tbody>
+      % for (game, server, map, pgstat) in recent_games:
+        % if game != '-':
+        <tr>
+          <td><a class="btn btn-primary btn-small" href="${request.route_url('game_info', id=game.game_id)}" title="View detailed information about this game">view</a></td>
+          <td class="gt_icon"><img title="${game.game_type_cd}" src="/static/images/icons/24x24/${game.game_type_cd}.png" alt="${game.game_type_cd}" /></td>
+          <td><a href="${request.route_url('server_info', id=server.server_id)}" title="Go to the detail page for this server">${server.name}</a></td>
+          <td><a href="${request.route_url('map_info', id=map.map_id)}" title="Go to the map detail page for this map">${map.name}</a></td>
+          <td>${game.start_dt.strftime('%m/%d/%Y %H:%M')}</td>
+          <td>
+            % if pgstat.player_id > 2:
+            <a href="${request.route_url('player_info', id=pgstat.player_id)}" title="Go to the player info page for this player">${pgstat.nick_html_colors()|n}</a></td>
+            % else:
+            ${pgstat.nick_html_colors()|n}</td>
+            % endif
+        </tr>
+        % else:
+        <tr>
+          <td>-</td>
+          <td>-</td>
+          <td>-</td>
+          <td>-</td>
+          <td>-</td>
+          <td>-</td>
+        </tr>
+        % endif
+        % endfor
+        </tbody>
+    </table>
+  </div> <!-- /span12 -->
+</div> <!-- /row -->