X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fintel%2Fplanet.tt2;h=ce4626848705b27f0f14a3f91133e73e5d0fb5ef;hb=82c8844f01d81e70b789cdbd455bedc4b2f94c87;hp=7d18e536dc6b495e2984f2fd84b404fc6b4cdfc2;hpb=b6d8351387cf06b88e362a458aad1e0982e575dd;p=ndwebbie.git

diff --git a/root/src/intel/planet.tt2 b/root/src/intel/planet.tt2
index 7d18e53..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>
@@ -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>