X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Flib%2Fsite%2Fleftbar.tt2;h=41b658d9fa4d9b12e41b73044dce607bdb75f81c;hb=30262dafa6c73a1d1cbb493e66b59e267eaa6682;hp=3d134e49da106a47620c2c57ab5f4ba1d87b3cef;hpb=2c69d5fa71e2b4ddf7c9f5fa1880a9c69f70e43a;p=ndwebbie.git

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 3d134e4..41b658d 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -1,15 +1,24 @@
 <ul class="linkbar">
-	<li><a href="[% c.check_user_roles("member_menu") ? '/members' : '/index' %]">Main page</a></li>
-
+	[% IF c.check_user_roles("member_menu") %]<li><a href="/members">Main page</a></li>[% END %]
+	<li><a href="/">Home</a></li>
+	<li>
+	<form action="/wiki/search" method="post">
+		<p>
+		<input type="text" name="search" value="">
+		<input type="submit" value="Wiki search">
+		</p>
+	</form>
+	</li>
 	<li><a href="/forum">Forum</a></li>
 	<li><a href="/forum/search">Forum search</a></li>
 [% IF user %]
 	<li><a href="/forum/allUnread">New posts [% IF user.unreadposts %](<span class="[% IF user.newposts %]newposts[% ELSE %]unreadposts[% END %]">[% user.unreadposts %]</span>)[% END %]</a></li>
+	<li><a href="/forum/privmsg">Priv msg</a></li>
 	<li><a href="/settings">Settings</a></li>
 	<li><a href="/logout">Log out ([% c.user.username %])</a></li>
 [% ELSE %]
 	<li>
-	<form action="/login" method="post">
+	<form action="[% sslurl(c.uri_for('/login')) %]" method="post">
 		<p>
 		Username: <input type="text" name="user" value="">
 		Password: <input type="password" name="password" value="">
@@ -19,7 +28,16 @@
 	</form>
 	</li>
 [% END %]
-</ul>	<p>Tick: [% game.tick %]</p>
+</ul>
+[% IF birthdays.size > 0 %]
+<table>
+<tr><th colspan="2">Birthdays today</th></tr>
+[% FOR b IN birthdays %]
+	<tr><td>[% b.username %]</td><td>[% b.age %]</td></tr>
+[% END %]
+</table>
+[% END %]
+<p>Tick: [% game.tick %]</p>
 <ul class="linkbar">
 	<li><a href="/rankings/planets">Planet Rankings</a></li>
 	<li><a href="/rankings/alliances">Alliance Rankings</a></li>
@@ -31,48 +49,56 @@
 	</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="/covop">CovOp targets</a></li>
-	<li><a href="/covop/distwhores">Distwhores</a></li>
-	<li><a href="/members/defrequest">Request defense</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>
-		[% ELSE %]
-	<form action="/members/setcoords" 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>
+<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 %]
+	<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="/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="/members/defenders">Available defenders</a></li>
 	<li><a href="/calls/defleeches">Def Leeches</a></li>
 	<li><a href="/calls/list">Active calls</a></li>
 	<li><a href="/calls/list/recent">Recent calls</a></li>
@@ -81,10 +107,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">
@@ -97,10 +132,10 @@
 <ul class="linkbar">
 	<li><a href="/users">List users</a></li>
 	<li><a href="/alliances">Alliances</a></li>
-	<li><a href="/hostileAlliances">Hostile Alliances</a></li>
-	<li><a href="/memberIntel">Member Intel</a></li>
+	<li><a href="/alliances/hostile">Hostile Alliances</a></li>
+	<li><a href="/intel/members">Member Intel</a></li>
 	<li><a href="/alliances/resources">Alliance resources</a></li>
-	<li><a href="/planetNaps">Planet Naps</a></li>
-	<li><a href="/mail">Mail</a></li>
+	<li><a href="/intel/naps">Planet Naps</a></li>
+	<li><a href="/users/mail">Mail</a></li>
 </ul>
 [% END %]