Limit data points shown via JSON, not slice().

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

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index a1c40ef8d545285c073485c61b005c27f5dbbdc9..21a7490f5a30a26af7ba8cfa29632b9716b63c6e 100644 (file)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -1,20 +1,20 @@
 <%inherit file="base.mako"/>
 <%namespace name="nav" file="nav.mako" />
-<%namespace file="accuracy.mako" import="accuracy" />
-<%namespace file="accuracy_graph.mako" import="accuracy_graph" />
-<%namespace file="damage_graph.mako" import="damage_graph" />
 
 <%block name="navigation">
-${nav.nav('players')}
+% if player.email_addr is not None:
+${nav.nav('players', True)}
+% else:
+${nav.nav('players', False)}
+% endif
 </%block>
 
 <%block name="css">
 ${parent.css()}
 <link href="/static/css/sprites.css" rel="stylesheet">
-<link href="/static/css/nv.d3.css" rel="stylesheet" type="text/css">
 <style>
-#damageChartSVG, #accuracyChartSVG {
-  height: 300px;
+#damageChart, #accuracyChart {
+  height: 250px;
 }
 </style>
 </%block>
@@ -22,8 +22,11 @@ ${parent.css()}
 <%block name="js">
 ${parent.js()}
 <script src="/static/js/d3.v3.min.js"></script>
-<script src="/static/js/nv.d3.min.js"></script>
+<script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1','packages':['corechart']}]}"></script>
 <script src="/static/js/weaponCharts.js"></script>
+<script src="https://login.persona.org/include.js" type="text/javascript"></script>
+<script type="text/javascript">${request.persona_js}</script>
+
 <script type="text/javascript">
 // tabs
 $(function () {
@@ -36,7 +39,12 @@ $(function () {
 })
 
 // weapon accuracy and damage charts
-d3.json("${request.route_url('player_weaponstats_data_json', id=player.player_id)}", function(err, data) {
+google.load('visualization', '1.1', {packages: ['corechart']});
+d3.json("${request.route_url('player_weaponstats_data_json', id=player.player_id, _query={'limit':20})}", function(err, data) {
+  if(data.games.length < 5) {
+    d3.select(".row #damageChart").remove();
+    d3.select(".row #accuracyChart").remove();
+  }
   drawDamageChart(data);
   drawAccuracyChart(data);
 });
@@ -110,7 +118,7 @@ Player Information
 
           % 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> <br /></small>
+          <small><a href="${request.route_url("player_captimes", player_id=player.player_id)}">Fastest flag captures...</a> <br /></small>
           % else:
           <small><br /></small>
           % endif
@@ -144,23 +152,23 @@ Player Information
 
           % if g.game_type_cd in ranks:
           % if g.game_type_cd == 'overall':
-          Best Rank: <small>${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)}) <br /></small>
+            Best Rank: 
+            <small>
+              <a href="${request.route_url('rank_index', game_type_cd=ranks[g.game_type_cd].game_type_cd, _query={'page':(ranks[g.game_type_cd].rank-1)/20+1})}" title="Player rank page for this player">
+                ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank}
+              </a>
+              (${ranks[g.game_type_cd].game_type_cd}, percentile: ${round(ranks[g.game_type_cd].percentile,2)}) 
+              <br />
+            </small>
           % else:
           Rank: 
-          <small>
-            <a href="
-              % if ranks[g.game_type_cd].rank % 20 == 0:
-                ${request.route_url('rank_index', game_type_cd=g.game_type_cd, _query={'page':ranks[g.game_type_cd].rank/20})}
-
-              % else:
-                ${request.route_url('rank_index', game_type_cd=g.game_type_cd, _query={'page':ranks[g.game_type_cd].rank/20+1})}
-
-              % endif
-            " title="Player rank page for this player">
-            ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank}</a>
-            (percentile: ${round(ranks[g.game_type_cd].percentile,2)})
-            <br />
-          </small>
+            <small>
+              <a href="${request.route_url('rank_index', game_type_cd=g.game_type_cd, _query={'page':(ranks[g.game_type_cd].rank-1)/20+1})}" title="Player rank page for this player">
+                ${ranks[g.game_type_cd].rank} of ${ranks[g.game_type_cd].max_rank}
+              </a>
+              (percentile: ${round(ranks[g.game_type_cd].percentile,2)})
+              <br />
+            </small>
           % endif
           % else:
           <small><br /></small>
@@ -201,9 +209,12 @@ Player Information
 
 
 ##### Weapon Accuracy Chart ####
-<div class="row">
+<div class="row" id="accuracyChartRow">
   <div class="span12">
     <h3>Weapon Accuracy</h3>
+    <noscript>
+      Sorry, but you've disabled JavaScript! It is required to draw the accuracy chart.
+    </noscript>
     <div id="accuracyChart">
       <svg id="accuracyChartSVG"></svg>
     </div>
@@ -212,9 +223,12 @@ Player Information
 
 
 ##### Weapon Damage Chart ####
-<div class="row">
+<div class="row" id="damageChartRow">
   <div class="span12">
     <h3>Weapon Damage</h3>
+    <noscript>
+      Sorry, but you've disabled JavaScript! It is required to draw the damage chart.
+    </noscript>
     <div id="damageChart">
       <svg id="damageChartSVG"></svg>
     </div>
@@ -267,14 +281,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 class="eloup" title="Elo went up by ${round(rg.elo_delta,2)}"><i class="glyphicon glyphicon-arrow-up"></i></span>
+            <span class="eloup">+${round(rg.elo_delta,2)}</span>
             % elif round(rg.elo_delta,2) < 0:
-            <span class="elodown" title="Elo went down by ${round(-rg.elo_delta,2)}"><i class="glyphicon glyphicon-arrow-down"></i></span>
+            <span class="elodown">${round(rg.elo_delta,2)}</span>
             % else:
-            <span class="eloneutral" title="Elo did not change"><i class="glyphicon glyphicon-minus"></i></span>
+            <span class="eloneutral"><i class="glyphicon glyphicon-minus"></i></span>
             % endif
             % else:
-            <span class="eloneutral" title="Elo did not change"><i class="glyphicon glyphicon-minus"></i></span>
+            <span class="eloneutral"><i class="glyphicon glyphicon-minus"></i></span>
             % endif
           </a>
         </td>