From: Michael Andreen <harv@ruin.nu>
Date: Sat, 29 Mar 2008 08:42:00 +0000 (+0100)
Subject: More obvious coord input and fleet update requirement
X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=commitdiff_plain;h=155bd6f2977a197e804950e135dd48272e2f8efd;p=ndwebbie.git

More obvious coord input and fleet update requirement
---

diff --git a/NDWeb/XMLPage.pm b/NDWeb/XMLPage.pm
index ece5bdd..288bfb2 100644
--- a/NDWeb/XMLPage.pm
+++ b/NDWeb/XMLPage.pm
@@ -115,7 +115,8 @@ sub render : method {
 		$template->param(UnreadPosts => $unread);
 		$template->param(NewPosts => $newposts);
 		$template->param(Tick => $TICK);
-		$template->param(isMember => (($TICK - $fleetupdate < 24) || $self->isScanner()) && $self->{PLANET} && $self->isMember);
+		$template->param(isMember => $self->isMember);
+		$template->param(Planet => $self->{PLANET});
 		$template->param(isHC => $self->isHC);
 		$template->param(isDC => $self->isDC());
 		$template->param(isBC => $self->isBC());
diff --git a/templates/main.tmpl b/templates/main.tmpl
index 9f0aab4..97ca018 100644
--- a/templates/main.tmpl
+++ b/templates/main.tmpl
@@ -76,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>
diff --git a/templates/skel.tmpl b/templates/skel.tmpl
index e2af5c7..2b9e527 100644
--- a/templates/skel.tmpl
+++ b/templates/skel.tmpl
@@ -22,6 +22,7 @@
 		<li><a href="/forum/search">Forum search</a></li>
 	</ul>	<p>Tick: <TMPL_VAR NAME=TICK></p>
 	<TMPL_IF isMEMBER>
+	<TMPL_IF isATTACKER>
 	<p>Member menu</p>
 	<ul class="linkbar">
 		<li><a href="/points">Top members</a></li>
@@ -34,6 +35,18 @@
 		<li><a href="/galaxyrankings">Galaxy Rankings</a></li>
 		<li><a href="/defrequest">Request defense</a></li>
 	</ul>
+	<TMPL_ELSE>
+		<TMPL_IF Planet>
+		<p><b>Update your fleet to see member menu</b></p>
+		<TMPL_ELSE>
+		<form action="/main" 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_IF>
 	</TMPL_IF>
 	<TMPL_IF isATTACKER>
 	<p>Attack menu</p>