Merge branch 'master' into zykure/approved

Conflicts:
	xonstat/static/css/app.min.css

diff --combined xonstat/static/css/app.css
index 30797d0,a179feb..6a273b5
--- 1/xonstat/static/css/app.css
--- 2/xonstat/static/css/app.css
+++ b/xonstat/static/css/app.css
@@@ -150,7 -150,6 +150,6 @@@ table td 
  /* Game scoreboard */
  .game {
    float: left;
-   margin-bottom: 30px;
    min-width: 700px;
    padding: 10px 7px;
  }
@@@ -240,31 -239,6 +239,31 @@@
    float: left;
  }
  
 +
 +/* Teamscores */
 +.teamscores tr {
 +  background-color: #000;
 +}
 +.teamscores td {
 +  padding: 3px;
 +  text-align: center;
 +  font-size: 12px;
 +  font-weight: bold;
 +}
 +.teamscores tr.red {
 +  background-color: #4d0000;
 +}
 +.teamscores tr.blue {
 +  background-color: #00004d;
 +}
 +.teamscores tr.yellow {
 +  background-color: #4d4d00;
 +}
 +.teamscores tr.pink {
 +  background-color: #4d004d;
 +}
 +
 +
  /* Gametype filters */
  .btn-toolbar .nav > li a {
      width: 80px;
@@@ -318,6 -292,10 +317,10 @@@
    white-space: nowrap;
  }
  
+ .player-nick {
+     width: 25%;
+ }
+ 
  /* elo colors */
  .eloup { color: green; }
  .elodown { color: rgb(190,0,0); }

diff --combined xonstat/templates/game_info.mako
index 2d9bbfb,f612645..e498142
--- 1/xonstat/templates/game_info.mako
--- 2/xonstat/templates/game_info.mako
+++ b/xonstat/templates/game_info.mako
@@@ -32,9 -32,9 +32,9 @@@ Game Informatio
  
  % else:
  <div class="row">
 -  <div class="span10 game-detail">
 -    <h2>Game Detail</h2>
 -    <img width="48" height="48" src="/static/images/icons/48x48/${game.game_type_cd}.png" alt="${game.game_type_cd}"/>
 +  <h2>Game Detail</h2>
 +  <div class="span6 game-detail">
 +    <img width="64" height="64" src="/static/images/icons/48x48/${game.game_type_cd}.png" alt="${game.game_type_cd}"/>
      <p>
      Played: <span class="abstime" data-epoch="${game.epoch()}" title="${game.start_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${game.fuzzy_date()}</span><br />
      Game Type: ${gametype.descr} (${game.game_type_cd})<br />
@@@ -46,29 -46,15 +46,30 @@@
      </p>
      <span class="clear"></span>
    </div>
 +  % if teamscores:
 +  <div class="span3 teamscores">
 +    <table class="table table-condensed">
 +    <thead>
 +      <th>Team</th>
 +      <th>Score</th>
 +    </thead>
 +    <tbody>
 +    % for ts in teamscores:
 +      <tr class="${ts.team}"><td>${ts.team.capitalize()}</td><td>${ts.score}</td></tr>
 +    % endfor
 +    </tbody>
 +    </table>
 +  </div>
 +  % endif
  </div>
  
+ % for team in stats_by_team.keys():
  <div class="row">
    <div class="span12 game">
-     <h3>Scoreboard</h3>
-     ${scoreboard(game.game_type_cd, pgstats, show_elo, show_latency)}
+   ${scoreboard(game.game_type_cd, stats_by_team[team], show_elo, show_latency)}
    </div>
  </div>
+ % endfor
  
  % if len(captimes) > 0:
  <div class="row">