Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp	26 Jan 2004 15:39:40 -0000	1.11
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp	12 Mar 2004 13:44:45 -0000	1.12
@@ -1,141 +1,237 @@
-<master>
-<property name="title">@title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<master src="lib/master">
+  <property name="title">@title;noquote@</property>
+  <property name="context">@context@</property>
 
 
-<center>
+  <center>
 
-<table border="0" cellpadding="5" cellspacing="0">
+    <table border="0" cellpadding="5" cellspacing="0" class="list">
 
-<formtemplate id="add_edit" style="standard-lars">
+      <formtemplate id="add_edit" style="standard-lars">
 
-<multiple name="num">
+        <multiple name="num">
 
-<if @num.rownum@ odd>
-<tr bgcolor="lavender">
-</if>
-<else>
-<tr bgcolor="#ddffdd">
-</else>
+          <if @num.rownum@ odd>
+            <tr bgcolor="lavender">
+          </if>
+          <else>
+            <tr bgcolor="#ddffdd">
+          </else>
 
-<td align="center">&nbsp;#@num.rownum@&nbsp;&nbsp;</td>
+          <td align="center" rowspan="2" bgcolor="#ffffdd">&nbsp;#@num.rownum@&nbsp;&nbsp;</td>
 
-<td valign="top">Subject:<font color="red">*</font><br><formwidget id="task_title.@num.rownum@">
-<formerror id="task_title.@num.rownum@">
-<br /><font color="red">Error</font>
-</formerror>
-  <p>
+          <td valign="top"><b>Subject:</b><font color="red">*</font><br />
+            <formwidget id="task_title.@num.rownum@">
+              <formerror id="task_title.@num.rownum@">
+                <br />
+                <font color="red">Error</font>
+              </formerror>
+            </formwidget>
+            <p />
 
-  Description:<br><formwidget id="description.@num.rownum@">
-  <formerror id="description.@num.rownum@"> 
-  <br /><font color="red">Error</font>
-  </formerror>
-  </td>
+            <if @using_process_p@ eq "t">
+              Skip this task?<br />
+            </if>
 
-</td>
-
-<td>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-    <td>Work required:<font color="red">*</font></td>
-    </tr>
-
-    <if @use_uncertain_completion_times_p@ eq 1>
-      <tr><td>Min:</td>
-          <td><formwidget id="estimated_hours_work_min.@num.rownum@"> hrs
-
-              <formerror id="estimated_hours_work_min.@num.rownum@">
-              <br /><font color="red">Error</font>
+            <formwidget id="skip_task_p.@num.rownum@">
+              <formerror id="skip_task_p.@num.rownum@"> 
+                <br />
+                <font color="red">Error</font>
               </formerror>
-          </td>
-      </tr>
-      <tr><td>Max:</td>
-          <td><formwidget id="estimated_hours_work_max.@num.rownum@"> hrs
+            </formwidget>
 
-              <formerror id="estimated_hours_work_max.@num.rownum@">
-              <br /><font color="red">Error</font>
+            Description:<br />
+            <formwidget id="description.@num.rownum@">
+              <formerror id="description.@num.rownum@"> 
+                <br />
+                <font color="red">Error</font>
               </formerror>
+            </formwidget>
+            <p />
 
           </td>
-      </tr>
-    </if>
-    <else>
-      <tr><td><formwidget id="estimated_hours_work.@num.rownum@"> hrs
 
-              <formerror id="estimated_hours_work.@num.rownum@">
-              <br /><font color="red">Error</font>
-              </formerror>
+          <td valign="top">
 
-          </td>
-      </tr>
-    </else>
+            <table border="0" cellpadding="0" cellspacing="0" width="100%">
+              <tr class="form-element">
+                <td align="left" colspan="2">Work required:
+                  <font color="red">*</font><p />
+                </td>
+              </tr>
 
-    <tr><td colspan="2">
-        <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
-        <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
-        You must enter a number here (make your best guess)</p></td>
+              <if @use_uncertain_completion_times_p@ eq 1>
+                <tr class="form-element">
+                  <td class="form-label" width="40%">Min:</td>
+                  <td class="form-widget">
+                    <formwidget id="estimated_hours_work_min.@num.rownum@"> hrs
 
-    </table>
+                      <formerror id="estimated_hours_work_min.@num.rownum@">
+                        <br />
+                        <font color="red">Error</font>
+                      </formerror>
+                    </formwidget>
+                  </td>
+                </tr>
 
-    <p />
+                <tr class="form-element">
+                  <td class="form-label" width="40%">Max:</td>
+                  <td class="form-widget">
+                    <formwidget id="estimated_hours_work_max.@num.rownum@"> hrs
 
-    <table bgcolor="#dddddd">
+                      <formerror id="estimated_hours_work_max.@num.rownum@">
+                        <br />
+                        <font color="red">Error</font>
+                      </formerror>
+                    </formwidget>
+                    
+                  </td>
+                </tr>
+              </if>
 
-    <tr><td>
-      Deadline: <br />
+              <else>
+                <tr>
+                  <td>
+                    <formwidget id="estimated_hours_work.@num.rownum@"> hrs
 
-      <formwidget id="end_date.@num.rownum@">
-      <formerror id="end_date.@num.rownum@"><font color="red">Error</font></formerror>
+                      <formerror id="estimated_hours_work.@num.rownum@">
+                        <br />
+                        <font color="red">Error</font>
+                      </formerror>
+                    </formwidget>
+                  </td>
+                </tr>
+              </else>
 
