X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=root%2Flib%2Fsite%2Fleftbar.tt2;h=bc6f8324e180663e627cd4767efa6eea290eb9ec;hp=dee6aabaa111fe54b9b8a7209dba65e4ff68e445;hb=96f1df9a70ccb1b2d854f693576a4e0e1923eb72;hpb=85d8a494df2ada3f891653a950246046d23a981d

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index dee6aab..bc6f832 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -49,32 +49,33 @@
 	</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>
-	<br><input type="submit" value="Submit">
-</form>
-		[% ELSE %]
+[% END %]
+[% 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: 
+		<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>
@@ -84,26 +85,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>
@@ -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">