From 0115de9b88f8b8aa02bf278d0021c68c8a7e8ce9 Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Thu, 28 Mar 2013 14:27:42 -0400 Subject: [PATCH] Port over all older styles (tables in particular). All of the table-based stuff wasn't looking right under default, so port over the older ones instead. Change all tables having the "table-bordered" class to "table-hover". --- xonstat/static/css/app.css | 107 +++- xonstat/templates/accuracy.mako | 2 +- xonstat/templates/game_index.mako | 10 +- xonstat/templates/game_info.mako | 68 +-- xonstat/templates/map_index.mako | 8 +- xonstat/templates/map_info.mako | 10 +- xonstat/templates/player_captimes.mako | 2 +- xonstat/templates/player_game_index.mako | 2 +- xonstat/templates/player_index.mako | 8 +- xonstat/templates/player_info.mako | 593 +++++++++++------------ xonstat/templates/rank_index.mako | 50 +- xonstat/templates/scoreboard.mako | 506 +++++++++---------- xonstat/templates/server_index.mako | 8 +- xonstat/templates/server_info.mako | 8 +- 14 files changed, 749 insertions(+), 633 deletions(-) diff --git a/xonstat/static/css/app.css b/xonstat/static/css/app.css index c0f438d..b4f9de6 100644 --- a/xonstat/static/css/app.css +++ b/xonstat/static/css/app.css @@ -78,11 +78,19 @@ table td { .table-hover > tbody > tr:hover > th { background-color: #222; } +.table th, .table td { + border: 1px solid #436688; +} .table td { vertical-align: middle; } .table .tdcenter { text-align: center; } - +.accordion-group { + border: 1px solid rgb(39, 37, 37); +} +.accordion-inner { + border: none; +} /* One-off elements */ #statline { @@ -107,6 +115,12 @@ table td { text-align: center; text-shadow: 2px 2px 3px #333; } +.indexform { + margin: 20px 0px 20px 0px; +} +.indexbox { + width: 250px; +} /* Navigation bar */ @@ -132,6 +146,97 @@ table td { width: 100px; } +/* Game scoreboard */ +.game { + 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: #4d0000; +} +.game tr.blue { + background-color: #00004d; +} +.game tr.yellow { + background-color: #4d4d00; +} +.game tr.pink { + background-color: #4d004d; +} +.game tr:hover { + background-color: #222; +} + +/* accuracy and weapon graphs */ +.weapon-nav { + height: 70px; + margin-bottom: 20px; +} +.weapon-nav ul { + display: block; + list-style: none outside none; +} +.weapon-nav li { + cursor: pointer; + float: left; + margin-right: 10px; +} +.weapon-nav li:hover { + border-bottom: 2px solid #001021; +} +.weapon-nav .weapon-active { + border-bottom: 2px solid #436688; +} +.weapon-nav p { + text-align: center; +} + +.flot table, .flot td { + background-color: black; + border: 0; +} + +/* Player Info Tabs */ +#gbtabcontainer { margin-top: 10px; } +#gbtab { font-size: 12px; } +.tabbable p { font-size: 14px; } +.tabs-below .nav-tabs > li > a { border-radius: 4px 4px 4px 4px; } +.nav-tabs > .active > a, .nav-tabs > .active > a:hover { background-color: #111; color: #aaa; border-color: #222; } +.nav-tabs > li > a { border-radius: 4px 4px 4px 4px; text-align: center; } +.nav-tabs > li > a:hover { background-color: #111; border-color: #333; } +.nav-tabs { border-bottom: 0px solid #000; } + +.table .tdcenter { text-align: center; } + +/* Game Info and Game Index*/ +.game-detail img { + float: left; + margin-right: 10px; + margin-bottom: 5px; +} + +.game img { + float: left; + margin-right: 5px; + margin-bottom: 5px; +} + +.game-detail p, +.game h4 { + float: left; +} /* Desktop-specific stuff */ @media (min-width: 768px) { diff --git a/xonstat/templates/accuracy.mako b/xonstat/templates/accuracy.mako index 8ef282d..de8f084 100644 --- a/xonstat/templates/accuracy.mako +++ b/xonstat/templates/accuracy.mako @@ -11,7 +11,7 @@ ## [4] = Hit ## [5] = Fired - +
diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako index 0e8a037..a0c0059 100644 --- a/xonstat/templates/game_index.mako +++ b/xonstat/templates/game_index.mako @@ -16,7 +16,7 @@ Game Index % else:
-
+

