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.20 -r1.21
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp	14 Jul 2004 17:51:08 -0000	1.20
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp	13 Jan 2005 13:54:36 -0000	1.21
@@ -4,294 +4,316 @@
   
   
   <center>
-    
-    <table border="0" cellpadding="5" cellspacing="0" class="list">
+    <form action="task-add-edit-2" method="post">
+      @export_vars;noquote@ 
       
-      <formtemplate id="add_edit" style="standard-lars">
+      <span class="selected">
+        Send email to assignees? 
+        <select name="send_email_p" >
+          <option value="t" selected="selected">Yes</option>
+          <option value="f">No</option>
+        </select>
 
-        <tr colspan="2">
-          <td align="right">
-            Send email to assignees? 
-            <formwidget id="send_email_p">
-              <formerror id="send_email_p"> 
-                <br />
-                <font color="red">Error</font>
-              </formerror>
-            </formwidget>
-          </td>
-        </tr>
+        <if @using_process_p@ true>
+          Process name <input type="text" name="process_name" size="25" value="@process_name@" />
+        </if>
+      </span>
+
+      <table border="0" cellpadding="0" cellspacing="0">
         
-        <multiple name="num">
-          
-          <tr bgcolor="#AA9999">
-            <td valign="bottom">
-              <if @edit_p@ false>
-                &nbsp;#@num.rownum@&nbsp;&nbsp;
+        <multiple name="tasks">
+
+          <tr bgcolor="#9999cc">
+            <td align="left" valign="top" width="10">
+              <img src="resources/tl-9999cc.jpg" />
+            </td>
+            
+            <td colspan="2">
+              <if @edit_p@ true>
+                @task_term_lower;noquote@ &nbsp;@tasks.task_item_id@
               </if>
               <else>
-                #@num.task_id@
+                @task_term_lower;noquote@ &nbsp;@tasks.rownum@
               </else>
             </td>
-            <td valign="bottom">
-              <if @using_process_p@ true>
-                Skip this task?
-              </if>
-              
-              <formwidget id="skip_task_p.@num.rownum@">
-                <formerror id="skip_task_p.@num.rownum@"> 
-                  <br />
-                  <font color="red">Error</font>
-                </formerror>
-              </formwidget>
+            
+            <td align="right" valign="top" width="10">
+              <img src="resources/tr-9999cc.jpg" />
             </td>
             
           </tr>
-
-          <if @num.rownum@ odd>
-            <tr bgcolor="lavender">
+          
+          <if @tasks.rownum@ odd>
+            <tr bgcolor="#e6e6fa">
           </if>
           <else>
             <tr bgcolor="#ddffdd">
           </else>
 
-          <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 />
+          <td rowspan="2" align="center" valign="top">
+            <input type="hidden" name="task_item_id.@tasks.rownum@" value="@tasks.task_item_id@" />
+            <input type="hidden" name="number" value="@tasks.rownum@" />
+          </td>
 
-            <b>Description:</b><br />
-            <formwidget id="description.@num.rownum@">
-              <formerror id="description.@num.rownum@"> 
-                <br />
-                <font color="red">Error</font>
-              </formerror>
-            </formwidget>
-            <p />
+          <td valign="top"><b>Subject:</b><font color="red">*</font><br /><input type="text" size="39" name="task_title.@tasks.rownum;noquote@" value="@tasks.one_line@"><p />
 
-            <if @edit_p@ true>
-              <b>Comment:</b><br />
-            </if>
-            <formwidget id="comment.@num.rownum@">
-              <formerror id="comment.@num.rownum@"> 
-                <br />
-                <font color="red">Error</font>
-              </formerror>
-            </formwidget>
+              <b>Description:</b><br />
+              <textarea name="description.@tasks.rownum;noquote@" rows="14" cols="40" id="richtext__add_edit__description.@tasks.rownum;noquote@">@tasks.description@</textarea><br />
 
-         </td>
+              Format: 
+              <select name="description_mime_type.@tasks.rownum;noquote@" id="richtext__add_edit__description.@tasks.rownum@">
+                
+                <if @tasks.description_mime_type@ eq "text/enhanced">
+                  <option value="text/enhanced" selected="selected">Enhanced Text</option>
+                </if>
+                <else>
+                  <option value="text/enhanced">Enhanced Text</option>
+                </else>
 
-          <td valign="top">
+                <if @tasks.description_mime_type@ eq "text/plain">
+                  <option value="text/plain" selected="selected">Plain Text</option>
+                </if>
+                <else>
+                  <option value="text/plain">Plain Text</option>
+                </else>
 
-            <table border="0" cellpadding="0" cellspacing="0" width="100%">
-              <tr class="form-element">
-                <td align="left" colspan="2"><b>Total work required:</b>
-                  <font color="red">*</font><p />
-                </td>
-              </tr>
+                <if @tasks.description_mime_type@ eq "text/fixed-width">
+                  <option value="text/fixed-width" selected="selected">Fixed-width Text</option>
+                </if>
+                <else>
+                  <option value="text/fixed-width">Fixed-width Text</option>
+                </else>
 
