really made it so you can put tasks on hold. contractor can switch logins multiple...

[contractor-progress.git] / tasks.html

diff --git a/tasks.html b/tasks.html
index c70a568..192426b 100644 (file)
--- a/tasks.html
+++ b/tasks.html
@@ -15,7 +15,7 @@
 
   <p><strong>Title</strong>: ~title.html~</p>
 
-  <p><strong>Status</strong>: ~state.html~</p>
+  <p><strong>Status</strong>: ~state.html~<!--~finished_at_section start~--> (finished on ~finished_at.mmddyyyy~)<!--~end~--><!--~tested_at_section start~--> (tested on ~tested_at.mmddyyyy~)<!--~end~--></p>
 
   <p><strong>URL</strong>: <a target="_new" href="~url.attr~">~url.html~</a></p>
 
@@ -31,9 +31,11 @@
   <!--~normal_edit_link start~--><p><a href="tasks?tasks_edit_id=~task_id.attr~">Edit this task</a></p><!--~end~-->
   <!--~warning_edit_link start~--><p><a href="tasks?tasks_edit_id=~task_id.attr~" onclick="return confirm('Editing this task will invalidate the price, proceed anyway?')">Edit this task</a></p><!--~end~-->
 
-  <!--~working_link start~--><p><a href="tasks?tasks_working_id=~task_id.attr~">I'm starting on this now</a>.</p><!--~end~-->
+  <!--~working_link start~--><p><a href="tasks?tasks_working_id=~task_id.attr~">I'm starting on this now</a></p><!--~end~-->
 
-  <!--~needs_testing_link start~--><p><a href="tasks?tasks_needs_testing_id=~task_id.attr~">Mark this task as finished (request testing)</a>.</p><!--~end~-->
+  <!--~hold_link start~--><p><a href="tasks?tasks_hold_id=~task_id.attr~">Place this task on hold</a></p><!--~end~-->
+
+  <!--~needs_testing_link start~--><p><a href="tasks?tasks_needs_testing_id=~task_id.attr~">Mark this task as finished (request testing)</a></p><!--~end~-->
 
   <!--~finished_link start~--><p>Please test everything in the narrative! If everything is working, <a href="tasks?tasks_finished_id=~task_id.attr~">Mark this task as finished</a> Otherwise please e-mail or call Jason.</p><!--~end~-->
 
@@ -47,7 +49,7 @@
     <table cellspacing="0" cellpadding="4" border="0" summary="">
 
 <!--~client_row start~-->
-      <tr><td class="caption">Client: </td><td class="field"><select name="client_id"><!--~client_id.options~--></select></td></tr>
+      <tr><td class="caption">Client: </td><td class="field"><select name="client_id"><option value="">Choose One...</option><!--~client_id.options~--></select></td></tr>
 <!--~end~-->
 
       <tr><td class="caption">Title: </td><td class="field"><input type="text" size="40" name="title" value="~title.attr~" /></td></tr>