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 ad52e1c0d878a74b4c7828b90f23c98417efbd65..bc6f8324e180663e627cd4767efa6eea290eb9ec 100644 (file)
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -1,7 +1,6 @@
 <ul class="linkbar">
        [% IF c.check_user_roles("member_menu") %]<li><a href="/members">Main page</a></li>[% END %]
-
-       <li><a href="/wiki">Wiki</a></li>
+       <li><a href="/">Home</a></li>
        <li>
        <form action="/wiki/search" method="post">
                <p>
@@ -50,58 +49,46 @@
        </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 members</a></li>
+       <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/addincs">Report incs</a></li>
        <li><a href="/members/ircrequest">IRC request</a></li>
+       <li><a href="/stats/tags">Planet tags</a></li>
 </ul>
-<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>
-       [% 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 user.attacker %]
-<p>Attack menu</p>
+[% IF user.attacker AND c.user.planet %]
+<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>
+[% 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 %]
-[% 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="/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>
@@ -111,10 +98,19 @@
        <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">
        <li><a href="/intel">Intel</a></li>
+       <li><a href="/intel/channels">Channels</a></li>
        <li><form action="/intel/find" method="post"><p>
                <input class="coordsinput" type="text" name="coords" value="[% checkcoords %]">
                <input class="coordsinput" type="submit" value="Check">