X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=templates%2Fcheck.tmpl;h=37be1103fd22c1a7d882bb8a8fe7c6ec5aeeb161;hb=c63c494456566d34013d9c97993ffcb9dcbd771d;hp=e4f6f7325b001c0397d7accffd346d9027a9e42a;hpb=a0ed1cdb42b8811b549f2b5028431f3c46a7e262;p=ndwebbie.git

diff --git a/templates/check.tmpl b/templates/check.tmpl
index e4f6f73..37be110 100644
--- a/templates/check.tmpl
+++ b/templates/check.tmpl
@@ -16,7 +16,7 @@
 	<th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP</a></th>
 	</tr>
 	<TMPL_LOOP Galaxies>
-	<tr align="right" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr align="right" class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
 		<td title="<TMPL_VAR NAME=SizeRank_Gain_day> Today | <TMPL_VAR NAME=SizeRank_Gain> Tick"><TMPL_VAR NAME=SizeRank> <img src="/images/<TMPL_VAR NAME=SizeRankImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
 		<td title="<TMPL_VAR NAME=ScoreRank_Gain_day> Today | <TMPL_VAR NAME=ScoreRank_Gain> Tick"><TMPL_VAR NAME=ScoreRank> <img src="/images/<TMPL_VAR NAME=ScoreRankImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
 		<td title="<TMPL_VAR NAME=ValueRank_Gain_day> Today | <TMPL_VAR NAME=ValueRank_Gain> Tick"><TMPL_VAR NAME=ValueRank> <img src="/images/<TMPL_VAR NAME=ValueRankImg>.png" alt="<TMPL_VAR NAME=ValueImg>"/> </td>
@@ -36,11 +36,11 @@
 <table>
 	<tr align="center"><th colspan="4">Rank</th>
 	</tr>
-	<tr><th>Size</th><th>Score</th><th>Value </th> <th>XP</th><th>Coords</th><th>Planet</th><th>Race</th><th>Size</th><th>Score</th><th>Value </th>
+	<tr><th>Size</th><th>Score</th><th>Value </th> <th>XP</th><th>Coords</th><th>Planet</th><th>Race</th><th>Gov</th><th>Size</th><th>Score</th><th>Value </th>
 		<th>XP</th><th>Fleet (Resource) value</th><TMPL_IF isBC><th>Nick</th><th>Hit us</th><th>Alliance</th></TMPL_IF>
 	</tr>
 	<TMPL_LOOP GPlanets>
-	<tr align="right" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr align="right" class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
 
 		<td style="padding-left: 0.5em" title="<TMPL_VAR NAME=SizeRank_Gain_day> Today | <TMPL_VAR NAME=SizeRank_Gain> Tick"><TMPL_VAR NAME=SizeRank> <img src="/images/<TMPL_VAR NAME=SizeRankImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
 		<td style="padding-left: 0.5em" title="<TMPL_VAR NAME=ScoreRank_Gain_day> Today | <TMPL_VAR NAME=ScoreRank_Gain> Tick"><TMPL_VAR NAME=ScoreRank> <img src="/images/<TMPL_VAR NAME=ScoreRankImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
@@ -50,6 +50,7 @@
 		<td align="left"><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
 		<td align="center"><TMPL_VAR NAME=Planet></td>
 		<td align="center"><TMPL_VAR NAME=Race></td>
+		<td align="center"><TMPL_VAR NAME=Gov></td>
 		<td style="padding-left: 0.5em" title="<TMPL_VAR NAME=Size_Gain_day> Today | <TMPL_VAR NAME=Size_Gain> Tick"><TMPL_VAR NAME=Size> <img src="/images/<TMPL_VAR NAME=SizeImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
 		<td style="padding-left: 0.5em" title="<TMPL_VAR NAME=Score_Gain_day> Today | <TMPL_VAR NAME=Score_Gain> Tick"><TMPL_VAR NAME=Score> <img src="/images/<TMPL_VAR NAME=ScoreImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
 		<td style="padding-left: 0.5em" title="<TMPL_VAR NAME=Value_Gain_day> Today | <TMPL_VAR NAME=Value_Gain> Tick"><TMPL_VAR NAME=Value> <img src="/images/<TMPL_VAR NAME=ValueImg>.png" alt="<TMPL_VAR NAME=ValueImg>"/> </td>
