Escape planet and rule names in templates.

[ndwebbie.git] / root / src / rankings / planets.tt2

diff --git a/root/src/rankings/planets.tt2 b/root/src/rankings/planets.tt2
index a58ae6f0a86e14ceb466649c38a691e7678e426d..20baa48d30b57c9ff376efed75b65e967efbda8c 100644 (file)
--- a/root/src/rankings/planets.tt2
+++ b/root/src/rankings/planets.tt2
@@ -1,6 +1,6 @@
 [% META title = 'Planet Rankings' %]
 <p>[% IF offset > 0 %]<a href="[% c.uri_for('planets', order, offset - 100) %]">Previous 100</a>[% END %]
-       <a href="[% c.uri_for('planets', order, offset + 100) %]">Next 100</a>
+       [% IF planets.size == 100 %]<a href="[% c.uri_for('planets', order, offset + 100) %]">Next 100</a>[% END %]
 </p>
 <table class="stats">
        <tr align="center"><th colspan="4">Rank</th>
@@ -35,16 +35,16 @@
                <td>[% p.x %] </td>
                <td><a href="[% c.uri_for('/stats','galaxy',p.x,p.y) %]">[% p.y %]</a></td>
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.z %]</a></td>
-               <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
+               <td align="center">[% p.ruler | html %] <b>OF</b> [% p.planet | html %]</td>
                <td align="center">[% p.race %]</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 extracolumns %]
        <td align="center" class="[% p.planet_status %]"><a href="[% c.uri_for('/intel','planet',p.id) %]">[% p.nick %]([% p.planet_stats %])</a></td>
@@ -55,5 +55,5 @@
 [% END %]
 </table>
 <p>[% IF offset > 0 %]<a href="[% c.uri_for('planets', order, offset - 100) %]">Previous 100</a>[% END %]
-       <a href="[% c.uri_for('planets', order, offset + 100) %]">Next 100</a>
+       [% IF planets.size == 100 %]<a href="[% c.uri_for('planets', order, offset + 100) %]">Next 100</a>[% END %]
 </p>