Fix so coords can be entered

[ndwebbie.git] / root / lib / site / leftbar.tt2

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 0e0c52fa157d7cadd381b84413066c427d50e8e2..bc6f8324e180663e627cd4767efa6eea290eb9ec 100644 (file)
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -54,19 +54,12 @@
        <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/addincs">Report incs</a></li>
        <li><a href="/members/ircrequest">IRC request</a></li>
        <li><a href="/stats/tags">Planet tags</a></li>
 </ul>
 [% END %]
-[% IF c.check_user_roles("covop") %]
-<p>Covop menu</p>
-<ul class="linkbar">
-       <li><a href="/covop">Bank hacking</a></li>
-       <li><a href="/covop/distwhores">Distwhores</a></li>
-       <li><a href="/covop/easy">Easy targets</a></li>
-</ul>
-[% END %]
-[% IF user.attacker %]
+[% IF user.attacker AND c.user.planet %]
 <p>Fleet menu</p>
 <ul class="linkbar">
        <li><a href="/members/launchConfirmation">Launch confirmation</a></li>
@@ -76,34 +69,26 @@
                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 %]
+[% 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>
+[% IF c.check_user_roles("covop") %]
+<p>Covop menu</p>
 <ul class="linkbar">
-       <li><a href="/raids/create">Create raid</a></li>
-       <li><a href="/raids/targetlist">Find targets</a></li>
-       <li><a href="/raids/retal">Find retals</a></li>
+       <li><a href="/covop">Bank hacking</a></li>
+       <li><a href="/covop/distwhores">Distwhores</a></li>
+       <li><a href="/covop/easy">Easy targets</a></li>
 </ul>
 [% END %]
 [% IF c.check_user_roles("dc_menu") %]
 <p>DC menu</p>
 <ul class="linkbar">
+       <li><a href="/users/sms">Send SMS</a></li>
        <li><a href="/members/defenders">Available defenders</a></li>
        <li><a href="/calls/defleeches">Def Leeches</a></li>
        <li><a href="/calls/list">Active calls</a></li>
@@ -113,6 +98,14 @@
        <li><a href="/calls/list/all">All calls</a></li>
 </ul>
 [% END %]
+[% IF c.check_user_roles("bc_menu") %]
+<p>BC menu</p>
+<ul class="linkbar">
+       <li><a href="/raids/create">Create raid</a></li>
+       <li><a href="/raids/targetlist">Find targets</a></li>
+       <li><a href="/raids/retal">Find retals</a></li>
+</ul>
+[% END %]
 [% IF c.check_user_roles("intel_menu") %]
 <p>Intel menu</p>
 <ul class="linkbar">