X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fintel%2Fplanet.tt2;h=ce4626848705b27f0f14a3f91133e73e5d0fb5ef;hb=202d442fc929b5e4cea904406dc546098516fde1;hp=cb7aae78bac99649a5490b15a86a247a97d96611;hpb=6e1e01771cd86b3b58f4932aacb0cc496b5c376d;p=ndwebbie.git

diff --git a/root/src/intel/planet.tt2 b/root/src/intel/planet.tt2
index cb7aae7..ce46268 100644
--- a/root/src/intel/planet.tt2
+++ b/root/src/intel/planet.tt2
@@ -21,8 +21,8 @@
 		</tr>
 		<tr><td>Government</td>
 			<td><select name="gov">
-[% FOR gov IN govs %]
-				<option value="[% gov %]" [% IF gov == p.gov %]selected[% END %]> [% gov %]</option>
+[% FOR g IN govs %]
+				<option value="[% g.gov %]" [% IF g.gov == p.gov %]selected[% END %]> [% g.gov_name %]</option>
 [% END %]
 				</select></td>
 			<td><input type="checkbox" name="cgov"></td>
@@ -38,7 +38,7 @@
 		<tr><td>Alliance</td>
 			<td><select name="alliance">
 [% FOR a IN alliances %]
-				<option value="[% a.id %]" [% IF a.id == p.alliance_id %]selected[% END %]> [% a.name %]</option>
+				<option value="[% a.alliance %]" [% IF a.aid == p.aid %]selected[% END %]> [% a.alliance %]</option>
 [% END %]
 				</select></td>
 			<td><input type="checkbox" name="calliance"></td>
@@ -48,6 +48,19 @@
 	</p>
 </form>
 
+[% IF tags.size > 0 %]
+<table class="stats">
+	<tr>
+	<th>Tag</th><th>Added by</th><th>Last added</th>
+	</tr>
+	[% FOR t IN tags %]
+	<tr>
+		<td>[% t.tag %]</td><td>[% t.nicks %]</td><td>[% t.time %]</td>
+	</tr>
+	[% END %]
+</table>
+[% END %]
+
 [% IF channelusers.size > 0 %]
 <table class="stats">
 	<tr>
@@ -69,8 +82,8 @@
 	</tr>
 [% FOR i IN incoming %]
 	<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('planet',i.sender) %]">[% i.scoords %]</a></td>
 	<td class="[% i.ingal ? 'ingal' : i.mission %]">[% i.mission %]</td>
 	<td align="center">[% i.landingtick %]</td>
 	<td align="center">[% i.eta %]</td>