X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Flib%2Fsite%2Fleftbar.tt2;h=8a2eee9eb6a588df3ea1da749dae1259c7996302;hb=a4b209407c81ec7b71c9c7f8c4d57bb2f77256f4;hp=32d056164d62bfdfb4834840de2ccfc1e224326b;hpb=da77e07d9a4ac17a25796a0b897a03f4853ba341;p=ndwebbie.git

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 32d0561..8a2eee9 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -1,15 +1,25 @@
 <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="">
@@ -19,7 +29,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>
@@ -39,13 +58,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">
@@ -68,6 +87,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") %]
@@ -97,10 +117,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 %]