Recent Games

% for (game, server, map, gametype) in games:
@@ -29,7 +29,11 @@ Game Index
- -${navlinks("game_index", games.page, games.last_page)} +
+
+ + ${navlinks("game_index", games.page, games.last_page)} +
+
% endif diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako index 3e567e4..2de16f5 100644 --- a/xonstat/templates/game_info.mako +++ b/xonstat/templates/game_info.mako @@ -8,18 +8,18 @@ ${nav.nav('games')} <%block name="css"> - ${parent.css()} - +${parent.css()} + <%block name="js"> - - +// show accordion only when loaded to prevent rollup from being seen +$("#acc-accordion").css('display', ''); + <%block name="title"> @@ -36,13 +36,13 @@ Game Information

Game Detail

${game.game_type_cd}

- Played: ${game.fuzzy_date()}
- Game Type: ${gametype.descr} (${game.game_type_cd})
- Server: ${server.name}
- Map: ${map.name}
- % if game.duration is not None: - Duration: ${"%s:%02d" % (game.duration.seconds/60, game.duration.seconds%60)} - % endif + Played: ${game.fuzzy_date()}
+ Game Type: ${gametype.descr} (${game.game_type_cd})
+ Server: ${server.name}
+ Map: ${map.name}
+ % if game.duration is not None: + Duration: ${"%s:%02d" % (game.duration.seconds/60, game.duration.seconds%60)} + % endif

@@ -59,28 +59,28 @@ Game Information

Best Flag Capture Times

-
Weapon
+
- - + + % for pgs in captimes: - - + - - + + + % endfor
NickCaptimeNickCaptime
+
% if pgs.player_id > 2: - + ${pgs.nick_html_colors()|n} - + % else: - ${pgs.nick_html_colors()|n} + ${pgs.nick_html_colors()|n} % endif - ${round(float(pgs.fastest.seconds) + (pgs.fastest.microseconds/1000000.0), 2)}
${round(float(pgs.fastest.seconds) + (pgs.fastest.microseconds/1000000.0), 2)}
@@ -94,12 +94,12 @@ Game Information

Accuracy Information

- % endif - % endfor + % endif + % endfor +
- -% endif + % endif % endif diff --git a/xonstat/templates/map_index.mako b/xonstat/templates/map_index.mako index ba5f594..cd90904 100644 --- a/xonstat/templates/map_index.mako +++ b/xonstat/templates/map_index.mako @@ -15,13 +15,13 @@ Map Index % else:
-
-
+
+ - + - +
diff --git a/xonstat/templates/map_info.mako b/xonstat/templates/map_info.mako index 8357f47..b9165f1 100644 --- a/xonstat/templates/map_info.mako +++ b/xonstat/templates/map_info.mako @@ -30,7 +30,7 @@ ${parent.title()}

Top Scoring Players

-
Name Added
+
@@ -59,7 +59,7 @@ ${parent.title()}

Most Active Players

-
#
+
@@ -88,7 +88,7 @@ ${parent.title()}

Most Active Servers

-
#
+
@@ -115,7 +115,7 @@ ${parent.title()}

Best Flag Capture Times

-
#
+
@@ -154,7 +154,7 @@ ${parent.title()}

Most Recent Games

-
Nick
+
diff --git a/xonstat/templates/player_captimes.mako b/xonstat/templates/player_captimes.mako index 96d8ff7..251d08b 100644 --- a/xonstat/templates/player_captimes.mako +++ b/xonstat/templates/player_captimes.mako @@ -13,7 +13,7 @@ Player captimes

Fastest flag capture times:

