X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=templates%2Fmain.tmpl;h=97ca018d7fc6521e1d18929b06df950d58a0109d;hb=155bd6f2977a197e804950e135dd48272e2f8efd;hp=a60b3b70369d7146527ee428aff5e64326326b5c;hpb=bed2a0cd51e651e066ef77f68639557f5ca4bc25;p=ndwebbie.git

diff --git a/templates/main.tmpl b/templates/main.tmpl
index a60b3b7..97ca018 100644
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -1,9 +1,16 @@
-<TMPL_VAR NAME=Error>
-<p>Hello <TMPL_VAR NAME=Username>.</p>
 <div class="leftinfo">
-<fieldset class="forum-post"> <legend>Message from HC<TMPL_IF isHC> <a href="motd?">EDIT</a></TMPL_IF></legend>
-	<TMPL_VAR NAME=MOTD>
-</fieldset>
+<table class="boards">
+		<TMPL_LOOP Announcements>
+	<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
+		<td align="center"><TMPL_VAR NAME=Unread></td>
+		<td align="center"><TMPL_VAR NAME=Posts></td>
+		<td<TMPL_IF Sticky> class="sticky"</TMPL_IF>><a href="/forum?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
+		<td align="left"><TMPL_VAR NAME=Posting_date></td>
+		<td align="center"><TMPL_VAR NAME=Username></td>
+		<td align="left"><TMPL_VAR NAME=Last_post></td>
+	</tr>
+		</TMPL_LOOP>
+</table>
 </div>
 <TMPL_IF PLANET>
 <img class="graph" src="/graph/planetvsnd/<TMPL_VAR NAME=PLANET>" alt="Your planet vs ND avg" height="300" width="500"/>
@@ -18,7 +25,7 @@
 		<th>XP</th>
 	</tr>
 <TMPL_LOOP Planets>
-	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr 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>
@@ -38,23 +45,25 @@
 	</TMPL_LOOP>
 	</table>
 </TMPL_IF>
-<div class="leftinfo">
+<TMPL_IF Calls>
 <table>
 	<tr><th>Call</th><th>DC</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Attackers</th></tr>
 <TMPL_LOOP Calls>
-	<tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+	<tr align="center" class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
 		<td class="<TMPL_VAR NAME=Covered>"><a href="/calls?call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
-		<td class="<TMPL_VAR NAME=DC>"><TMPL_VAR NAME=Username></td>
-		<td><TMPL_VAR NAME=Landing_tick></td>
+		<td class="<TMPL_VAR NAME=ActiveDC>"><TMPL_VAR NAME=DC></td>
+		<td><TMPL_VAR NAME=Landing_Tick></td>
 		<td><TMPL_VAR NAME=Race></td>
 		<td><TMPL_VAR NAME=Amount></td>
 		<td><TMPL_VAR NAME=Shiptype></td>
 		<td><TMPL_VAR NAME=Curreta></td>
 		<td><TMPL_VAR NAME=Eta></td>
-		<td><TMPL_VAR NAME=Attackers></td>
+		<td><TMPL_VAR ESCAPE=NONE NAME=Attackers></td>
 	</tr>
 </TMPL_LOOP>
 </table>
+</TMPL_IF>
+<div class="leftinfo">
 <fieldset class="forum-post"> <legend>Account details</legend>
 	<ul>
 	<TMPL_IF isMEMBER>
@@ -67,16 +76,6 @@
 	</TMPL_IF>
 	<li> Member of the following groups: <TMPL_LOOP Groups><TMPL_VAR NAME=Name><TMPL_UNLESS __last__>, </TMPL_UNLESS></TMPL_LOOP></li>
 	</ul>
-	<TMPL_UNLESS PLANET>
-		<TMPL_IF isMEMBER>
-		<form action="<TMPL_VAR NAME=PAGE>" method="post">
-			<p>We need your planet's coordinates: 
-			<input type="text" name="planet" value=""/>
-			<input type="submit" value="Submit"/>
-			</p>
-		</form>
-		</TMPL_IF>
-	</TMPL_UNLESS>
 </fieldset>
 
 <fieldset class="forum-post"> <legend>Fleets</legend>
@@ -84,12 +83,22 @@
 	<table>
 	<tr><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th><th>Back home</th><th>change?</th></tr>
 	<TMPL_LOOP Fleets>
-	<tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-		<td><TMPL_VAR NAME=Target></td><td><TMPL_VAR NAME=Mission></td>
-		<td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=Landing_Tick></td>
-		<td><TMPL_IF Fleet><input class="coordsinput" type="text" name="back:<TMPL_VAR NAME=Id>" value="<TMPL_VAR NAME=Back>"/></TMPL_IF></td>
-		<td><TMPL_IF Fleet><input type="checkbox" name="change:<TMPL_VAR NAME=Id>"/></TMPL_IF></td>
+	<tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>" onclick="toggleVisibility('fleet<TMPL_VAR NAME=Id>')">
+		<td><TMPL_VAR NAME=Target></td>
+		<td><a href="javascript://"  onclick="toggleVisibility('fleet<TMPL_VAR NAME=Id>')"><TMPL_VAR NAME=Mission></a></td>
+		<td><TMPL_VAR NAME=Amount></td><td><TMPL_VAR NAME=Tick></td>
+		<td><TMPL_IF Back><input class="coordsinput" type="text" name="back:<TMPL_VAR NAME=Id>" value="<TMPL_VAR NAME=Back>"/></TMPL_IF></td>
+		<td><TMPL_IF Back><input type="checkbox" name="change:<TMPL_VAR NAME=Id>"/></TMPL_IF></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>
 	<p>
@@ -115,6 +124,7 @@
 	</p>
 </fieldset>
 </form>
+<TMPL_IF PLANET>
 <form action="<TMPL_VAR NAME=PAGE>" method="post">
 <fieldset class="forum-post"> <legend>Fleet</legend>
 	<p>Paste your total fleet from ships section on overview here (do it daily to see the menus):</p>
@@ -124,6 +134,7 @@
 	<br/><input type="submit" value="Submit"/>
 </fieldset>
 </form>
+</TMPL_IF>
 </div>
 <TMPL_IF PlanetCoords>
 <img class="graph" src="/graph/stats/<TMPL_VAR NAME=PlanetCoords>" alt="stats for your planet" height="300" width="500"/>