A rough outline of constructing the frag matrix for a single player.

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

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index e09f76df6605e81139ea6d44088458b6a8d706d0..d0d619f1131cc18089c84ae6690f5ac0f8383799 100644 (file)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -2,51 +2,49 @@
 <%namespace name="nav" file="nav.mako" />
 
 <%block name="navigation">
-  % if player.email_addr is not None:
-    ${nav.nav('players', True)}
-  % else:
+    ##### Disable the login button until a replacement is implemented.
     ${nav.nav('players', False)}
-  % endif
 </%block>
 
 <%block name="css">
   ${parent.css()}
+  <link href="/static/css/nv.d3.min.css" rel="stylesheet">
   <style>
     #damageChart, #accuracyChart {
-      height: 250px;
+      height: 300px;
     }
   </style>
 </%block>
 
 <%block name="js">
   ${parent.js()}
-  <script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1','packages':['corechart']}]}"></script>
-  <script src="/static/js/weaponCharts.min.js"></script>
+  <script type="text/javascript" src="/static/js/vendor/d3.min.js"></script>
+  <script type="text/javascript" src="/static/js/vendor/nv.d3.min.js"></script>
+  <script type="text/javascript" src="/static/js/weaponCharts.min.js"></script>
+  ##### <script src="/static/js/weaponCharts.min.js"></script>
   <script type="text/javascript">
 
     // game type buttons
     % for g in games_played:
     $('#tab-${g.game_type_cd}').click(function() {
       $.getJSON("${request.route_url('player_weaponstats_data_json', id=player.player_id, _query={'limit':20, 'game_type':g.game_type_cd})}", function(data) {
-        drawDamageChart(data);
-        drawAccuracyChart(data);
+        drawDamageChart("#damageChart", data);
+        drawAccuracyChart("#accuracyChart", data);
       });
     });
     % endfor
 
     // weapon accuracy and damage charts
-    google.load('visualization', '1.1', {packages: ['corechart']});
     $.getJSON("${request.route_url('player_weaponstats_data_json', id=player.player_id, _query={'limit':20})}", function(data) {
+    
       if(data.games.length < 5) {
         d3.select(".row #damageChart").remove();
         d3.select(".row #accuracyChart").remove();
       }
-      drawDamageChart(data);
-      drawAccuracyChart(data);
+      drawDamageChart("#damageChart", data);
+      drawAccuracyChart("#accuracyChart", data);
     });
   </script>
-  <script src="https://login.persona.org/include.js" type="text/javascript"></script>
-  <script type="text/javascript">${request.persona_js}</script>
 </%block>
 
 <%block name="title">
@@ -55,14 +53,19 @@
 
 <div class="row">
   <div class="small-12 columns">
-    <h2> ${player.nick_html_colors()|n} </h2>
+    <h2> 
+      ${player.nick_html_colors()|n} 
+      % for medal in medals:
+        <img src="/static/medals/${medal.image}" alt="${medal.alt}" title="${medal.alt}" />
+      % endfor
+    </h2>
+
     <h5>
-      <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>
+      <i><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">Joined ${player.fuzzy_date()}</span> (player #${player.player_id})</i>
       % if cake_day:
         <img src="/static/images/icons/24x24/cake.png" title="Happy cake day!" />
       % endif
     </h5>
-    <br />
   </div>
 </div>
 
@@ -197,7 +200,7 @@
 ##### ACCURACY CHART ####
 <div class="row" id="accuracyChartRow">
   <div class="small-12 columns">
-    <h3>Weapon Accuracy</h3>
+    <h5>Weapon Accuracy</h5>
     <noscript>
       Sorry, but you've disabled JavaScript! It is required to draw the accuracy chart.
     </noscript>
@@ -210,7 +213,7 @@
 ##### DAMAGE CHART ####
 <div class="row" id="damageChartRow">
   <div class="small-12 columns">
-    <h3>Weapon Damage</h3>
+    <h5>Weapon Damage</h5>
     <noscript>
       Sorry, but you've disabled JavaScript! It is required to draw the damage chart.
     </noscript>
@@ -224,7 +227,7 @@
 % if recent_games:
   <div class="row">
     <div class="small-12 columns">
-      <h3>Recent Games</h3>
+      <h5>Recent Games <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="Game index for ${player.stripped_nick}"><i class="fa fa-plus-circle"></i></a></h5>
       <table class="table-hover table-condensed">
         <thead>
           <tr>
@@ -279,13 +282,6 @@
         % endfor
         </tbody>
       </table>
-
-      % if total_games > 10:
-        <p>
-          <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="Game index for ${player.stripped_nick}">More...</a>
-        </p>
-      % endif
-
     </div>
   </div>
 % endif