-
+
diff --git a/xonstat/templates/player_game_index.mako b/xonstat/templates/player_game_index.mako index f12966d..e5a5be6 100644 --- a/xonstat/templates/player_game_index.mako +++ b/xonstat/templates/player_game_index.mako @@ -21,7 +21,7 @@ Recent Games
-
Game
+
diff --git a/xonstat/templates/player_index.mako b/xonstat/templates/player_index.mako index 320437b..38da288 100644 --- a/xonstat/templates/player_index.mako +++ b/xonstat/templates/player_index.mako @@ -15,13 +15,13 @@ Player Index % else:
-
-
+
+ - + -
+
diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako index 4c7e740..051ca1e 100644 --- a/xonstat/templates/player_info.mako +++ b/xonstat/templates/player_info.mako @@ -7,179 +7,178 @@ ${nav.nav('players')} <%block name="css"> - ${parent.css()} - +${parent.css()} + <%block name="js"> - % if player is not None: - - - - - - + + + - % endif +}); + +$(".dmg-weap").click(function () { + var dataurl = $(this).find('a').attr('href'); + + $('.damage-nav').find('.weapon-active').removeClass('weapon-active'); + $(this).addClass('weapon-active'); + + $.ajax({ + url: dataurl, + method: 'GET', + dataType: 'json', + success: plot_dmg_graph + }); +}); + +// populate the graphs with the default weapons +$.ajax({ +url: '${request.route_url("player_accuracy", id=player.player_id)}', +method: 'GET', +dataType: 'json', +success: plot_acc_graph +}); + +$.ajax({ + url: '${request.route_url("player_damage", id=player.player_id)}', + method: 'GET', + dataType: 'json', + success: plot_dmg_graph +}); +}) + +% endif <%block name="title"> @@ -200,80 +199,80 @@ Player Information
-
+
% for g in games_played: -
-
-

- % if g.game_type_cd in overall_stats: - Last Played: ${overall_stats[g.game_type_cd].last_played_fuzzy}
- % endif +

+

+ % if g.game_type_cd in overall_stats: + Last Played: ${overall_stats[g.game_type_cd].last_played_fuzzy}
+ % endif - Games Played: ${g.games}
+ Games Played: ${g.games}
- Playing Time: ${overall_stats[g.game_type_cd].total_playing_time}
+ Playing Time: ${overall_stats[g.game_type_cd].total_playing_time}
- % if g.game_type_cd in fav_maps: - Favorite Map: ${fav_maps[g.game_type_cd].map_name}
- % endif -

-
-
-

- Win Percentage: ${round(g.win_pct,2)}% (${g.wins} wins, ${g.losses} losses)
- - % if g.game_type_cd in overall_stats: - % if overall_stats[g.game_type_cd].k_d_ratio is not None: - Kill Ratio: ${round(overall_stats[g.game_type_cd].k_d_ratio,2)} (${overall_stats[g.game_type_cd].total_kills} kills, ${overall_stats[g.game_type_cd].total_deaths} deaths)
- % endif - % endif + % if g.game_type_cd in fav_maps: + Favorite Map: ${fav_maps[g.game_type_cd].map_name}
+ % endif +

+
+
+

+ Win Percentage: ${round(g.win_pct,2)}% (${g.wins} wins, ${g.losses} losses)
- % if g.game_type_cd in elos: - % if g.game_type_cd == 'overall': - Best Elo: ${round(elos[g.game_type_cd].elo,2)} (${elos[g.game_type_cd].game_type_cd}, ${elos[g.game_type_cd].games} games)
- % else: - Elo: ${round(elos[g.game_type_cd].elo,2)} (${elos[g.game_type_cd].games} games)
- % endif - % endif + % if g.game_type_cd in overall_stats: + % if overall_stats[g.game_type_cd].k_d_ratio is not None: + Kill Ratio: ${round(overall_stats[g.game_type_cd].k_d_ratio,2)} (${overall_stats[g.game_type_cd].total_kills} kills, ${overall_stats[g.game_type_cd].total_deaths} deaths)
+ % endif + % endif - % if g.game_type_cd in ranks: - % if g.game_type_cd == 'overall': - Best Rank: ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank} (${ranks[g.game_type_cd].game_type_cd}, percentile: ${round(ranks[g.game_type_cd].percentile,2)})
 + % if g.game_type_cd in elos: + % if g.game_type_cd == 'overall': + Best Elo: ${round(elos[g.game_type_cd].elo,2)} (${elos[g.game_type_cd].game_type_cd}, ${elos[g.game_type_cd].games} games)
