Show coords on raid view page

[ndwebbie.git] / root / src / raids / view.tt2

diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index e163b9de7f17e76da5cc4cf901606cae2503d884..826ac606190abc7dff8d8dd7b6be26e770753ba8 100644 (file)
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -22,6 +22,10 @@
 [% FOR t IN targets %]
 <fieldset class="[% t.style %]"> <legend><a name="target[% t.id %]">Target: #[% t.id %]</a></legend>
        <div class="leftinfo"><ul>
+               <li><a href="[% c.uri_for('targetcalc',t.id) %]" rel="external">Calc</a></li>
+               [% IF raid.released_coords %]
+               <li>Coords: [% t.x %]:[% t.y %]:[% t.z %]</li>
+               [% END %]
                <li>Size: [% t.size %]</li>
                <li class="[% t.scorebash %]">Score: [% t.score %]</li>
                <li class="[% t.valuebash %]">Value: [% t.value %]</li>
@@ -30,8 +34,9 @@
                <li>Hidden value: [% t.hidden %]</li>
                <li>Factory Usage: [% t.light %], [% t.medium %], [% t.heavy %]</li>
                <li>Race: [% t.race %]</li>
+               <li>Cap: [% t.cap * 100 | format('%.02f') %]</li>
                [% FOR r IN t.roids %]
-                       <li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp %] xp)</li>
+                       <li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp | commify %] xp)</li>
                [% END %]
        </ul>
        [% IF t.comment %]
@@ -43,15 +48,15 @@
        <tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
        <tr align="center">
                <th>Roids</th>
-               <td>[% t.roidMetal %]</td>
-               <td>[% t.roidCrystal %]</td>
-               <td>[% t.roidEonium %]</td>
+               <td>[% t.metal_roids | commify %]</td>
+               <td>[% t.crystal_roids | commify %]</td>
+               <td>[% t.eonium_roids | commify %]</td>
        </tr>
        <tr align="center">
                <th>Resources</th>
-               <td>[% t.resourceMetal %]</td>
-               <td>[% t.resourceCrystal %]</td>
-               <td>[% t.resourceEonium %]</td>
+               <td>[% t.metal | commify %]</td>
+               <td>[% t.crystal | commify %]</td>
+               <td>[% t.eonium | commify %]</td>
        </tr>
 
        </table>
@@ -61,32 +66,32 @@
        <tr><th>Waves</th></tr>
        <tr>
                <td>Research</td>
-               <td>[% t.techWaves %]</td>
+               <td>[% t.waves %]</td>
        </tr>
        <tr>
                <td>Amps</td>
-               <td>[% t.strucWave_Amplifier %]</td>
+               <td>[% t.amps %]</td>
        </tr>
        <tr>
                <td>Dists</td>
-               <td>[% t.strucWave_Distorter %]</td>
+               <td>[% t.distorters %]</td>
        </tr>
        <tr><th>Production</th></tr>
        <tr>
                <td>Research</td>
-               <td>[% t.techHulls %]</td>
+               <td>[% t.hulls %]</td>
        </tr>
        <tr>
                <td>Light factory</td>
-               <td>[% t.strucLight_Factory %]</td>
+               <td>[% t.light_fac %]</td>
        </tr>
        <tr>
                <td>Medium factory</td>
-               <td>[% t.strucMedium_Factory %]</td>
+               <td>[% t.medium_fac %]</td>
        </tr>
        <tr>
                <td>Heavy factory</td>
-               <td>[% t.strucHeavy_Factory %]</td>
+               <td>[% t.heavy_fac %]</td>
        </tr>
        </table>
        </div>
@@ -100,7 +105,7 @@
                <table>
                [% FOR s IN m.ships %]
                <tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-                       <td>[% s.ship %]</td><td>[% s.amount %]</td>
+                       <td>[% s.ship %]</td><td>[% s.amount | commify %]</td>
                </tr>
                [% END %]
                </table>
@@ -122,15 +127,15 @@
 
 <script type="text/javascript">
 function update(){
-       $.get("/jsrpc/update/[% raid %]/"+modified,{},parseUpdate);
+       $.get("/jsrpc/update/[% raid.id %]/"+modified,{},parseUpdate);
 }
 
 function claim(target,wave,command){
-       $.get("/jsrpc/"+command+"/"+[% raid %]+"/"+modified+"/"+target+"/"+wave,{},parseUpdate);
+       $.get("/jsrpc/"+command+"/"+[% raid.id %]+"/"+modified+"/"+target+"/"+wave,{},parseUpdate);
 }
 
 function join(target,wave,joinable){
-       $.get("/jsrpc/joinable/"+[% raid %]+"/"+modified+"/"+target+"/"+wave+"/"+joinable,{},parseUpdate);
+       $.get("/jsrpc/joinable/"+[% raid.id %]+"/"+modified+"/"+target+"/"+wave+"/"+joinable,{},parseUpdate);
 }
 
 $(document).ready(function(){