Support for planet tags

[ndwebbie.git] / root / src / intel / planet.tt2

diff --git a/root/src/intel/planet.tt2 b/root/src/intel/planet.tt2
index cb7aae78bac99649a5490b15a86a247a97d96611..86fbff97005f876802a87d58d8b59110ef394af6 100644 (file)
--- a/root/src/intel/planet.tt2
+++ b/root/src/intel/planet.tt2
@@ -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>