Escape planet and rule names in templates.

[ndwebbie.git] / root / src / alliances / edit.tt2

diff --git a/root/src/alliances/edit.tt2 b/root/src/alliances/edit.tt2
index 11501b6e1375bf6a3c43b3bc0dafd84253c8af1b..609ee4c1e77ee4cc8f94d8468769bfad91fecf55 100644 (file)
--- a/root/src/alliances/edit.tt2
+++ b/root/src/alliances/edit.tt2
@@ -25,6 +25,7 @@
 </fieldset>
 </div>
 </fieldset>
+<p>Export information <a href="[% c.uri_for('/textexport/alliance',a.id) %]">as text</a>.</p>
 <div class="leftinfo">
 <img class="graph" src="[% c.uri_for('/graphs/alliancevsintel',a.id,STICK) %]" alt="Alliance size and score vs members" height="300" width="500">
 <img class="graph" src="[% c.uri_for('/graphs/avgalliancevsintel',a.id,STICK) %]" alt="Avg alliance size and score vs members" height="300" width="500">
@@ -47,7 +48,7 @@
                <td><a href="[% c.uri_for('/stats/planet',m.id) %]">[% m.coords %]</a></td>
                <td class="[% m.planet_status %]"><a href="[% c.uri_for('/intel/planet',m.id) %]">[% m.nick %]([% m.planet_status %])</a></td>
                <td>[% m.hit_us %]</td>
-               <td>[% m.ruler %] <b>OF</b> [% m.planet %]</td>
+               <td>[% m.ruler | html %] <b>OF</b> [% m.planet | html %]</td>
                <td>[% m.race %]</td>
                <td>[% m.size %] ([% m.sizerank %])</td>
                <td>[% m.score %] ([% m.scorerank %])</td>
@@ -70,13 +71,13 @@
        </tr>
 [% FOR i IN intel %]
        <tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-       <td>[% i.oalliance %]</td>
-       <td><a href="[% c.uri_for('planet',i.sender) %]">[% i.ocoords %]</a></td>
+       <td>[% i.salliance %]</td>
+       <td><a href="[% c.uri_for('/intel/planet',i.sender) %]">[% i.scoords %]</a></td>
        <td class="[% i.mission %]">[% i.mission %]</td>
        <td align="center">[% i.landingtick %]</td>
        <td align="center">[% i.eta %]</td>
        <td>[% i.amount %]</td>
-       <td><a href="[% c.uri_for('planet',i.target) %]">[% i.tcoords %]</a></td>
+       <td><a href="[% c.uri_for('/intel/planet',i.target) %]">[% i.tcoords %]</a></td>
        <td>[% i.talliance %]</td>
        <td>[% i.username %]</td>
        </tr>