+ % else: + Elo: ${round(elos[g.game_type_cd].elo,2)} (${elos[g.game_type_cd].games} games)
+ % endif + % endif - % else: - Rank: ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank} (percentile: ${round(ranks[g.game_type_cd].percentile,2)})
 - % endif - % endif + % if g.game_type_cd in ranks: + % if g.game_type_cd == 'overall': + Best Rank: ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank} (${ranks[g.game_type_cd].game_type_cd}, percentile: ${round(ranks[g.game_type_cd].percentile,2)})
 - % if g.game_type_cd == 'ctf': - % if overall_stats[g.game_type_cd].cap_ratio is not None: - Cap Ratio: ${round(overall_stats[g.game_type_cd].cap_ratio,2)} (${overall_stats[g.game_type_cd].total_captures} captures, ${overall_stats[g.game_type_cd].total_pickups} pickups)
- % endif - % endif -

-
+ % else: + Rank: ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank} (percentile: ${round(ranks[g.game_type_cd].percentile,2)})
 + % endif + % endif + + % if g.game_type_cd == 'ctf': + % if overall_stats[g.game_type_cd].cap_ratio is not None: + Cap Ratio: ${round(overall_stats[g.game_type_cd].cap_ratio,2)} (${overall_stats[g.game_type_cd].total_captures} captures, ${overall_stats[g.game_type_cd].total_pickups} pickups)
+ % endif + % endif +

- % endfor
+ % endfor +
-
@@ -289,51 +288,51 @@ Player Information
    % if 'nex' in recent_weapons:
  • -
    - -

    Nex

    - -
    +
    + +

    Nex

    + +
    • % endif % if 'rifle' in recent_weapons:
  • -
    - -

    Rifle

    - -
    +
    + +

    Rifle

    + +
    • % endif % if 'minstanex' in recent_weapons:
  • -
    - -

    Minstanex

    - -
    +
    + +

    Minstanex

    + +
    • % endif % if 'uzi' in recent_weapons:
  • -
    - -

    Uzi

    - -
    +
    + +

    Uzi

    + +
    • % endif % if 'shotgun' in recent_weapons:
  • -
    - -

    Shotgun

    - -
    +
    + +

    Shotgun

    + +
    • % endif
@@ -355,61 +354,61 @@ Player Information
    % if 'rocketlauncher' in recent_weapons:
  • -
    - -

    Rocket

    - -
    +
    + +

    Rocket

    + +
    • % endif % if 'grenadelauncher' in recent_weapons:
  • -
    - -

    Mortar

    - -
    +
    + +

    Mortar

    + +
    • % endif % if 'electro' in recent_weapons:
  • -
    - -

    Electro

    - -
    +
    + +

    Electro

    + +
    • % endif % if 'crylink' in recent_weapons:
  • -
    - -

    Crylink

    - -
    +
    + +

    Crylink

    + +
    • % endif % if 'hagar' in recent_weapons:
  • -
    - -

    Hagar

    - -
    +
    + +

    Hagar

    + +
    • % endif % if 'laser' in recent_weapons:
  • -
    - -

    Laser

    - -
    +
    + +

    Laser

    + +
    • % endif @@ -426,57 +425,57 @@ Player Information

    Recent Games

    -
