Escape planet and rule names in templates.

[ndwebbie.git] / root / lib / inc / stats.tt2

diff --git a/root/lib/inc/stats.tt2 b/root/lib/inc/stats.tt2
index 6ff6e0b2e8951e334648337e5b701e02a050c3c7..f39321ea63b703ef7b96e8f3cef551a85ddc3046 100644 (file)
--- a/root/lib/inc/stats.tt2
+++ b/root/lib/inc/stats.tt2
@@ -15,6 +15,7 @@
        <th>XP</th>
        <th>Roided</th>
        <th>Roiding</th>
+       [% IF intel %]<th>Last raid (tick)</th>[% END %]
        </tr>
        <tr align="right" class="odd">
                [% g.sizerankimg = (g.sizerank_gain_day == 0 ? 'stay' : (g.sizerank_gain_day < 0 ? 'up' : 'down')) %]
@@ -27,17 +28,18 @@
                <td title="[% g.xprank_gain_day %] Today | [% g.xprank_gain %] Tick">[% g.xprank %] <img src="/static/images/[% g.xprankimg %].png" alt="[% g.xprankimg %]"> </td>
                <td><a href="[% c.uri_for('/stats','galaxy',g.x,g.y) %]">[% g.x %]:[% g.y %]</a></td>
                [% g.planetsimg = (g.planets_gain_day == 0 ? 'stay' : (g.planets_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% g.planets_gain_day %] Today | [% g.planets_gain %] Tick">[% comma(g.planets) %] <img src="/static/images/[% g.planetsimg %].png" alt="[% g.planetsimg %]"> </td>
+               <td title="[% g.planets_gain_day %] Today | [% g.planets_gain %] Tick">[% g.planets | commify %] <img src="/static/images/[% g.planetsimg %].png" alt="[% g.planetsimg %]"> </td>
                [% g.sizeimg = (g.size_gain_day == 0 ? 'stay' : (g.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% g.size_gain_day %] Today | [% g.size_gain %] Tick">[% comma(g.size) %] <img src="/static/images/[% g.sizeimg %].png" alt="[% g.sizeimg %]"> </td>
+               <td title="[% g.size_gain_day %] Today | [% g.size_gain %] Tick">[% g.size | commify %] <img src="/static/images/[% g.sizeimg %].png" alt="[% g.sizeimg %]"> </td>
                [% g.scoreimg = (g.score_gain_day == 0 ? 'stay' : (g.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.score_gain_day) %] Today | [% comma(g.score_gain) %] Tick">[% comma(g.score) %] <img src="/static/images/[% g.scoreimg %].png" alt="[% g.scoreimg %]"> </td>
+               <td title="[% g.score_gain_day | commify %] Today | [% g.score_gain | commify %] Tick">[% g.score | commify %] <img src="/static/images/[% g.scoreimg %].png" alt="[% g.scoreimg %]"> </td>
                [% g.valueimg = (g.value_gain_day == 0 ? 'stay' : (g.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.value_gain_day) %] Today | [% comma(g.value_gain) %] Tick">[% comma(g.value) %] <img src="/static/images/[% g.valueimg %].png" alt="[% g.valueimg %]"> </td>
+               <td title="[% g.value_gain_day | commify %] Today | [% g.value_gain | commify %] Tick">[% g.value | commify %] <img src="/static/images/[% g.valueimg %].png" alt="[% g.valueimg %]"> </td>
                [% g.xpimg = (g.xp_gain_day == 0 ? 'stay' : (g.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.xp_gain_day) %] Today | [% comma(g.xp_gain) %] Tick">[% comma(g.xp) %] <img src="/static/images/[% g.xpimg %].png" alt="[% g.xpimg %]"> </td>
+               <td title="[% g.xp_gain_day | commify %] Today | [% g.xp_gain | commify %] Tick">[% g.xp | commify %] <img src="/static/images/[% g.xpimg %].png" alt="[% g.xpimg %]"> </td>
                <td>[% g.ticks_roided %]</td>
                <td>[% g.ticks_roiding %]</td>
+               [% IF intel %]<td>[% IF g.raid %][% g.raid %] ([% g.last_raid %])[% ELSE %]No raid[% END %]</td>[% END %]
        </tr>
 </table>
 [% END %]
@@ -63,16 +65,16 @@
                <td title="[% p.xprank_gain_day %] Today | [% p.xprank_gain %] Tick">[% p.xprank %] <img src="/static/images/[% p.xprankimg %].png" alt="[% p.xprankimg %]"> </td>
 
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.coords %]</a></td>
-               <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
-               <td align="center">[% p.race %]</td>
+               <td align="center">[% p.ruler | html %] <b>OF</b> [% p.planet %]</td>
+               <td align="center">[% p.race | html %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% comma(p.size) %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
+               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                [% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.score_gain_day) %] Today | [% comma(p.score_gain) %] Tick">[% comma(p.score) %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
+               <td title="[% p.score_gain_day | commify %] Today | [% p.score_gain | commify %] Tick">[% p.score | commify %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
                [% p.valueimg = (p.value_gain_day == 0 ? 'stay' : (p.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.value_gain_day) %] Today | [% comma(p.value_gain) %] Tick">[% comma(p.value) %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
+               <td title="[% p.value_gain_day | commify %] Today | [% p.value_gain | commify %] Tick">[% p.value | commify %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
                [% p.xpimg = (p.xp_gain_day == 0 ? 'stay' : (p.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.xp_gain_day) %] Today | [% comma(p.xp_gain) %] Tick">[% comma(p.xp) %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
+               <td title="[% p.xp_gain_day | commify %] Today | [% p.xp_gain | commify %] Tick">[% p.xp | commify %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
        [% IF details %]
                <td align="center">[% p.gov %]</td>
                <td align="center">[% p.fleetvalue %] ([% p.resvalue %])</td>