X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=root%2Fsrc%2Fcalls%2Fedit.tt2;h=7a809c8d2401a208fb822b8b1fb8c3af74ac51d2;hb=2a703f7250ea25f2f556eb25b644dcb7268f92ce;hp=14c2175fead9bb3e3f4ea8e6449cce445059bcc2;hpb=11149303e8c0c031f5e08c5792930b490ba4a30b;p=ndwebbie.git

diff --git a/root/src/calls/edit.tt2 b/root/src/calls/edit.tt2
index 14c2175..7a809c8 100644
--- a/root/src/calls/edit.tt2
+++ b/root/src/calls/edit.tt2
@@ -1,44 +1,5 @@
 [% META title = 'Edit call' %]
 
-[% BLOCK missiontable %]
-<table>
-		<tr><th></th><th>Coords</th><th>Name</th><th>Mission</th><th>Tick</th><th>ETA</th><th>Amount</th></tr>
-	[% FOR m IN missions %]
-		<tr align="center" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]" onclick="$('#fleet[% m.id %]').toggle()">
-			<td>
-		[% IF m.ships %]
-				<b>&dArr;</b>
-		[% END %]
-			</td><td>
-		[% IF m.planet %]
-				<a href="[% c.uri_for('/stats/planet', m.planet) %]">[% m.coords %]</a>
-		[% END %]
-			</td>
-			<td>[% m.name %]</td>
-			<td class="[% m.mission %]">[% m.mission %]</td>
-			<td>[% m.tick %]</td>
-			<td>[% m.eta %]</td>
-			<td>[% m.amount %]</td>
-			[% IF m.fleetcatch %]
-			<td class="Hostile">FLEETCATCH!!</td>
-			[% END %]
-		</tr>
-		[% IF m.ships %]
-		<tr id="fleet[% m.id %]" class="missionrow">
-			<td>
-			<td colspan="5"><table>
-			[% FOR s IN m.ships %]
-				<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-					<td>[% s.ship %]</td><td>[% s.amount %]</td>
-				</tr>
-			[% END %]
-			</table></td>
-		</tr>
-		[% END %]
-	[% END %]
-	</table>
-[% END %]
-
 <form action="[% c.uri_for('postcallupdate',call.id) %]" method="post">
 <fieldset> <legend>Call details, call# [% call.id %]</legend>
 <table>
@@ -56,9 +17,11 @@
 </ul>
 </td>
 <td>
-	<textarea rows="8" cols="40" name="info">[% call.info %]</textarea>
+	<textarea rows="8" cols="40" name="info">[% call.info | html %]</textarea>
 </td>
 <td><ul>
+	<li>Calc: <input type="text" name="calc" value="[% call.calc | html %]">
+		<input type="checkbox" name="ccalc"></li>
 	<li>Change Notes? <input type="checkbox" name="cinfo"></li>
 	<li><input type="submit" name="cmd" value="Submit"></li>
 	<li><input type="submit" name="cmd" value="Take call"></li>
@@ -87,7 +50,7 @@
 [% FOR a IN attackers %]
 	<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
 		<td><input type="button" onclick="$('#attacker[% a.id %]').toggle()" value="&dArr;" title="Show fleets"></td>
-		<td><a href="[% c.uri_for('/stats/planet',a.id) %]">[% a.coords %]</a></td>
+		<td><a href="[% c.uri_for('/stats/planet',a.planet) %]">[% a.coords %]</a></td>
 		<td class="[% a.planet_status %]">[% a.planet_status %]</td>
 		<td class="[% a.relationship %]">[% a.alliance %] ([% a.relationship %])</td>
 		<td>[% a.race %]</td>
@@ -97,10 +60,10 @@
 		<td>[% a.fleet %]</td>
 		<td><input type="checkbox" name="change:[% a.id %]"></td>
 	</tr>
-	<tr id="attacker[% a.id %]" class="missionrow">
+	<tr id="attacker[% a.id %]" class="hidden">
 	<td></td>
 	<td colspan="8">
-	[% PROCESS missiontable missions=a.missions %]
+	[% PROCESS inc/missionlist.tt2 missions=a.missions %]
 	</td></tr>
 [% END %]
 	</table>
@@ -111,10 +74,10 @@
 </form>
 </fieldset>
 <fieldset><legend>Member fleet</legend>
-[% PROCESS missiontable missions=fleets %]
+[% PROCESS inc/missionlist.tt2 missions=fleets %]
 </fieldset>
 <fieldset><legend>Defenders</legend>
-[% PROCESS missiontable missions=defenders %]
+[% PROCESS inc/missionlist.tt2 missions=defenders %]
 </fieldset>
 
 <div>
@@ -130,11 +93,3 @@
 	<input type="submit" value="Submit">
 </fieldset></form>
 </div>
-
-<script type="text/javascript">
-<!--
-$(document).ready(function(){
-	$('.missionrow').hide();
-});
--->
-</script>