From: Jan Behrens <zykure@web.de>
Date: Sat, 20 Apr 2013 09:47:05 +0000 (+0200)
Subject: Merge branch 'master' into zykure/approved
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75e7a7632daf429eb04b102c2710967553dd6ad1;p=xonotic%2Fxonstat.git

Merge branch 'master' into zykure/approved

Conflicts:
	xonstat/templates/player_game_index.mako
---

75e7a7632daf429eb04b102c2710967553dd6ad1
diff --cc xonstat/templates/player_game_index.mako
index dabef43,68c1a5e..18eeeab
--- a/xonstat/templates/player_game_index.mako
+++ b/xonstat/templates/player_game_index.mako
@@@ -44,8 -44,12 +44,12 @@@ Recent Game
    <div class="span12 tabbable">
      <ul class="nav nav-tabs">
        % for game in games_played:
 +      % if not game.game_type_cd in ['cq']:
-       <li>
+       <li 
+       % if game.game_type_cd == game_type_cd or (game.game_type_cd == 'overall' and game_type_cd is None):
+       class="active"
+       % endif
+       >
 -
        % if game.game_type_cd == 'overall':
        <a href="${request.route_url("player_game_index", player_id=player.player_id)}" alt="${game.game_type_cd}" title="" data-toggle="none">
        % else: