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.19.2.3 -r1.19.2.4
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	4 Feb 2004 20:17:19 -0000	1.19.2.3
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	6 Mar 2004 00:29:24 -0000	1.19.2.4
@@ -1,114 +1,209 @@
-<master>
+<master src="lib/master">
 
-<link rel="stylesheet" href="style.css" type="text/css">
+  <link rel="stylesheet" href="style.css" type="text/css" />
 
-<property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+  <property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
+  <property name="context">@context@</property>
+  
+  <div id="topcontent">
+    
+    <div id="leftcontent">
+      
+      <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>
+          
+          <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">
+            
+            <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>
+              
+              <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>
 
-<div id="topcontent">
+      <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>
 
-<div id="leftcontent">
+          <td rowspan="2" class="list-button-bar" align="right"> 
+            @task_info.percent_complete@% complete<br />
+            Slack: @task_info.slack_time@<br />
+          </td>
 
-<table border="1" cellpadding="0" cellspacing="0" width="100%">
+        </tr>
 
-  <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>
+        <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>
 
-    <th>@task_term@ #@item_id@: @task_info.task_title@</th>
+          <td class="list-filter-header" align="center">
+            @log_note@
+          </td>
+              
+        </tr>
 
-    <th align="right"><img border="0" src="/shared/images/Delete16.gif"></th>
-<tr>
-<td colspan="3">
+       
+        <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>
+  
+  <div id="bottomcontent">
+    <!-- REVISIONS -->
+    
+    <p />
 
-<table border=0 cellpadding=3 cellspacing=1 width="100%">
-
-<tr>
-<th colspan="2">Description</th>
-<tr>
-<td colspan="2">@task_info.description;noquote@
-<tr>
-<td><td align="right">-- @task_info.creation_user@</td>
-</tr>
-
-<tr>
-<th colspan="2">Work</th>
-</tr>
-
-<tr>
-<td colspan="2">@task_info.percent_complete@% complete</td>
-</tr>
-
-<tr>
-<td colspan="2">@task_info.estimated_hours_work_min@ - @task_info.estimated_hours_work_max@ hrs estimated</td>
-</tr>
-
-<tr>
-<td colspan="2">@task_info.slack_time@ slack</td>
-</tr>
-
-<tr>
-<th colspan="2">Dates</th>
-
-<tr>
-<td>Deadline</th>
-<td>@task_info.end_date@</td>
-</tr>
-
-<tr>
-<td>Earliest start</th>
-<td>@task_info.earliest_start@</td>
-</tr>
-
-<tr>
-<td>Earliest finish</th>
-<td>@task_info.earliest_finish@</td>
-</tr>
-
-<tr>
-<td>Latest start</th>
-<td>@task_info.latest_start@</td>
-</tr>
-
-<tr>
-<td>Latest finish</th>
-<td>@task_info.latest_start@</td>
-</tr>
-
-</table>
-</table>
-
-<P>
-
-<a class="button" href="">Breakdown</a>
-
-</div>
-
-<div id="rightcontent">
-
-<listtemplate name="people"></listtemplate>
-
-<P />
-
-<center><B>@task_term@(s) this depends on.</B></center>
-<listtemplate name="dependency"></listtemplate>
-<P>
-
-<center><B>@task_term@(s) depending on this @task_term@</B></center>
-<listtemplate name="dependency2"></listtemplate>
-
-</div>
-
-</div>
-
-<div id="bottomcontent">
-<!-- REVISIONS -->
-
-<listtemplate name="revisions"></listtemplate>
-
-@comments;noquote@
-<P>
-@comments_link;noquote@
-
-</div>
+    <listtemplate name="revisions"></listtemplate>
+    
+    @comments;noquote@
+    <P />
+    @comments_link;noquote@
+    
+  </div>
+