X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Flib%2Fsite%2Fleftbar.tt2;h=8dae00ea2902c53f246124b01b6d2fed997cc65d;hb=0a35b86f2577bc9e2efcabe818a56a9ec46bb0bd;hp=0c0a37ffbdfc2316eedb592fe3b49e10d11f4693;hpb=88534ccb5763a823eec9147f63c732588e275e6a;p=ndwebbie.git

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 0c0a37f..8dae00e 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -49,32 +49,42 @@
 	</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/addincs">Report incs</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>
+[% END %]
+[% IF user.attacker %]
+<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 fleets to see raids and launch confirmation</b></p>
+<form action="[% c.uri_for('/members/postconfirmation') %]" method="post">
+	<p>Paste your fleets from fleets page here:</p>
+	<p><textarea rows="5" cols="15" name="mission"></textarea>
 	<br><input type="submit" value="Submit">
+	</p>
 </form>
-		[% ELSE %]
+	[% ELSE %]
 	<form action="/members/postowncoords" method="post">
-		<p>We need your planet's coordinates: 
+		<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") %]
@@ -85,26 +95,10 @@
 	<li><a href="/covop/easy">Easy targets</a></li>
 </ul>
 [% END %]
-[% IF user.attacker %]
-<p>Attack menu</p>
-<ul class="linkbar">
-	<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>
-[% 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>
-</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>
@@ -114,6 +108,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">