Merge branch 'master' of github.com:antzucaro/XonStat

diff --git a/xonstat/templates/damage_graph.mako b/xonstat/templates/damage_graph.mako
new file mode 100644 (file)
index 0000000..0860504
--- /dev/null
+++ b/xonstat/templates/damage_graph.mako
@@ -0,0 +1,35 @@
+<%def name="damage_graph(recent_weapons)">
+### splash weapon info is available
+% 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="span12">
+    <h3>Damage Efficiency</h3>
+
+    <div id="dmg-graph" class="flot" style="width:95%; height:200px;">
+    </div>
+
+    <div class="weapon-nav damage-nav">
+      <ul>
+      % for weapon in ['rocketlauncher', 'grenadelauncher', 'electro', 'crylink', 'hagar', 'laser']:
+        % if weapon in recent_weapons:
+        <li>
+        ### the rocketlauncher is underscored first by default (until user selection)
+        % if weapon == 'rocketlauncher':
+          <div class="dmg-weap weapon-active">
+        % else:
+          <div class="dmg-weap">
+        % endif
+            <span class="sprite sprite-${weapon}"></span>
+            <p><small>${weapon}</small></p>
+            <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':weapon})}" title="Show ${weapon} efficiency"></a>
+          </div>
+        </li>
+        % endif
+      % endfor
+      </ul>
+    </div>
+
+  </div> <!-- END SPAN12 -->
+</div> <!-- END ROW -->
+% endif
+</%def>

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 293d1d5370478b8bde8de41962d60df7e87815d7..2539a0d899dd5222cbb1ea89d34b91ad8d8965ce 100644 (file)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -2,6 +2,7 @@
 <%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')}
@@ -331,86 +332,11 @@ Player Information
   </div>
 </div>
 
-
 ### ACCURACY GRAPH
 ${accuracy_graph(recent_weapons)}
 
-% 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="span12">
-    <h3>Damage Efficiency</h3>
-    <div id="dmg-graph" class="flot" style="width:95%; height:200px;">
-    </div>
-
-    <div class="weapon-nav damage-nav">
-      <ul>
-        % if 'rocketlauncher' in recent_weapons:
-        <li>
-        <div class="dmg-weap weapon-active">
-          <span class="sprite sprite-rocketlauncher"></span>
-          <p><small>Rocket</small></p>
-          <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':'rocketlauncher'})}" title="Show rocket launcher efficiency"></a>
-        </div>
-        </li>
-        % endif
-
-        % if 'grenadelauncher' in recent_weapons:
-        <li>
-        <div class="dmg-weap">
-          <span class="sprite sprite-grenadelauncher"></span>
-          <p><small>Mortar</small></p>
-          <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':'grenadelauncher'})}" title="Show mortar damage efficiency"></a>
-        </div>
-        </li>
-        % endif
-
-        % if 'electro' in recent_weapons:
-        <li>
-        <div class="dmg-weap">
-          <span class="sprite sprite-electro"></span>
-          <p><small>Electro</small></p>
-          <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':'electro'})}" title="Show electro damage efficiency"></a>
-        </div>
-        </li>
-        % endif
-
-        % if 'crylink' in recent_weapons:
-        <li>
-        <div class="dmg-weap">
-          <span class="sprite sprite-crylink"></span>
-          <p><small>Crylink</small></p>
-          <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':'crylink'})}" title="Show crylink damage efficiency"></a>
-        </div>
-        </li>
-        % endif
-
-        % if 'hagar' in recent_weapons:
-        <li>
-        <div class="dmg-weap">
-          <span class="sprite sprite-hagar"></span>
-          <p><small>Hagar</small></p>
-          <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':'hagar'})}" title="Show hagar damage efficiency"></a>
-        </div>
-        </li>
-        % endif
-
-        % if 'laser' in recent_weapons:
-        <li>
-        <div class="dmg-weap">
-          <span class="sprite sprite-laser"></span>
-          <p><small>Laser</small></p>
-          <a href="${request.route_url('player_damage', id=player.player_id, _query={'weapon':'laser'})}" title="Show laser damage efficiency"></a>
-        </div>
-        </li>
-        % endif
-
-      </ul>
-    </div>
-
-  </div>
-</div>
-% endif
-
+### DAMAGE GRAPH
+${damage_graph(recent_weapons)}
 
 ##### RECENT GAMES (v2) ####
 % if recent_games:

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 7442c80f086025c914fe7ae309fcb06b5bc603cd..b304085d9d57f7f66f28ae94813eb1b1872cfba4 100644 (file)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -256,8 +256,7 @@ def has_required_metadata(metadata):
     """\r
     flg_has_req_metadata = True\r
 \r
-    if 'T' not in metadata or\\r
-        'G' not in metadata or\\r
+    if 'G' not in metadata or\\r
         'M' not in metadata or\\r
         'I' not in metadata or\\r
         'S' not in metadata:\r