X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Ftemplates%2Faccuracy.mako;h=3c1e007c33dbf41f0301ca9b62f7d26ef92d651f;hb=ae2353788574f4d3858d631a932e83b2e1638401;hp=a540023e05cd3177d890b42f41725d5297034eac;hpb=b9d4f27df1c593ac374a6482d1d6893b9bd91217;p=xonotic%2Fxonstat.git

diff --git a/xonstat/templates/accuracy.mako b/xonstat/templates/accuracy.mako
old mode 100755
new mode 100644
index a540023..3c1e007
--- a/xonstat/templates/accuracy.mako
+++ b/xonstat/templates/accuracy.mako
@@ -10,41 +10,46 @@
 ## [3] = Max damage
 ## [4] = Hit
 ## [5] = Fired
+## [6] = Frags
 
-<table class="accuracy-table" border="1" cellpadding="3" align="center">
-<tr class="table-header">
-    <td></td>
-    <td>Weapon</td>
-    <td>Hit</td>
-    <td>Fired</td>
-    <td>Hit %</td>
-    <td>Actual Damage</td>
-    <td>Potential Damage</td>
-    <td>Damage %</td>
-</tr>
-% for weapon_stat in weapon_stats:
-<%
-if weapon_stat[3] > 0: 
-    damage_pct = round(float(weapon_stat[2])/weapon_stat[3]*100, 2)
-else:
-    damage_pct = 0
-if weapon_stat[5] > 0: 
-    hit_pct = round(float(weapon_stat[4])/weapon_stat[5]*100, 2)
-else:
-    hit_pct = 0
-%>
-<tr>
-    ## Note: the name of the image must match up with the weapon_cd 
-    ## entry of that weapon, else this won't work
-    <td><img src="${request.static_url("xonstat:static/images/%s.png" % weapon_stat[1])}" /></td>
-    <td style="text-align: left;">${weapon_stat[0]}</td>
-    <td>${weapon_stat[4]}</td>
-    <td>${weapon_stat[5]}</td>
-    <td>${hit_pct}%</td>
-    <td>${weapon_stat[2]}</td>
-    <td>${weapon_stat[3]}</td>
-    <td>${damage_pct}%</td>
-</tr>
-% endfor
+<table class="table-hover table-condensed">
+  <thead>
+    <th class="small-2 medium-1"></th>
+    <th class="show-for-medium-up">Weapon</th>
+    <th class="show-for-medium-up">Frags</th>
+    <th>Accuracy</th>
+    <th>Damage</th>
+  </thead>
+
+  <%
+    total_damage = 0
+    for weapon_stat in weapon_stats:
+      total_damage += weapon_stat[2]
+    if total_damage == 0:
+      total_damage = 1
+  %>
+
+  % for weapon_stat in weapon_stats:
+    <%
+      if weapon_stat[3] > 0: 
+        damage_pct = round(float(weapon_stat[2])/weapon_stat[3]*100, 2)
+      else:
+        damage_pct = 0
+
+      if weapon_stat[5] > 0: 
+        hit_pct = round(float(weapon_stat[4])/weapon_stat[5]*100, 2)
+      else:
+        hit_pct = 0
+    %>
+    <tr>
+      ## Note: the name of the image must match up with the weapon_cd 
+      ## entry of that weapon, else this won't work
+      <td class="small-2 medium-1 text-center"><span class="sprite sprite-${weapon_stat[1]}"></span></td>
+      <td class="show-for-medium-up">${weapon_stat[0]}</td>
+      <td class="show-for-medium-up">${weapon_stat[6]}</td>
+      <td>${weapon_stat[4]}/${weapon_stat[5]} (${hit_pct}%)</td>
+      <td>${weapon_stat[2]} (${round(float(weapon_stat[2])/total_damage*100, 2)}%)</td>
+    </tr>
+  % endfor
 </table>
 </%def>