Merge zykure-approved, my fixes, and merge fixes :D

[xonotic/xonstat.git] / xonstat / templates / player_info.mako

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 051ca1ebfff0a4cbc371bc098cc772d2b3d80b75..70fd74e12ee4ad316fdd3ca3d2cc30e16a5d7280 100644 (file)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -194,6 +194,7 @@ Player Information
 <div class="row">
   <div class="span12">
     <h2>${player.nick_html_colors()|n}</h2>
+    <h4><i><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">Joined ${player.joined_pretty_date()}</span> (player #${player.player_id})</i></h4>
   </div>
 </div>
 
@@ -219,6 +220,15 @@ Player Information
           % if g.game_type_cd in fav_maps:
           Favorite Map: <small>${fav_maps[g.game_type_cd].map_name} <br /></small>
           % endif
+          
+          % if g.game_type_cd == 'ctf':
+          % if overall_stats[g.game_type_cd].total_captures is not None:
+          <small><a href="${request.route_url("player_captimes", id=player.player_id)}">Fastest flag captures...</a></small>
+          % endif
+          % else:
+          <small><br /></small>
+          % endif
+          
           </p>
         </div>
         <div class="span5">
@@ -252,6 +262,8 @@ Player Information
           % if  overall_stats[g.game_type_cd].cap_ratio is not None:
           Cap Ratio: <small>${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) <br /></small>
           % endif
+          % else:
+          <small><br /></small>
           % endif
           </p>
         </div>
@@ -265,7 +277,7 @@ Player Information
     <ul id="gbtab" class="nav nav-tabs">
       % for g in games_played:
       <li>
-      <a href="#tab-${g.game_type_cd}" data-toggle="tab">
+      <a href="#tab-${g.game_type_cd}" data-toggle="tab" alt="${g.game_type_cd}" title="">
         <span class="sprite sprite-${g.game_type_cd}"> </span><br />
         ${g.game_type_cd} <br />
         <small>(${g.games})</small>
@@ -279,9 +291,9 @@ Player Information
 
 % if 'nex' in recent_weapons or 'rifle' in recent_weapons or 'minstanex' in recent_weapons or 'uzi' in recent_weapons or 'shotgun' in recent_weapons:
 <div class="row">
-  <div class="span10">
+  <div class="span12">
     <h3>Accuracy</h3>
-    <div id="acc-graph" class="flot" style="width:900px; height:200px;">
+    <div id="acc-graph" class="flot" style="width:95%; height:200px;">
     </div>
 
     <div class="weapon-nav accuracy-nav">
@@ -345,9 +357,9 @@ Player Information
 
 % if 'rocketlauncher' in recent_weapons or 'grenadelauncher' in recent_weapons or 'electro' in recent_weapons or 'crylink' in recent_weapons or 'laser' in recent_weapons:
 <div class="row">
-  <div class="span10">
+  <div class="span12">
     <h3>Damage Efficiency</h3>
-    <div id="dmg-graph" class="flot" style="width:900px; height:200px;">
+    <div id="dmg-graph" class="flot" style="width:95%; height:200px;">
     </div>
 
     <div class="weapon-nav damage-nav">
@@ -442,8 +454,8 @@ Player Information
       <tr>
         <td class="tdcenter"><a class="btn btn-primary btn-small" href="${request.route_url('game_info', id=rg.game_id)}" title="View detailed information about this game">view</a></td>
         <td class="tdcenter"><span class="sprite sprite-${rg.game_type_cd}" alt="${rg.game_type_cd}" title="${rg.game_type_descr}"></span></td>
-        <td>${rg.server_name}</td>
-        <td>${rg.map_name}</td>
+        <td><a href="${request.route_url('server_info', id=rg.server_id)}" title="Go to the detail page for this server">${rg.server_name}</a></td>
+        <td><a href="${request.route_url('map_info', id=rg.map_id)}" title="Go to the detail page for this map">${rg.map_name}</a></td>
         <td>
           % if rg.team != None:
           % if rg.team == rg.winner:
@@ -464,14 +476,14 @@ Player Information
           <a href="${request.route_url('game_info', id=rg.game_id, _query={'show_elo':1})}" title="View detailed information about this game">
             % if rg.elo_delta is not None:
             % if round(rg.elo_delta,2) > 0:
-            <span title="Elo went up by ${round(rg.elo_delta,2)}"><i class="icon-arrow-up icon-white"></i></span>
+            <span class="eloup" title="Elo went up by ${round(rg.elo_delta,2)}"><i class="glyphicon glyphicon-arrow-up"></i></span>
             % elif round(rg.elo_delta,2) < 0:
-            <span title="Elo went down by ${round(-rg.elo_delta,2)}"><i class="icon-arrow-down icon-white"></i></span>
+            <span class="elodown" title="Elo went down by ${round(-rg.elo_delta,2)}"><i class="glyphicon glyphicon-arrow-down"></i></span>
             % else:
-            <span title="Elo did not change"><i class="icon-minus icon-white"></i></span>
+            <span class="eloneutral" title="Elo did not change"><i class="glyphicon glyphicon-minus"></i></span>
             % endif
             % else:
-            <span title="Elo did not change"><i class="icon-minus icon-white"></i></span>
+            <span class="eloneutral" title="Elo did not change"><i class="glyphicon glyphicon-minus"></i></span>
             % endif
           </a>
         </td>