Index: openacs-4/contrib/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	12 Mar 2004 13:44:45 -0000	1.23
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	27 Apr 2004 00:49:29 -0000	1.24
@@ -1,227 +1,236 @@
 <master src="lib/master">
-
-  <link rel="stylesheet" href="style.css" type="text/css" />
-
-  <property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
+  
+  <property name="title">@task_term@ #@item_id@:
+    @task_info.task_title@ @closed_message@</property>
   <property name="context">@context@</property>
   
-  <div id="topcontent">
-    
-    <div id="leftcontent">
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr>
+      <td valign="top">
       
-      <table border="1" cellpadding="0" cellspacing="0" width="100%"
-        class="list">
-        
-        <tr>
-          <th>
-            <a href="task-add-edit?my_key=1&task_id=@task_id@&project_item_id=@project_item_id@">
-              <img border="0" src="/shared/images/Edit16.gif"
-                alt="Edit">
-            </a>
-            <a href="task-print?&task_id=@task_id@&project_item_id=@project_item_id@">
-              <img border="0" src="resources/print-16.png"
-                alt="Print">
-            </a>
-          </th>
+        <table border="1" cellpadding="0" cellspacing="0" width="100%"
+          class="list">
           
-          <th>@task_term@ #@item_id@: @task_info.task_title@
-          </th>
-          
-          <th align="right"><img border="0"
-              src="/shared/images/Delete16.gif">
-          </th>
-          
-        </tr>
-        
-        <tr>
-          <td colspan="3">
+          <tr>
+            <th>
+              <a href="@task_edit_url;noquote@">
+                <img border="0" src="/shared/images/Edit16.gif"
+                  alt="Edit">
+              </a>
+              <a href="task-print?&task_id=@task_id@&project_item_id=@project_item_id@">
+                <img border="0" src="resources/print-16.png"
+                  alt="Print">
+              </a>
+            </th>
             
-            <table border=0 cellpadding=3 cellspacing=1 width="100%"
-              class="list"> 
+            <th>@task_term@ #@item_id@: @task_info.task_title@
+            </th>
+            
+            <th align="right">
+              <a href="task-delete?task_item_id=@task_id@">
+                <img border="0" src="/shared/images/Delete16.gif">
+              </a>
+            </th>
+            
+          </tr>
+          
+          <tr>
+            <td colspan="3">
               
-              <tr>
-                <th colspan="2">Description</th>
-              </tr>
-              
-              <tr>
-                <td colspan="2">@task_info.description;noquote@</td>
-              </tr>
-              
-              <tr>
-                <td></td>
-                <td align="right">-- @task_info.creation_user@</td>
-              </tr>
-              
-              <tr>
-                <td colspan="2"></td>
-              </tr>
-              
-              <tr>
-                <td colspan="2"></td>
-              </tr>
-              
-              <tr>
-                <th colspan="2">Dates</th>
-              </tr>
-              
-              <tr>
-                <td>Deadline</td>
-                <td>@task_info.end_date@</td>
-              </tr>
-              
-              <tr>
-                <td>Earliest start</td>
-                <td>@task_info.earliest_start@</td>
-              </tr>
-              
-              <tr>
-                <td>Earliest finish</td>
-                <td>@task_info.earliest_finish@</td>
-              </tr>
-              
-              <tr>
-                <td>Latest start</td>
-                <td>@task_info.latest_start@</td>
-              </tr>
-              
-              <tr>
-                <td>Latest finish</td>
-                <td>@task_info.latest_start@</td>
-              </tr>
-              
-            </table>
-      </table>
-      
-      <P />
-      
-      <if @notification_chunk@ not nil>
-        @notification_chunk;noquote@
-      </if>
-      
-    </div>
-    
-    <div id="rightcontent">
-      
-      <table border="1" class="list" width="100%">
-        <tr>
-          <th>Assignees</th>
-        </tr>
-        <tr>
-          <td>
-            <listtemplate name="people"></listtemplate>
-          </td>
-        </tr>
-      </table>
-      
-      <P />
-      
-      <table border="1" class="list" width="100%">
-        <tr>
-          <th>@task_term@s this depends on.</th>
-        </tr>
-        <tr>
-          <td>
-            <listtemplate name="dependency"></listtemplate>
-          </td>
-        </tr>
-      </table>
-      
-      <P />
-      
-      <table border="1" class="list" width="100%">
-        <tr>
-          <th>@task_term@s depending on this @task_term@</th>
-        </tr>
-        <tr>
-          <td>
-            <listtemplate name="dependency2"></listtemplate>
-          </td>
-        </tr>
-      </table>
+              <table border=0 cellpadding=3 cellspacing=1 width="100%"
+                class="list"> 
+                
+                <tr>
+                  <th colspan="2">Description</th>
+                </tr>
+                
+                <tr>
+                  <td colspan="2">@task_info.description;noquote@</td>
+                </tr>
 
-      <p />
+                <tr>
+                  <td></td>
+                  <td align="right">-- @task_info.creation_user@</td>
+                </tr>
+                
+                <tr>
+                  <td colspan="2">@comments;noquote@
+                    <P />
+                    @comments_link;noquote@
+                  </td>
+                </tr>
+                
+                <tr>
+                  <td colspan="2"></td>
+                </tr>
+                
+                <tr>
+                  <td colspan="2"></td>
+                </tr>
+                
+                <tr>
+                  <th colspan="2">Dates</th>
+                </tr>
 
