X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Falliances%2Fedit.tt2;h=609ee4c1e77ee4cc8f94d8468769bfad91fecf55;hb=39308b229f28f289606694803fffe83a64c0c91d;hp=3c766d1ddead456d0d3d2292498d746b9de8719f;hpb=bbf7be110f409388f96635a412854a9a2de644dc;p=ndwebbie.git

diff --git a/root/src/alliances/edit.tt2 b/root/src/alliances/edit.tt2
index 3c766d1..609ee4c 100644
--- 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,8 +71,8 @@
 	</tr>
 [% FOR i IN intel %]
 	<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-	<td>[% i.oalliance %]</td>
-	<td><a href="[% c.uri_for('/intel/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>