-      <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
-      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
-      You may optionally enter a hard deadline</p>
-    </td></tr>
-    <tr><td>
-      Dependency: <br />
+              <tr class="form-element">
+                <td colspan="2" class="form-widget" align="center">
+                  <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
+                    <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+                      You must enter a number here (make your best
+                      guess)
+                  </p>
+                </td>
+              </tr>
 
-      <formwidget id="dependency_task_id.@num.rownum@">
-      <formerror id="dependency_task_id.@num.rownum@"><font color="red">Error</font></formerror>
+            <if @edit_p@ eq t>
+                <tr class="form-element">
+                  <td colspan="2" align="left"><p />Log entry<p />
+                  </td>
+                </tr>
+                <tr class="form-element">
+                  <td class="form-label">Complete:</td>
+                  <td class="form-widget">
+                    <formwidget id="percent_complete.@num.rownum@">
+                      <formerror id="percent_complete.@num.rownum@">
+                        <font color="red">Error</font>
+                      </formerror>
+                    </formwidget> %
+                  </td>
+                </tr>
+                <tr class="form-element">
+                  <td class="form-label">Time:</td>
+                  <td class="form-widget">
+                    <formwidget id="new_hours_logged.@num.rownum@">
+                      <formerror id="new_hours_logged.@num.rownum@">
+                        <font color="red">Error</font>
+                      </formerror>
+                    </formwidget> hours
+                  </td>
+                </tr>
+                <tr class="form-element">
+                  <td class="form-label">Description:</td>
+                  <td class="form-widget">
+                    <formwidget id="new_description_logged.@num.rownum@">
+                      <formerror id="new_description_logged.@num.rownum@">
+                        <font color="red">Error</font>
+                      </formerror>
+                    </formwidget>
+                  </td>
+                </tr>
+              </table>
+            </if>
+            <else>
+              <formwidget id="percent_complete.@num.rownum@">
+                <formerror id="percent_complete.@num.rownum@">
+                  <font color="red">Error</font>
+                </formerror>
+              </formwidget>
+              </table>
+            </else>
 
-      <formwidget id="dependency_type.@num.rownum@">
-      <formerror id="dependency_type.@num.rownum@"><font color="red">Error</font></formerror>
+          </td>
+        </tr>
+          
+          <tr bgcolor="#dddddd">
+            <td>
+              
+            <table bgcolor="#dddddd" width="100%" cellpadding="0" cellspacing="0">
 
-      <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
-      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
-      You may enter a @task_term_lower@ that needs to be completed before this @task_term_lower@</p>
-    </td></tr>
+              <tr>
+                <td valign="top">
+                  Deadline: 
+                  </td>
+                  <td>
+                  <formwidget id="end_date.@num.rownum@">
+                    <formerror id="end_date.@num.rownum@">
+                      <font color="red">Error</font>
+                    </formerror>
+                  </formwidget>
 
-    </table>
+                  <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
+                    <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+                      You may optionally enter a hard deadline
+                  </p>
+                </td>
+              </tr>
 
-    <br>
-    <if @edit_p@ eq t>
-    <table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>Percent complete:</td>
-        <td><formwidget id="percent_complete.@num.rownum@"></td>
-      </tr>
-      <tr>
-        <td>Hours worked:</td>
-        <td><formwidget id="actual_hours_worked.@num.rownum@"></td>
-      </tr>
-    </table>
-    </if>
-    <else>
-    <formwidget id="percent_complete.@num.rownum@">
-    <formwidget id="actual_hours_worked.@num.rownum@">
-    </else>
+            </table>
 
-    <formwidget id="task_item_id.@num.rownum@">
-</td>
 
-</tr>
+          </td>
+            <td bgcolor="#dddddd">
 
-</multiple>
+            <table bgcolor="#dddddd" width="100%">
 
-<tr><td colspan="99" align="center"><input type="submit" name="formbutton:ok" value = "       OK       "></td>
+              <tr>
+                <td valign="top"> 
+                  Dependency: 
 
-<% ns_log Notice error: [export_vars formerror]%>
+                  <formwidget id="dependency_task_id.@num.rownum@">
+                    <formerror id="dependency_task_id.@num.rownum@">
+                      <font color="red">Error</font>
+                    </formerror>
+                  </formwidget>
 
-</formtemplate>
-</table>
-</center>
+                  <formwidget id="dependency_type.@num.rownum@">
+                    <formerror id="dependency_type.@num.rownum@">
+                      <font color="red">Error</font>
+                    </formerror>
+                  </formwidget>
+
+                  <p style="margin-top: 4px; margin-bottom: 2px; color: #666666; font-family: tahoma,verdana,arial,helvetica,sans-serif; font-size: 75%;">
+                    <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+                      You may enter a @task_term_lower@ that needs to
+                      be completed before this @task_term_lower@
+                  </p>
+                </td>
+              </tr>
+
+            </table>
+
+            <formwidget id="task_item_id.@num.rownum@">
+              <formerror id="task_item_id.@num.rownum@">
+                  <font color="red">Error</font>
+              </formerror>
+            </formwidget>
+
+            </td>
+          </tr>
+
+        </multiple>
+
+        <tr><td colspan="99" align="center"><input type="submit" name="formbutton:ok" value = "       OK       "></td></tr>
+
+      </formtemplate>
+    </table>
+  </center>