X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Flib%2Fsite%2Fleftbar.tt2;h=940921c0894efce91a6554fa99e8c4092370791d;hb=d9e0bd63f3f0522b4eaebe7d525048570fe43ef6;hp=0926e5068d42c4fd8256fb3c1a2755f857395955;hpb=e3d87e31652374c184db31c915814f8bc4d7cbd4;p=ndwebbie.git

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 0926e50..940921c 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -1,19 +1,30 @@
 <ul class="linkbar">
-	<li><a href="/index">Main page</a></li>
+	[% IF c.check_user_roles("member_menu") %]<li><a href="/members">Main page</a></li>[% END %]
 
+	<li><a href="/wiki">Wiki</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="">
 		<input type="submit" value="Login">
+		Secure computer: <input style="width:1em" type="checkbox" name="remember">
 		</p>
 	</form>
 	</li>
@@ -38,13 +49,13 @@
 	<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/ircrequest">IRC request</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">
+	<form action="/members/postowncoords" method="post">
 		<p>We need your planet's coordinates: 
 		<input type="text" name="planet" value="">
 		<input type="submit" value="Submit">
@@ -67,6 +78,7 @@
 <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") %]
@@ -96,10 +108,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 %]