-              <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
+                <if @tasks.description_mime_type@ eq "text/html">
+                  <option value="text/html" selected="selected">HTML</option>
+                </if>
+                <else>
+                  <option value="text/html">HTML</option>
+                </else>
+              </select>
 
-                      <formerror id="estimated_hours_work_min.@num.rownum@">
-                        <br />
-                        <font color="red">Error</font>
-                      </formerror>
-                    </formwidget>
-                  </td>
-                </tr>
+              <if @edit_p@ true>
 
-                <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
+                <p />
+                <b>Comment</b><br />
+                <textarea name="comments.@tasks.rownum;noquote@" rows="7" cols="40"></textarea><br />
 
-                      <formerror id="estimated_hours_work_max.@num.rownum@">
-                        <br />
-                        <font color="red">Error</font>
-                      </formerror>
-                    </formwidget>
-                    
-                  </td>
-                </tr>
+                Format: 
+                <select name="comments_mime_type.@tasks.rownum;noquote@">
+                  <option value="text/enhanced">Enhanced Text</option>
+                  <option value="text/plain" selected="selected">Plain Text</option>
+                  <option value="text/fixed-width">Fixed-width Text</option>
+                  <option value="text/html">HTML</option>
+                </select>
+                
               </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>
-                    </formwidget>
-                  </td>
-                </tr>
+                <input type="hidden" name="comments.@tasks.rownum@" value="" />
+                <input type="hidden" name="comments_mime_type.@tasks.rownum@" value="text/plain" />
               </else>
 
-              <tr class="form-element">
-                <td>
-                  <td class="form-widget">
-                    <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>
+          </td>
+
+        </td>
+          
+          <td width="15">&nbsp;</td>
+
+          <td valign="top">
+            <table border="0" cellpadding="0" cellspacing="0">
+              <tr>
+                <td><b>Work required:</b><font color="red">*</font></td>
               </tr>
 
-            <if @edit_p@ true>
-                <tr class="form-element">
-                  <td colspan="2" align="left"><p /><b>Log entry:</b><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>
+              <if @use_day_p@ true>
+                <if @use_uncertain_completion_times_p@ eq 1>
+                  <tr><td>Min:</td>
+                    <td><input type="text" name="estimated_days_work_min.@tasks.rownum;noquote@" size="5" value="@tasks.work_min_days@"> @work_units;noquote@</td>
+                  </tr>
+                  
+                  <tr><td>Max:</td>
+                    <td><input type="text" name="estimated_days_work_max.@tasks.rownum;noquote@" size="5" value="@tasks.work_max_days@"> @work_units;noquote@</td>
+                  </tr>
+                </if>
 
-                  <tr class="form-element">
-                    <td>
-                      <td class="form-widget">
-                        <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">
-                            Enter 100% to close the @task_term_lower@, or less
-                            to open it.
-                        </p>
-                      </td>
+                <else>
+                  <tr><td><input type="text" name="estimated_hours_work.@tasks.rownum;noquote@" size="5" value="@tasks.work_hrs@"> @work_units;noquote@</tr>
+                </else>
+              </if>
+              <else>
+                <if @use_uncertain_completion_times_p@ eq 1>
+                  <tr><td>Min:</td>
+                    <td><input type="text" name="estimated_hours_work_min.@tasks.rownum;noquote@" size="5" value="@tasks.work_min_hrs@"> @work_units;noquote@</td>
                   </tr>
                   
-                </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>
-                
-                <tr class="form-element">
-                  <td>
-                    <td class="form-widget">
-                      <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 can optionally log time worked here.
-                      </p>
-                    </td>
-                </tr>
-                
+                  <tr><td>Max:</td>
+                    <td><input type="text" name="estimated_hours_work_max.@tasks.rownum;noquote@" size="5" value="@tasks.work_max_hrs@"> @work_units;noquote@</td>
+                  </tr>
+                </if>
+                <else>
+                  <tr><td><input type="text" name="estimated_hours_work.@tasks.rownum;noquote@" size="5" value="@tasks.work_hrs@"> @work_units;noquote@</tr>
+                </else>
+              </else>
             </table>
+            
+            <p />
+          
+            <div class="shaded">
 
-          </if>
-            <else>
-              <formwidget id="percent_complete.@num.rownum@">
-                <formerror id="percent_complete.@num.rownum@">
-                  <font color="red">Error</font>
-                </formerror>
-              </formwidget>
-              </table>
-            </else>
+              Deadline: @tasks.end_date_html;noquote@</p>
 
-            <table bgcolor="#dddddd" width="100%" cellpadding="0" cellspacing="0">
-      
-              <tr>
-                <td valign="top">
-                  Deadline: <br />
+              <input type="hidden" name="process_task_id.@tasks.rownum@" value="@tasks.process_task_id;noquote@" />
 
-                  <formwidget id="end_date.@num.rownum@">
-                    <formerror id="end_date.@num.rownum@">
-                      <font color="red">Error</font>
-                    </formerror>
-                  </formwidget>
+              <p />
 
-                  <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>
+              @tasks.project_html;noquote@
+              
+              <p />
 