-      <table border="1" class="list" width="100%">
-        <tr>
-          <th>Related @task_term@s</th>
-        </tr>
-        <tr>
-          <td>
-            <listtemplate name="xrefs"></listtemplate>
-          </td>
-        </tr>
-      </table>
+                <tr>
+                  <td>Deadline</td>
+                  <td>@task_info.end_date@</td>
+                </tr>
+                
+                <tr>
+                  <td>Earliest start</td>
+                  <td>@task_info.earliest_start@</td>
+                </tr>
+                
+                <tr>
+                  <td>Earliest finish</td>
+                  <td>@task_info.earliest_finish@</td>
+                </tr>
+                
+                <tr>
+                  <td>Latest start</td>
+                  <td>@task_info.latest_start@</td>
+                </tr>
+                
+                <tr>
+                  <td>Latest finish</td>
+                  <td>@task_info.latest_start@</td>
+                </tr>
+                
+              </table>
+        </table>
+        
+        <P />
+        
+        <if 0 eq 1>
+          <if @notification_chunk@ not nil>
+            @notification_chunk;noquote@
+          </if>
+        </if>
+        
+      </td>
+      <td>
+        &nbsp;
+      </td>
+      <td valign="top">
 
-      <p />
-      
-      <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
-        <tr>
-          <th colspan="3">Logged hours</th>
-        </tr>
+        <table border="1" class="list" width="100%">
+          <tr>
+            <th>Assignees</th>
+          </tr>
+          <tr>
+            <td>
+              <listtemplate name="people"></listtemplate>
+            </td>
+          </tr>
+        </table>
         
-        <tr class="list-filter-header">
-          <td class="list-button-bar" align="center" colspan="2">
-            Total work: 
-            <if @use_uncertain_completion_times_p@ eq 1>
-              @task_info.estimated_hours_work_min@ -
-            @task_info.estimated_hours_work_max@ hrs estimated
+        <P />
+        
+        <table border="1" class="list" width="100%">
+          <tr>
+            <th>@task_term@s this depends on.</th>
+          </tr>
+          <tr>
+            <td>
+              <listtemplate name="dependency"></listtemplate>
+            </td>
+          </tr>
+        </table>
+        
+        <P />
+        
+        <table border="1" class="list" width="100%">
+          <tr>
+            <th>@task_term@s depending on this @task_term@</th>
+          </tr>
+          <tr>
+            <td>
+              <listtemplate name="dependency2"></listtemplate>
+            </td>
+          </tr>
+        </table>
+        
+        <p />
+        
+        <table border="1" class="list" width="100%">
+          <tr>
+            <th>Related @task_term@s</th>
+          </tr>
+          <tr>
+            <td>
+              <listtemplate name="xrefs"></listtemplate>
+            </td>
+          </tr>
+        </table>
+        
+        <p />
+        
+        <table border="1" cellpadding="3" cellspacing="1" id="rightcontent" class="list">
+          <tr>
+            <th colspan="3">Logged hours</th>
+          </tr>
+          
+          <tr class="list-filter-header">
+            <td class="list-button-bar" align="center" colspan="2">
+              Total work: 
+              <if @use_uncertain_completion_times_p@ eq 1>
+                @task_info.estimated_hours_work_min@ -
+                @task_info.estimated_hours_work_max@ hrs estimated
               </if>
-            <else>
-              @task_info.estimated_hours_work@ hrs estimated
-            </else>
-          </td>
-
-          <td rowspan="2" class="list-button-bar" align="right"> 
-            @task_info.percent_complete@% complete<br />
-            <if @task_info.slack_time@ not nil>
-              Slack: @task_info.slack_time@<br />
-            </if>
-            <else>
-              Slack: n/a
-            </else>
-          </td>
-
-        </tr>
-
-        <tr class="list-button-bar">
-          <td class="list-button-bar">
-            <span class="list-button-header">
-              <a href="@log_url@" class="list-button" title="Log hours for this project">Log hours</a>
-            </span>
-          </td>
-
-          <td class="list-filter-header" align="center">
-            @log_note@
-          </td>
-              
-        </tr>
-
-       
-        <tr>
-          <td colspan="3">
-            <include src="lib/entries-table"
-              selected_project_id="@logger_project@"
-              selected_variable_id="@logger_variable_id@"
-              pm_project_id="@project_item_id@" 
-              pm_task_id="@task_id@" /> 
-          </td>
-        </tr>
-      </table>
-      
-    </div>
-    
-  </div>
+              <else>
+                @task_info.estimated_hours_work@ hrs estimated
+              </else>
+            </td>
+            
+            <td rowspan="2" class="list-button-bar" align="right"> 
+              @task_info.percent_complete@% complete<br />
+              <if @task_info.slack_time@ not nil>
+                Slack: @task_info.slack_time@<br />
+              </if>
+              <else>
+                Slack: n/a
+              </else>
+            </td>
+            
+          </tr>
+          
+          <tr class="list-button-bar">
+            <td class="list-button-bar">
+              <span class="list-button-header">
+                <a href="@log_url@" class="list-button" title="Log hours for this project">Log hours</a>
+              </span>
+            </td>
+            
+            <td class="list-filter-header" align="center">
+              @log_note@
+            </td>
+            
+          </tr>
+          
+          
+          <tr>
+            <td colspan="3">
+              <include src="lib/entries-table"
+                selected_project_id="@logger_project@"
+                selected_variable_id="@logger_variable_id@"
+                pm_project_id="@project_item_id@" 
+                pm_task_id="@task_id@" /> 
+            </td>
+          </tr>
+        </table>
+        
+      </td>
+    </tr>
+  </table>
+</table>    
   
   <div id="bottomcontent">
-    <!-- REVISIONS -->
-    
+    <h3>Revisions</h3>
+
     <p />
 
     <listtemplate name="revisions"></listtemplate>
-    
-    @comments;noquote@
-    <P />
-    @comments_link;noquote@
-    
+        
   </div>