Converted calls page, also using jquery.

[ndwebbie.git] / templates / raids.tmpl

diff --git a/templates/raids.tmpl b/templates/raids.tmpl
index e5c1f4a373e3ba63632f23e243b3ffbd9d42849c..4b88667db8dd21cda08ddb4b33355144f8e9d0db 100644 (file)
--- a/templates/raids.tmpl
+++ b/templates/raids.tmpl
@@ -52,7 +52,7 @@
        <p><b style="color: red;">DO NOT JOIN A WAVE UNLESS YOU HAVE PERMISSION FROM THE PERSON WHO CLAIMED IT</b></p>
        <p><b style="color: purple;">COORDS ARE NOT SHOWN UNTIL AT LEAST 10 MIN AFTER YOUR CLAIM</b></p>
        <p>Landing tick first wave: <TMPL_VAR NAME=LandingTick></p>
-       <TMPL_VAR NAME=Message>
+       <TMPL_VAR ESCAPE=NONE NAME=Message>
 </fieldset>
 
 <TMPL_IF Ajax>
@@ -74,6 +74,8 @@
                <li class="<TMPL_VAR NAME=ValueBash>">Value: <TMPL_VAR NAME=Value></li>
                <li>Fleet value: <TMPL_VAR NAME=FleetValue></li>
                <li>Resource value: <TMPL_VAR NAME=ResValue></li>
+               <li>Hidden value: <TMPL_VAR NAME=Hidden></li>
+               <li>Factory Usage: <TMPL_VAR NAME=Light>, <TMPL_VAR NAME=Medium>, <TMPL_VAR NAME=Heavy></li>
                <li>Race: <TMPL_VAR NAME=Race></li>
                <TMPL_LOOP Roids>
                        <li>Roids wave <TMPL_VAR NAME=Wave>: <TMPL_VAR NAME=Roids> (<TMPL_VAR NAME=XP> xp)</li>
@@ -81,19 +83,19 @@
        </ul>
        <TMPL_IF Comment>
                <fieldset> <legend>Comment</legend>
-                       <TMPL_VAR NAME=Comment>
+                       <TMPL_VAR ESCAPE=NONE NAME=Comment>
                </fieldset>
        </TMPL_IF>
        <table>
        <tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
        <tr align="center">
-               <td>Roids</td>
+               <th>Roids</th>
                <td><TMPL_VAR NAME=roidMetal></td>
                <td><TMPL_VAR NAME=roidCrystal></td>
                <td><TMPL_VAR NAME=roidEonium></td>
        </tr>
        <tr align="center">
-               <td>Resources</td>
+               <th>Resources</th>
                <td><TMPL_VAR NAME=resourceMetal></td>
                <td><TMPL_VAR NAME=resourceCrystal></td>
                <td><TMPL_VAR NAME=resourceEonium></td>
@@ -135,28 +137,22 @@
        </tr>
        </table>
        </div>
-       <div class="leftinfo">
-<table>
-       <tr><th>Name</th><th>Tick</th><th>Amount</th></tr>
        <TMPL_LOOP Missions>
-       <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>" onclick="toggleVisibility('fleet<TMPL_VAR NAME=Id>')">
-               <td><TMPL_VAR NAME=Name></td>
-               <td><TMPL_VAR NAME=Tick></td>
-               <td><TMPL_VAR NAME=Amount></td>
-       </tr>
-       <tr id="fleet<TMPL_VAR NAME=Id>" style="z-index:1; display:none;">
-               <td/>
-               <td colspan="5"><table>
+       <div class="leftinfo">
+
+               <p><TMPL_VAR NAME=Name><br/>
+                       Tick: <TMPL_VAR NAME=Tick><br/>
+                       Ships:<TMPL_VAR NAME=Amount>
+               </p>
+               <table>
                <TMPL_LOOP Ships>
-               <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+               <tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
                        <td><TMPL_VAR NAME=Ship></td><td><TMPL_VAR NAME=Amount></td>
                </tr>
                </TMPL_LOOP>
-               </table></td>
-       </tr>
-       </TMPL_LOOP>
-</table>
+               </table>
        </div>
+       </TMPL_LOOP>
        <div class="clear"> &nbsp;</div>
        <form action="<TMPL_VAR NAME=PAGE>" method="post">
        <p class="claimlinks">