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.12.2.1 -r1.12.2.2
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp	12 Mar 2004 22:28:12 -0000	1.12.2.1
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp	20 May 2004 17:30:05 -0000	1.12.2.2
@@ -1,24 +1,31 @@
 <master src="lib/master">
   <property name="title">@title;noquote@</property>
   <property name="context">@context@</property>
-
-
+  
+  
   <center>
-
+    
     <table border="0" cellpadding="5" cellspacing="0" class="list">
-
+      
       <formtemplate id="add_edit" style="standard-lars">
-
+        
         <multiple name="num">
-
+          
           <if @num.rownum@ odd>
             <tr bgcolor="lavender">
           </if>
           <else>
             <tr bgcolor="#ddffdd">
           </else>
 
-          <td align="center" rowspan="2" bgcolor="#ffffdd">&nbsp;#@num.rownum@&nbsp;&nbsp;</td>
+          <td align="center" bgcolor="#ffffdd">
+            <if @edit_p@ eq f>
+              &nbsp;#@num.rownum@&nbsp;&nbsp;
+            </if>
+            <else>
+              #@num.task_id@
+            </else>
+          </td>
 
           <td valign="top">
             <if @using_process_p@ eq "t">
@@ -30,6 +37,17 @@
                 <br />
                 <font color="red">Error</font>
               </formerror>
+            </formwidget>
+            <if @using_process_p@ eq "t">
+              <p />
+            </if>
+            
+            <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 />
             
             <b>Subject:</b><font color="red">*</font><br />
@@ -41,7 +59,7 @@
             </formwidget>
             <p />
 
-            Description:<br />
+            <b>Description:</b><br />
             <formwidget id="description.@num.rownum@">
               <formerror id="description.@num.rownum@"> 
                 <br />
@@ -50,13 +68,23 @@
             </formwidget>
             <p />
 
-          </td>
+            <if @edit_p@ eq t>
+              <b>Comment:</b><br />
+            </if>
+            <formwidget id="comment.@num.rownum@">
+              <formerror id="comment.@num.rownum@"> 
+                <br />
+                <font color="red">Error</font>
+              </formerror>
+            </formwidget>
 
+         </td>
+
           <td valign="top">
 
             <table border="0" cellpadding="0" cellspacing="0" width="100%">
               <tr class="form-element">
-                <td align="left" colspan="2">Work required:
+                <td align="left" colspan="2"><b>Work required:</b>
                   <font color="red">*</font><p />
                 </td>
               </tr>
@@ -105,18 +133,19 @@
               </else>
 
               <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>
+                <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>
               </tr>
 
             <if @edit_p@ eq t>
                 <tr class="form-element">
-                  <td colspan="2" align="left"><p />Log entry<p />
+                  <td colspan="2" align="left"><p /><b>Log entry:</b><p />
                   </td>
                 </tr>
                 <tr class="form-element">
@@ -128,6 +157,18 @@
                       </formerror>
                     </formwidget> %
                   </td>
+
+                  <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>
+                  </tr>
+                  
                 </tr>
                 <tr class="form-element">
                   <td class="form-label">Time:</td>
@@ -149,30 +190,35 @@
                     </formwidget>
                   </td>
                 </tr>
-              </table>
-            </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">
+                          You can optionally log time worked here.
+                      </p>
+                    </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>
+             </table>
             </else>
 
-          </td>
-        </tr>
-          
-          <tr bgcolor="#dddddd">
-            <td>
-              
             <table bgcolor="#dddddd" width="100%" cellpadding="0" cellspacing="0">
-
+      
               <tr>
                 <td valign="top">
-                  Deadline: 
-                  </td>
-                  <td>
+                  Deadline: <br />
+
                   <formwidget id="end_date.@num.rownum@">
                     <formerror id="end_date.@num.rownum@">
                       <font color="red">Error</font>
@@ -186,17 +232,9 @@
                 </td>
               </tr>
 
-            </table>
-
-
-          </td>
-            <td bgcolor="#dddddd">
-
-            <table bgcolor="#dddddd" width="100%">
-
               <tr>
                 <td valign="top"> 
-                  Dependency: 
+                  <p />Dependency:<br />
 
                   <formwidget id="dependency_task_id.@num.rownum@">
                     <formerror id="dependency_task_id.@num.rownum@">
@@ -215,9 +253,21 @@
                       You may enter a @task_term_lower@ that needs to
                       be completed before this @task_term_lower@
                   </p>
+
                 </td>
               </tr>
 
+              <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>
 
             <formwidget id="task_item_id.@num.rownum@">
@@ -231,8 +281,11 @@
 
         </multiple>
 
-        <tr><td colspan="99" align="center"><input type="submit" name="formbutton:ok" value = "       OK       "></td></tr>
-
-      </formtemplate>
-    </table>
+    <tr><td colspan="99" align="center">
+        <formwidget id="formbutton:ok" />
+      </td></tr>
+    
+  </formtemplate>
+  </table>
   </center>
+