X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Flib%2Fsite%2Fleftbar.tt2;h=b3f05c874462b5a1a62a9b4676e4a8ddb678d913;hb=44fbe786d3049f2999a288e27bd26a13cfee86b2;hp=be71cf35b7159dd43699802e9115f894323f12df;hpb=00325acb2f3a1ae09e4a73d09a33f056dfb60fda;p=ndwebbie.git

diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index be71cf3..b3f05c8 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -1,45 +1,74 @@
 <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>
 [% 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>
 	<li><a href="/rankings/galaxies">Galaxy Rankings</a></li>
+	<li><form action="/stats/find" method="post"><p>
+		<input class="coordsinput" type="text" name="coords" value="[% checkcoords %]">
+		<input class="coordsinput" type="submit" value="Check">
+		</p></form>
+	</li>
 </ul>
 [% IF c.check_user_roles("member_menu") %]
 	[% IF user.attacker %]
 <p>Member menu</p>
 <ul class="linkbar">
-	<li><a href="/points">Top members</a></li>
-	<li><a href="/addintel">Add intel/scans</a></li>
-	<li><a href="/launchConfirmation">Launch confirmation</a></li>
-	<li><a href="/covop">CovOp targets</a></li>
-	<li><a href="/covop?list=distwhores">Distwhores</a></li>
-	<li><a href="/defrequest">Request defense</a></li>
+	<li><a href="/members/points">Top members</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/ircrequest">IRC request</a></li>
+</ul>
+<p>Covop menu</p>
+<ul class="linkbar">
+	<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>
 	[% ELSE %]
 		[% IF c.user.planet %]
 	<p><b>Update your fleet to see member menu</b></p>
 		[% ELSE %]
-	<form action="/main/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">
@@ -51,37 +80,40 @@
 [% IF user.attacker %]
 <p>Attack menu</p>
 <ul class="linkbar">
-	<li><form action="/check" method="post"><p>
-		<input class="coordsinput" type="text" name="coords" value="[% cords or '1:1:1' %]">
-		<input class="coordsinput" type="submit" value="Check">
-		</p></form></li>
 	<li><a href="/raids">Web raids</a></li>
 </ul>
 <p><input type="button" value="Update target list"
-		onclick = "listTargets('/jsrpc/targetList')">
+		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="/editRaid">Create raid</a></li>
+	<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="/defLeeches">Def Leeches</a></li>
-	<li><a href="/calls">Defense calls</a></li>
-	<li><a href="/calls?show=uncovered">Not covered calls</a></li>
-	<li><a href="/calls?show=covered">Covered calls</a></li>
-	<li><a href="/calls?show=all">All calls</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>
+	<li><a href="/calls/list/uncovered">Not covered calls</a></li>
+	<li><a href="/calls/list/covered">Covered calls</a></li>
+	<li><a href="/calls/list/all">All calls</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">Intel</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">
+		</p></form>
+	</li>
 </ul>
 [% END %]
 [% IF c.check_user_roles("hc_menu") %]
@@ -89,10 +121,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 %]