X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=root%2Fsrc%2Fmembers%2Findex.tt2;h=8eb11a4d00b84a6be0cba184899f8b714a8beaa6;hb=202d442fc929b5e4cea904406dc546098516fde1;hp=05e56d54018768cee881179c46cfb058f981a3dc;hpb=2c69d5fa71e2b4ddf7c9f5fa1880a9c69f70e43a;p=ndwebbie.git

diff --git a/root/src/members/index.tt2 b/root/src/members/index.tt2
index 05e56d5..8eb11a4 100644
--- a/root/src/members/index.tt2
+++ b/root/src/members/index.tt2
@@ -18,7 +18,7 @@
 [% END %]
 <div class="clear"></div>
 
-[% IF c.user.planet %]
+[% IF p %]
 <table class="stats">
 	<tr align="center"><th colspan="4">Rank</th>
 	</tr>
@@ -38,50 +38,30 @@
 		<td>[% p.x %] </td>
 		<td><a href="[% c.uri_for('/stats','galaxy',p.x,p.y) %]">[% p.y %]</a></td>
 		<td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.z %]</a></td>
-		<td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
+		<td align="center">[% p.ruler | html %] <b>OF</b> [% p.planet | html %]</td>
 		<td align="center">[% p.race %]</td>
 		[% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
-		<td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% comma(p.size) %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
+		<td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
 		[% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]
-		<td title="[% comma(p.score_gain_day) %] Today | [% comma(p.score_gain) %] Tick">[% comma(p.score) %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
+		<td title="[% p.score_gain_day | commify %] Today | [% p.score_gain | commify %] Tick">[% p.score | commify %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
 		[% p.valueimg = (p.value_gain_day == 0 ? 'stay' : (p.value_gain_day > 0 ? 'up' : 'down')) %]
-		<td title="[% comma(p.value_gain_day) %] Today | [% comma(p.value_gain) %] Tick">[% comma(p.value) %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
+		<td title="[% p.value_gain_day | commify %] Today | [% p.value_gain | commify %] Tick">[% p.value | commify %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
 		[% p.xpimg = (p.xp_gain_day == 0 ? 'stay' : (p.xp_gain_day > 0 ? 'up' : 'down')) %]
-		<td title="[% comma(p.xp_gain_day) %] Today | [% comma(p.xp_gain) %] Tick">[% comma(p.xp) %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
+		<td title="[% p.xp_gain_day | commify %] Today | [% p.xp_gain | commify %] Tick">[% p.xp | commify %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
 	</tr>
 </table>
 [% END %]
-[% IF calls %]
-<table>
-	<tr><th>Call</th><th>DC</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Attackers</th></tr>
-	[% FOR call IN calls %]
-	<tr align="center" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-		<td class="[% UNLESS call.dc %]Hostile[%END%]"><a href="[% c.uri_for('/calls/edit',call.id) %]">[% call.id %]</a></td>
-		<td>[% call.dc %]</td>
-		<td>[% call.landing_tick %]</td>
-		<td>[% call.race.unique.join('/') %]</td>
-		<td>[% call.amount.join('/') %]</td>
-		<td>[% call.shiptype.unique.join('/') | html %]</td>
-		<td>[% call.curreta %]</td>
-		<td>[% call.eta.unique.join('/') %]</td>
-		<td>[% FOR a IN call.attackers %]
-			<a href="[% c.uri_for('/stats/find',a) %]">[% a %]</a>
-			[% UNLESS loop.last %]/[%END%]
-		[%END%]</td>
-	</tr>
-	[% END %]
-</table>
-[% END %]
 <div class="leftinfo">
 <fieldset class="forum-post"> <legend>Account details</legend>
 	<ul>
 	<li> ND rank (by score): [% u.rank %] </li>
+	<li> Defprio: [% u.defprio %] </li>
 	<li> Defense points: [% u.defense_points %] </li>
 	<li> Attack points: [% u.attack_points %] </li>
 	<li> Scan points: [% u.scan_points %] </li>
 	<li> Humor points: [% u.humor_points %] </li>
 	<li> Total points: [% u.total_points %] </li>
-	<li> Member of the following groups: [% groups.join(',') %]</li>
+	<li> Member of the following groups: [% groups.join(', ') %]</li>
 	</ul>
 </fieldset>
 
@@ -91,14 +71,15 @@
 	<tr><td></td><th>Target</th><th>Mission</th><th>Amount</th><th>Landing Tick</th><th>Back home</th><th>change?</th></tr>
 [% FOR f IN fleets %]
 	<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-		<td><input type="button" onclick="$('#fleet[% f.id %]').toggle()" value="&dArr;" title="Show fleets"></td>
+		<td><input type="button" onclick="$('#fleet[% f.fid %]').toggle()" value="&dArr;" title="Show fleets"></td>
 		<td>[% IF f.target %]<a href="[% c.uri_for('/stats/planet',f.target) %]">[% f.coords %]</a>[% END %]</td>
 		<td>[% f.mission %]</td>
 		<td>[% f.amount %]</td><td>[% f.tick %]</td>
-		<td>[% IF f.back %]<input style="width:5em" type="text" name="back:[% f.id %]" value="[% f.back %]">[% END %]</td>
-		<td>[% IF f.back %]<input type="checkbox" name="change:[% f.id %]">[% END %]</td>
+		<td>[% IF f.back %]<input style="width:5em" type="text" name="back:[% f.fid %]" value="[% f.back %]">[% END %]</td>
+		<td>[% IF f.back %]<input type="checkbox" name="change:[% f.fid %]">[% END %]</td>
+		<td><a href="[% c.uri_for('/raids/fleetcalc',f.fid) %]" rel="external">Calc</a></td>
 	</tr>
-	<tr id="fleet[% f.id %]" class="hidden">
+	<tr id="fleet[% f.fid %]" class="hidden">
 		<td>
 		<td colspan="5"><table>
 	[% FOR s IN f.ships %]
@@ -116,32 +97,17 @@
 	</p>
 </form>
 </fieldset>
-<form action="[% c.uri_for('posthostupdate') %]" method="post">
-<fieldset class="forum-post"> <legend>Hostname</legend>
-	<p>Hostname:
-	<input style="width:25em" type="text" name="hostname" value="[% u.hostmask %]">
-	<input type="submit" value="Submit">
-	</p>
-</fieldset>
-</form>
-<form action="[% c.uri_for('postsmsupdate') %]" method="post">
-<fieldset class="forum-post"> <legend>SMS</legend>
-	<p>Number:
-	<input type="text" name="sms" value="[% u.sms %]">
-	<input type="submit" value="Submit">
-	</p>
-</fieldset>
+<fieldset class="forum-post"> <legend>Attack classes</legend>
+<form action="[% c.uri_for('postattackgroups') %]" method="post">
+<p>Pick the classes you use for your attack fleets:</p>
+<p>
+FiCo: <input type="checkbox" name="class" value="x"[% IF attackgroups.grep('x').size > 0 %] checked[%END%]>
+FrDe: <input type="checkbox" name="class" value="y"[% IF attackgroups.grep('y').size > 0 %] checked[%END%]>
+CrBs: <input type="checkbox" name="class" value="z"[% IF attackgroups.grep('z').size > 0 %] checked[%END%]>
+<input type="submit" name="cmd" value="Submit">
+</p>
 </form>
-[% IF c.user.planet %]
-<form action="[% c.uri_for('postfleetupdate') %]" method="post">
-<fieldset class="forum-post"> <legend>Fleet</legend>
-	<p>Paste your total fleet from ships section on overview here (do it daily to see the menus):</p>
-	<textarea rows="15" cols="50" name="fleet"></textarea>
-	<br><input type="submit" value="Submit">
 </fieldset>
-</form>
-[% END %]
-</div>
 [% IF c.user.planet %]
 <img class="graph" src="[% c.uri_for('/graphs/planetstats',c.user.planet,STICK) %]" alt="stats for your planet" height="300" width="500">
 <img class="graph" src="[% c.uri_for('/graphs/planetranks',c.user.planet,STICK) %]" alt="ranks for your planet" height="300" width="500">