@@ -67,6 +68,18 @@
 <TMPL_IF OnePlanet>
 <div class="leftinfo">
 <table>
+<tr><th>Tick</th><th>Type</th>Amount</tr>
+<TMPL_LOOP PlanetData>
+<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
+	<td><TMPL_VAR NAME=Tick></td>
+	<td><TMPL_VAR NAME=Category> <TMPL_VAR NAME=Name></td>
+	<td><TMPL_VAR NAME=Amount></td>
+</tr>
+</TMPL_LOOP>
+</table>
+</div>
+<div class="leftinfo">
+<table>
 <tr><th>Tick</th><th>Value</th><th>Gain</th></tr>
 <TMPL_LOOP Values>
 <tr>
@@ -78,25 +91,26 @@
 </div>
 <div class="leftinfo">
 <table>
+<tr><th>Tick</th><th>Scan</th></tr>
+<TMPL_LOOP Scans>
+<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
+	<td><TMPL_VAR NAME=Tick></td>
+	<td><a href="http://game.planetarion.com/showscan.pl?scan_id=<TMPL_VAR NAME=Scan_id>"><TMPL_VAR NAME=Type></a></td>
+</tr>
+</TMPL_LOOP>
 <tr><th>Tick</th><th>Coords</th></tr>
 <TMPL_LOOP OldCoords>
 <tr>
 	<td><TMPL_VAR NAME=Tick></td><td><TMPL_VAR NAME=X>:<TMPL_VAR NAME=Y>:<TMPL_VAR NAME=Z></td>
 </tr>
 </TMPL_LOOP>
-<tr><th>Tick</th><th>Scan</th></tr>
-<TMPL_LOOP Scans>
-<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-	<td><TMPL_VAR NAME=Tick></td>
-	<td><a href="http://game.planetarion.com/showscan.pl?scan=<TMPL_VAR NAME=Scan_id>"><TMPL_VAR NAME=Type></a></td>
-</tr>
-</TMPL_LOOP>
 </table>
 </div>
+<div class="leftinfo">
 <table>
 	<tr><th>Target</th><th>Name</th><th>Mission</th><th>Landing tick</th><th>ETA</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>')">
+	<tr align="center" class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>" onclick="toggleVisibility('fleet<TMPL_VAR NAME=Id>')">
 		<td><a href="/check?coords=<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Target></a></td>
 		<td><TMPL_VAR NAME=Name></td>
 		<td class="<TMPL_VAR NAME=Class>"><TMPL_VAR NAME=Mission></td><td><TMPL_VAR NAME=LandingTick></td>
@@ -106,7 +120,7 @@
 		<td/>
 		<td colspan="5"><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>
@@ -114,6 +128,28 @@
 	</tr>
 	</TMPL_LOOP>
 </table>
+<table>
+	<tr><th>Sender</th><th>Name</th><th>Mission</th><th>Landing tick</th><th>ETA</th><th>Amount</th></tr>
+	<TMPL_LOOP Incomings>
+	<tr align="center" class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>" onclick="toggleVisibility('fleet<TMPL_VAR NAME=Id>')">
+		<td><a href="/check?coords=<TMPL_VAR NAME=Sender>"><TMPL_VAR NAME=Sender></a></td>
+		<td><TMPL_VAR NAME=Name></td>
+		<td class="<TMPL_VAR NAME=Class>"><TMPL_VAR NAME=Mission></td><td><TMPL_VAR NAME=LandingTick></td>
+		<td><TMPL_VAR NAME=ETA></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>
+		<TMPL_LOOP Ships>
+		<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>
+</div>
 </TMPL_IF>
 <div class="leftinfo">
 <img class="graph" src="/graph/stats/<TMPL_VAR NAME=Coords>" alt="stats" height="300" width="500"/>