Fix merge conflicts.

[xonotic/xonstat.git] / xonstat / templates / nvd3_damage.mako
diff --git a/xonstat/templates/nvd3_damage.mako b/xonstat/templates/nvd3_damage.mako

index 9b3accba222450482a30e664cf8100b6a52a668a..d6129224b774d74e936812f2ca959fdec26ea7f6 100644 (file)
--- a/xonstat/templates/nvd3_damage.mako
+++ b/xonstat/templates/nvd3_damage.mako
@@ -1,10 +1,19 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
+<%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
  
+<%block name="navigation">
+${nav.nav('players')}
+</%block>
+
+<%block name="title">
+Player Damage
+</%block>
+
+<%block name="css">
+${parent.css()}
  <link href="/static/css/nv.d3.css" rel="stylesheet" type="text/css">
  
  <style>
-
  body {
    overflow-y:scroll;
  }
@@ -13,19 +22,19 @@ text {
    font: 12px sans-serif;
  }
  
-#damageChartSVG, #chart2 {
+#damageChartSVG {
    height: 500px;
  }
-
  </style>
-<body>
-
-  <div id="damageChart">
-    <svg id="damageChartSVG"></svg>
-  </div>
+</%block>
  
  <script src="/static/js/d3.v3.min.js"></script>
+
+<%block name="js">
+${parent.js()}
+<script src="/static/js/d3.v3.js"></script>
  <script src="/static/js/nv.d3.min.js"></script>
+<script src="/static/js/weaponCharts.js"></script>
  <script>
      var doDamageGraph = function(data){
          // the chart should fill the "damageChart" div
@@ -80,8 +89,19 @@ text {
      }
  
      % if game_type_cd is not None:
-        d3.json("${request.route_url('player_damage_data_v2', id=player_id, _query={'limit':limit, 'game_type':game_type_cd})}", doDamageGraph);
+        d3.json("${request.route_url('player_weaponstats_data_json', id=player_id, _query={'limit':limit, 'game_type':game_type_cd})}", drawDamageChart);
      % else:
-        d3.json("${request.route_url('player_damage_data_v2', id=player_id, _query={'limit':limit})}", doDamageGraph);
+        d3.json("${request.route_url('player_weaponstats_data_json', id=player_id, _query={'limit':limit})}", drawDamageChart);
      % endif
  </script>
+</%block>
+
+<div class="row">
+  <div class="span12">
+
+    <div id="damageChart">
+      <svg id="damageChartSVG"></svg>
+    </div>
+
+  </div>
+</div>