-              <tr>
-                <td valign="top"> 
-                  <p />Dependency:<br />
+              Dependency: <br />
+              <select name="dependency.@tasks.rownum@">
+                @tasks.dependency_html;noquote@
+              </select>
 
-                  <formwidget id="dependency_task_id.@num.rownum@">
-                    <formerror id="dependency_task_id.@num.rownum@">
-                      <font color="red">Error</font>
-                    </formerror>
-                  </formwidget>
+              <p />
 
-                  <formwidget id="dependency_type.@num.rownum@">
-                    <formerror id="dependency_type.@num.rownum@">
-                      <font color="red">Error</font>
-                    </formerror>
-                  </formwidget>
+	        Priority:
+		<input type="text" name="priority.@tasks.rownum@" value="@tasks.priority@" size="4"/>
+		<br />
+		<span 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">
+                    Enter a number for ordering the priority. 0 is the default
+		and also the lowest priority.
+                </span>
+		<p />
 
-                  <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>
+              <if @edit_p@ true>
+		Status:
+                <input type="text" name="percent_complete.@tasks.rownum@" value="@tasks.percent_complete@" size="4"/>
+                %<br />
+                <span 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">
+                    Enter 100% to close the @task_term_lower@, or less to open it.
+                </span>
+              </if>
+              <elseif @using_process_p@ true>
+                Status: 
+                <select name="percent_complete.@tasks.rownum@">
+                  <option value="0">Open</option>
+                  <option value="100">Closed</option>
+                </select>
+              </elseif>
+              <else>
+                <input type="hidden" name="percent_complete.@tasks.rownum@" value="0" />
+              </else>
+              
 
-                </td>
-              </tr>
+              <p />
 
-              <tr>
-                <td valign="top"> 
-                  <p />Project:<br />
-                  <formwidget id="project_item_ids.@num.rownum@">
-                    <formerror id="project_item_ids.@num.rownum@">
-                    <br />
-                    <font color="red">Error</font>
-                    </formerror>
-                  </formwidget>
-                </td>
-              </tr>
-            </table>
+              <if @edit_p@ true>
+                <p />
+                Log entry:
+                <table border="0" class="list">
+                  <tr class="form-element">
+                    <td class="form-label">Quantity:</td>
+                    <td class="form-widget">
+                      <input type="text" name="hours.@tasks.rownum@"
+                        size="4" />
+                      @tasks.logger_variable_html;noquote@
+                    </td>
+                  </tr>
 
-            <formwidget id="task_item_id.@num.rownum@">
-              <formerror id="task_item_id.@num.rownum@">
-                  <font color="red">Error</font>
-              </formerror>
-            </formwidget>
+                  <tr class="form-element">
+                    <td class="form-label">Date:</td>
+                    <td class="form-widget">
+                      <%= [set today_html@tasks.task_item_id@] %>
+                    </td>
+                  </tr>
 
-            </td>
-          </tr>
+                  <tr class="form-element">
+                    <td class="form-label">Description:</td>
+                    <td class="form-widget">
+                      <input type="text"
+                        name="log.@tasks.rownum@" size="30" />
+                    </td>
+                  </tr>
+                  
+                  <tr class="form-element">
+                    <td>
+                      <td class="form-widget">
+                        <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 can optionally log time worked here.
+                        </p>
+                      </td>
+                  </tr>
+                </table>
 
+              </if>
+
+          </td>
+          
+        </tr>
+          
+          <if @tasks.rownum@ odd>
+            <tr bgcolor="lavender">
+          </if>
+          <else>
+            <tr bgcolor="#ddffdd">
+          </else>
+          
+          <td colspan="3">@tasks.assignee_html;noquote@</td>
+
+        </tr>
+
+          <if @tasks.rownum@ odd>
+            <tr bgcolor="#e6e6fa">
+              <td align="left" valign="bottom" width="10">
+                <img src="resources/bl-e6e6fa.jpg" />
+              </td>
+              
+              <td colspan="2">&nbsp;</td>
+              
+              <td align="right" valign="bottom" width="10">
+                <img src="resources/br-e6e6fa.jpg" />
+              </td>
+          </if>
+          <else>
+            <tr bgcolor="#ddffdd">
+              <td align="left" valign="bottom" width="10">
+                <img src="resources/bl-ddffdd.jpg" />
+              </td>
+              
+              <td colspan="2">&nbsp;</td>
+              
+              <td align="right" valign="bottom" width="10">
+                <img src="resources/br-ddffdd.jpg" />
+              </td>
+          </else>
+
+          <tr bgcolor="#ffffff">
+            <td colspan="4">&nbsp;</td>
+          </tr>
         </multiple>
 
-    <tr><td colspan="99" align="center">
-        <formwidget id="formbutton:ok" />
-      </td></tr>
-    
-  </formtemplate>
-  </table>
+        <input type="hidden" name="process_id" value="@process_id;noquote@" />
+        <tr>
+          <td colspan="5" align="center"><input type="submit" name="formbutton:ok" value = "       OK       "></td>
+        </tr>
+      </form>
+    </table>
   </center>
-  
+
+    <table border="0" cellpadding="5" cellspacing="0" class="list">