Nick Joined
+
- - - - - - - + + + + + + + % for rg in recent_games: - - - - - - + + + + + + + - - - + % else: + + % endif + + + % endfor
TypeServerMapResultPlayedEloTypeServerMapResultPlayedElo
view${rg.server_name}${rg.map_name} - % if rg.team != None: - % if rg.team == rg.winner: - Win - % else: - Loss - % endif +
view${rg.server_name}${rg.map_name} + % if rg.team != None: + % if rg.team == rg.winner: + Win + % else: + Loss + % endif % else: - % if rg.rank == 1: - Win + % if rg.rank == 1: + Win + % else: + Loss (#${rg.rank}) + % endif + % endif + ${rg.fuzzy_date} + + % if rg.elo_delta is not None: + % if round(rg.elo_delta,2) > 0: + + % elif round(rg.elo_delta,2) < 0: + % else: - Loss (#${rg.rank}) + % endif - % endif - ${rg.fuzzy_date} - - % if rg.elo_delta is not None: - % if round(rg.elo_delta,2) > 0: - - % elif round(rg.elo_delta,2) < 0: - - % else: - - % endif - % else: - - % endif - -
diff --git a/xonstat/templates/rank_index.mako b/xonstat/templates/rank_index.mako index 2a72a94..632823f 100644 --- a/xonstat/templates/rank_index.mako +++ b/xonstat/templates/rank_index.mako @@ -13,27 +13,35 @@ Capture The Flag Rank Index % endif -% if not ranks: -

Sorry, no ranks yet. Get some buddies together and start playing!

+
+
+ % if not ranks: +

Sorry, no ranks yet. Get some buddies together and start playing!

-% else: - - - - - - -<% i = 1 %> -% for rank in ranks: - - - -<% i += 1 %> -% endfor -
RankNickElo
${rank.rank}${rank.nick_html_colors()|n} - ${round(rank.elo, 3)} -
+ % else: + + + + + + + <% i = 1 %> + % for rank in ranks: + + + + <% i += 1 %> + % endfor +
RankNickElo
${rank.rank}${rank.nick_html_colors()|n} + ${round(rank.elo, 3)} +
+
+
- -${navlinks("rank_index", ranks.page, ranks.last_page, game_type_cd=game_type_cd)} +
+
+ + ${navlinks("rank_index", ranks.page, ranks.last_page, game_type_cd=game_type_cd)} +
+
% endif diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako index 2f0672c..5bb140b 100644 --- a/xonstat/templates/scoreboard.mako +++ b/xonstat/templates/scoreboard.mako @@ -1,38 +1,38 @@ <%def name="scoreboard(game_type_cd, pgstats, show_elo=False, show_latency=False)"> - -${scoreboard_header(game_type_cd, pgstats[0])} +
+ ${scoreboard_header(game_type_cd, pgstats[0])} % for pgstat in pgstats: - - + - % if show_latency and pgstat.avg_latency is not None: - - % elif show_latency: - - % endif - ${scoreboard_row(game_type_cd, pgstat)} - % if game_type_cd != 'cts': - - % endif - % if show_elo: - % if pgstat.elo_delta is not None: - - % else: - - % endif + ${pgstat.nick_html_colors()|n} % endif - + + % if show_latency and pgstat.avg_latency is not None: + + % elif show_latency: + + % endif + ${scoreboard_row(game_type_cd, pgstat)} + % if game_type_cd != 'cts': + + % endif + % if show_elo: + % if pgstat.elo_delta is not None: + + % else: + + % endif + % endif + % endfor
+
% if pgstat.player_id > 2: - + ${pgstat.nick_html_colors()|n} - + % else: - ${pgstat.nick_html_colors()|n} - % endif - - ${int(round(pgstat.avg_latency))} - ${pgstat.score}${round(pgstat.elo_delta,2)}-
+ ${int(round(pgstat.avg_latency))} + ${pgstat.score}${round(pgstat.elo_delta,2)}-
@@ -41,202 +41,202 @@ ${scoreboard_header(game_type_cd, pgstats[0])} ##### SCOREBOARD HEADER ##### <%def name="scoreboard_header(game_type_cd, pgstat)"> % if game_type_cd == 'as': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Suicides - Objectives - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Suicides + Objectives + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Suicides - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Suicides + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd == 'cq': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Captured - Released - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Captured + Released + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd == 'cts': - - - Nick - % if show_latency: - Ping - % endif - Fastest Time - Deaths - - + + + Nick + % if show_latency: + Ping + % endif + Fastest Time + Deaths + + % endif % if game_type_cd == 'ctf': - - - Nick - % if show_latency: - Ping - % endif - Kills - Captures - Pickups - FCK - Returns - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Captures + Pickups + FCK + Returns + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd == 'dom': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Takes - Ticks - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Takes + Ticks + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd in 'ft' 'freezetag': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Revivals - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Revivals + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd in 'ka' 'keepaway': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Pickups - BC Time - BC Kills - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Pickups + BC Time + BC Kills + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd == 'kh': - - - Nick - % if show_latency: - Ping - % endif - Kills - Deaths - Pickups - Captures - Losses - Pushes - Destroys - KC Kills - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Kills + Deaths + Pickups + Captures + Losses + Pushes + Destroys + KC Kills + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd in 'nb' 'nexball': - - - Nick - % if show_latency: - Ping - % endif - Goals - Faults - Score - % if show_elo: - Elo Change - % endif - - + + + Nick + % if show_latency: + Ping + % endif + Goals + Faults + Score + % if show_elo: + Elo Change + % endif + + % endif % if game_type_cd == 'rc': - - - Nick - % if show_latency: - Ping - % endif - Laps - Fastest Lap - Time - - + + + Nick + % if show_latency: + Ping + % endif + Laps + Fastest Lap + Time + + % endif @@ -244,99 +244,99 @@ ${scoreboard_header(game_type_cd, pgstats[0])} ##### SCOREBOARD ROWS ##### <%def name="scoreboard_row(game_type_cd, pgstat)"> % if game_type_cd == 'as': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.suicides} - ${pgstat.collects} +${pgstat.kills} +${pgstat.deaths} +${pgstat.suicides} +${pgstat.collects} % endif % if game_type_cd in 'ca' 'dm' 'duel' 'rune' 'tdm': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.suicides} +${pgstat.kills} +${pgstat.deaths} +${pgstat.suicides} % endif % if game_type_cd == 'cq': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.captures} - ${pgstat.drops} +${pgstat.kills} +${pgstat.deaths} +${pgstat.captures} +${pgstat.drops} % endif % if game_type_cd == 'cts': - % if pgstat.fastest is not None: - ${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)} - % else: - - - % endif - ${pgstat.deaths} +% if pgstat.fastest is not None: +${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)} +% else: +- +% endif +${pgstat.deaths} % endif % if game_type_cd == 'ctf': - ${pgstat.kills} - ${pgstat.captures} - ${pgstat.pickups} - ${pgstat.carrier_frags} - ${pgstat.returns} +${pgstat.kills} +${pgstat.captures} +${pgstat.pickups} +${pgstat.carrier_frags} +${pgstat.returns} % endif % if game_type_cd == 'dom': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.pickups} - ${pgstat.drops} +${pgstat.kills} +${pgstat.deaths} +${pgstat.pickups} +${pgstat.drops} % endif % if game_type_cd in 'ft' 'freezetag': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.revivals} +${pgstat.kills} +${pgstat.deaths} +${pgstat.revivals} % endif % if game_type_cd in 'ka' 'keepaway': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.pickups} +${pgstat.kills} +${pgstat.deaths} +${pgstat.pickups} - % if pgstat.time is not None: - ${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)} - % else: - - - % endif +% if pgstat.time is not None: +${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)} +% else: +- +% endif - ${pgstat.fckills} +${pgstat.fckills} % endif % if game_type_cd == 'kh': - ${pgstat.kills} - ${pgstat.deaths} - ${pgstat.pickups} - ${pgstat.captures} - ${pgstat.drops} - ${pgstat.pushes} - ${pgstat.destroys} - ${pgstat.carrier_frags} +${pgstat.kills} +${pgstat.deaths} +${pgstat.pickups} +${pgstat.captures} +${pgstat.drops} +${pgstat.pushes} +${pgstat.destroys} +${pgstat.carrier_frags} % endif % if game_type_cd in 'nb' 'nexball': - ${pgstat.captures} - ${pgstat.drops} +${pgstat.captures} +${pgstat.drops} % endif % if game_type_cd == 'rc': - ${pgstat.laps} +${pgstat.laps} - % if pgstat.fastest is not None: - ${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)} - % else: - - - % endif +% if pgstat.fastest is not None: +${round(float(pgstat.fastest.seconds) + (pgstat.fastest.microseconds/1000000.0), 2)} +% else: +- +% endif - % if pgstat.time is not None: - ${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)} - % else: - - - % endif +% if pgstat.time is not None: +${round(float(pgstat.time.seconds) + (pgstat.time.microseconds/1000000.0), 2)} +% else: +- +% endif % endif diff --git a/xonstat/templates/server_index.mako b/xonstat/templates/server_index.mako index 3a64f2f..fc3cb92 100644 --- a/xonstat/templates/server_index.mako +++ b/xonstat/templates/server_index.mako @@ -15,13 +15,13 @@ Server Index % else:
-
-
+
+ - + - +
diff --git a/xonstat/templates/server_info.mako b/xonstat/templates/server_info.mako index efe4801..ac0f90e 100644 --- a/xonstat/templates/server_info.mako +++ b/xonstat/templates/server_info.mako @@ -35,7 +35,7 @@ Server Information

Top Scoring Players

-
Name Added
+
@@ -64,7 +64,7 @@ Server Information

Most Active Players

-
#
+
@@ -93,7 +93,7 @@ Server Information

Most Active Maps

-
#
+
@@ -127,7 +127,7 @@ Server Information

Most Recent Games

-
#
+
-- 2.39.2