Only require fleet paste for raids and launch confirmation

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index ef01321889cd19a1dfee92c8f0a49102d5ddb3d0..0e0c52fa157d7cadd381b84413066c427d50e8e2 100644 (file)
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -49,33 +49,14 @@
        </li>
 </ul>
 [% IF c.check_user_roles("member_menu") %]
-       [% IF user.attacker %]
 <p>Member menu</p>
 <ul class="linkbar">
        <li><a href="/members/points">Top points</a></li>
        <li><a href="/members/stats">Top ranks</a></li>
        <li><a href="/members/addintel">Add intel/scans</a></li>
-       <li><a href="/members/launchConfirmation">Launch confirmation</a></li>
        <li><a href="/members/ircrequest">IRC request</a></li>
        <li><a href="/stats/tags">Planet tags</a></li>
 </ul>
-       [% ELSE %]
-               [% IF c.user.planet %]
-       <p><b>Update your fleet to see member menu</b></p>
-<form action="[% c.uri_for('/members/postfleetupdate') %]" method="post">
-       <p>Paste your total fleet from ships section on overview here:</p>
-       <textarea rows="5" cols="15" name="fleet"></textarea>
-       <br><input type="submit" value="Submit">
-</form>
-               [% ELSE %]
-       <form action="/members/postowncoords" method="post">
-               <p>We need your planet's coordinates: 
-               <input type="text" name="planet" value="">
-               <input type="submit" value="Submit">
-               </p>
-       </form>
-               [% END %]
-       [% END %]
 [% END %]
 [% IF c.check_user_roles("covop") %]
 <p>Covop menu</p>
@@ -86,14 +67,31 @@
 </ul>
 [% END %]
 [% IF user.attacker %]
-<p>Attack menu</p>
+<p>Fleet menu</p>
 <ul class="linkbar">
+       <li><a href="/members/launchConfirmation">Launch confirmation</a></li>
        <li><a href="/raids">Web raids</a></li>
 </ul>
 <p><input type="button" value="Update target list"
                onclick = "listTargets()">
 </p>
 <div id="targets">[% PROCESS inc/targetlist.tt2 %]</div>
+[% ELSIF c.check_user_roles("member_menu") %]
+       [% IF c.user.planet %]
+       <p><b>Update your fleet to see raids and launch confirmation</b></p>
+<form action="[% c.uri_for('/members/postfleetupdate') %]" method="post">
+       <p>Paste your total fleet from ships section on overview here:</p>
+       <textarea rows="5" cols="15" name="fleet"></textarea>
+       <br><input type="submit" value="Submit">
+</form>
+       [% ELSE %]
+       <form action="/members/postowncoords" method="post">
+               <p>We need your planet's coordinates:
+               <input type="text" name="planet" value="">
+               <input type="submit" value="Submit">
+               </p>
+       </form>
+       [% END %]
 [% END %]
 [% IF c.check_user_roles("bc_menu") %]
 <p>BC menu</p>