From: Ant Zucaro <azucaro@gmail.com>
Date: Mon, 6 Feb 2012 03:06:18 +0000 (-0500)
Subject: Make the scoreboards look more like they used to.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a4fca64967b09ad8ec30dd770fb73312671258a;p=xonotic%2Fxonstat.git

Make the scoreboards look more like they used to.
---

diff --git a/xonstat/static/css/style.css b/xonstat/static/css/style.css
index 3572e43..f43a3fd 100755
--- a/xonstat/static/css/style.css
+++ b/xonstat/static/css/style.css
@@ -3424,3 +3424,33 @@ a.thumbnail:hover {
 #navsearch select {
   width: 80px;
 }
+/* Game scoreboard */
+.game {
+  background-image: -moz-linear-gradient(center bottom , #062C52, #041B33);
+  border: 1px solid #A4B7CA;
+  border-radius: 7px 7px 7px 7px;
+  box-shadow: 0 0 3px 1px;
+  float: left;
+  margin-bottom: 30px;
+  min-width: 700px;
+  padding: 10px 7px;
+}
+.game a {
+    color: #CCC;
+}
+.game a:hover {
+    color: #d95f00;
+    text-decoration: none;
+}
+.game tr {
+    background-color: #000;
+}
+.game tr.red {
+  background-color: #571612;
+}
+.game tr.blue {
+  background-color: #000F4C;
+}
+.game tr:hover {
+    background-color: #222;
+}
diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 1fac682..f9d11de 100755
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -15,37 +15,19 @@ Game Index
 <h2>Sorry, no games yet. Get playing!</h2>
 
 % else:
-<div id="filter">
-	<h2>Filter</h2>
-	<input id="search" type="text" name="search" />
-	<input id="show-bots" type="checkbox" class="checkbox" checked="checked" /><label for="show-bots" class="checkbox-label">Show Bots</label><br />
-	<h3>Gametype</h3>
-	<input id="game-ca" type="checkbox" class="checkbox" /><label for="game-ca" class="checkbox-label">CA</label><br />
-	<input id="game-ctf" type="checkbox" class="checkbox" /><label for="game-ctf" class="checkbox-label">CTF</label><br />
-	<input id="game-dm" type="checkbox" class="checkbox" /><label for="game-dm" class="checkbox-label">DM</label><br />
-	<input id="game-freezetag" type="checkbox" class="checkbox" /><label for="game-freezetag" class="checkbox-label">Freezetag</label><br />
-	<h3>Sort By</h3>
-	<select id="sort-by">
-		<option>Kills</option>
-		<option>Deaths</option>
-		<option>Suicides</option>
-		<option>Time</option>
-		<option>Score</option>
-	</select>
+<div class="row">
+  <div class="span12">
+    <h2>Recent Games</h2>
+    % for (game, server, map) in games:
+    <div class="game">
+      <h4><img src="/static/images/icons/48x48/${game.game_type_cd}.png" width="30" height="30" /><a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a> <span class="permalink">(<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a>)</span></h4>
+      ${scoreboard(game.game_type_cd, pgstats[game.game_id])}
+    </div>
+    % endfor
+  </div>
 </div>
-<div id="recent-games-list">
-	<h2>Recent Games</h2>
-	% for (game, server, map) in games:
-	<div class="game">
-		<img src="/static/images/icons/48x48/${game.game_type_cd}.png"/><h3><a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a> <span class="permalink">(<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a>)</span></h3>
-	## show scoreboard using a def from another file
-	${scoreboard(game.game_type_cd, pgstats[game.game_id])}
-	</div>
-% endfor
 
 <!-- navigation links -->
 ${navlinks("game_index_paged", games.page, games.last_page)}
-
-</div><!-- #recent-games-list -->
 % endif
 
diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index e697691..148f795 100755
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,32 +1,32 @@
 <%def name="scoreboard(game_type_cd, pgstats)">
-<table class="scoreboard">
+<table  class="table table-bordered table-condensed">
 ${scoreboard_header(game_type_cd, pgstats[0])}
-	<tbody>
-	% for pgstat in pgstats:
-		<tr class="${pgstat.team_html_color()}">
-			<td>
-			% if pgstat.player_id > 2:
-			  <a href="${request.route_url("player_info", id=pgstat.player_id)}"
-			   title="Go to the info page for this player">
-			  <span class="nick">${pgstat.nick_html_colors()|n}</span>
-			  </a>
-			% else:
-			  <span class="nick">${pgstat.nick_html_colors()|n}</span>
-			% endif
-			</td>
-		${scoreboard_row(game_type_cd, pgstat)}
-			<td>${pgstat.score}</td>
-			<td>
-			% if pgstat.player_id > 1:
-			  <a href="${request.route_url("game_info", id=pgstat.game_id)}#accuracy-${pgstat.player_game_stat_id}"
-			   title="View weapon accuracy details for this player in this game">
-			  View
-			  </a>
-			% endif
-			</td>
-		</tr>
-	% endfor
-	</tbody>
+  <tbody>
+  % for pgstat in pgstats:
+    <tr class="${pgstat.team_html_color()}">
+      <td>
+      % if pgstat.player_id > 2:
+        <a href="${request.route_url("player_info", id=pgstat.player_id)}"
+         title="Go to the info page for this player">
+        <span class="nick">${pgstat.nick_html_colors()|n}</span>
+        </a>
+      % else:
+        <span class="nick">${pgstat.nick_html_colors()|n}</span>
+      % endif
+      </td>
+    ${scoreboard_row(game_type_cd, pgstat)}
+      <td>${pgstat.score}</td>
+      <td>
+      % if pgstat.player_id > 1:
+        <a href="${request.route_url("game_info", id=pgstat.game_id)}#accuracy-${pgstat.player_game_stat_id}"
+         title="View weapon accuracy details for this player in this game">
+        View
+        </a>
+      % endif
+      </td>
+    </tr>
+  % endfor
+  </tbody>
 </table>
 </%def>
 
@@ -34,53 +34,53 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
 <%def name="scoreboard_header(game_type_cd, pgstat)">
 % if game_type_cd == 'dm' or game_type_cd == 'tdm' or game_type_cd == 'duel':
     <thead>
-		<tr>
-			<th class="nick">Nick</th>
-			<th class="kills">Kills</th>
-			<th class="deaths">Deaths</th>
-			<th class="suicides">Suicides</th>
-			<th class="score">Score</th>
-			<th class="accuracy">Accuracy</th>
-		</tr>
+    <tr>
+      <th class="nick">Nick</th>
+      <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="suicides">Suicides</th>
+      <th class="score">Score</th>
+      <th class="accuracy">Accuracy</th>
+    </tr>
     </thead>
 % endif
 
 % if game_type_cd == 'ctf':
     <thead class="ctf ${pgstat.team_html_color()}">
-		<tr>
-			<th class="nick">Nick</th>
-			<th class="kills">Kills</th>
-			<th class="captures">Captures</th>
-			<th class="pickups">Pickups</th>
-			<th class="fck" title="Flag Carrier Kill">FCK</th>
-			<th class="returns">Returns</th>
-			<th class="score">Score</th>
-			<th class="accuracy">Accuracy</th>
-		</tr>
+    <tr>
+      <th class="nick">Nick</th>
+      <th class="kills">Kills</th>
+      <th class="captures">Captures</th>
+      <th class="pickups">Pickups</th>
+      <th class="fck" title="Flag Carrier Kill">FCK</th>
+      <th class="returns">Returns</th>
+      <th class="score">Score</th>
+      <th class="accuracy">Accuracy</th>
+    </tr>
     </thead>
 % endif
 
 % if game_type_cd == 'ca':
     <thead class="ca ${pgstat.team_html_color()}">
-		<tr>
-			<th class="nick">Nick</th>
-			<th class="kills">Kills</th>
-			<th class="score">Score</th>
-			<th class="accuracy">Accuracy</th>
-		</tr>
+    <tr>
+      <th class="nick">Nick</th>
+      <th class="kills">Kills</th>
+      <th class="score">Score</th>
+      <th class="accuracy">Accuracy</th>
+    </tr>
     </thead>
 % endif
 
 % if game_type_cd == 'freezetag':
     <thead class="freezetag ${pgstat.team_html_color()}">
-		<tr>
-			<th class="nick">Nick</th>
-			<th class="kills">Kills</th>
-			<th class="deaths">Deaths</th>
-			<th class="suicides">Suicides</th>
-			<th class="score">Score</th>
-			<th class="accuracy">Accuracy</th>
-		</tr>
+    <tr>
+      <th class="nick">Nick</th>
+      <th class="kills">Kills</th>
+      <th class="deaths">Deaths</th>
+      <th class="suicides">Suicides</th>
+      <th class="score">Score</th>
+      <th class="accuracy">Accuracy</th>
+    </tr>
     </thead>
 % endif
 </%def>