Index: openacs-4/contrib/packages/project-manager/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/project-manager/www/one.adp	21 Aug 2003 22:34:43 -0000	1.14
+++ openacs-4/contrib/packages/project-manager/www/one.adp	22 Aug 2003 00:27:33 -0000	1.15
@@ -2,10 +2,10 @@
 
 <link rel="stylesheet" href="style.css" type="text/css" />
 
-<property name="title">@project_term@ #@item_id@: @project_name@</property>
+<property name="title">@project_term@ #@item_id@: @project.project_name@</property>
 <property name="context_bar">@context_bar@</property>
 
-<if @live_revision@ ne @project_id@>
+<if @project.live_revision@ ne @project.project_id@>
   <h4>(not current, select live version below)</h4>
 </if>
 
@@ -26,34 +26,49 @@
 
       <tr>
         <th valign="top">Name</td>
-        <td>@project_name@</td>
+        <td>@project.project_name@</td>
       </tr>
 
       <tr>
         <th>Code</th>
-        <td>@project_code@</td>
+        <td>@project.project_code@</td>
       </tr>
 
       <tr>
         <th>Goal</th>
-        <td>@goal@</td>
+        <td>@project.goal@</td>
       </tr>   
 
       <tr>
         <th valign="top">Description</th>
-        <td>@description@</td>
+        <td>@project.description@</td>
       </tr>
 
       <tr>
         <th>Start date (planned)</th>
-        <td>@planned_start_date@</td>
+        <td>@project.planned_start_date@</td>
       </tr>
 
       <tr>
         <th>End date (planned)</th>
-        <td>@planned_end_date@</td>
+        <td>@project.planned_end_date@</td>
       </tr>
 
+      <tr>
+        <th>Earliest completion date</th>
+        <td>@project.earliest_completion_date@</td>
+      </tr>
+
+      <tr>
+        <th>Estimated completion date</th>
+        <td><I>@project.estimated_completion_date@</I></td>
+      </tr>
+
+      <tr>
+        <th>Latest completion date</th>
+        <td>@project.latest_completion_date@</td>
+      </tr>
+
     </table>
 
   </table>
@@ -77,68 +92,8 @@
 
   <tr>
     <td>
-      <table border="0" width="100%">
+      <listtemplate name="tasks"></listtemplate>
 
-        <if @tasks:rowcount@ ne 0>
-          <tr>
-            <th>ID</th>
-            <th>Name</th>
-            <th>Status</th>
-            <th>Start</th>
-            <th>End</th>
-            <th>Constraints</th>
-
-            <form action="task-add-edit">
-              <input type="hidden" name="project_item_id" value="@item_id@">
-              <input type="hidden" name="project_id" value="@project_id@">
-          </tr>
-        </if>
-
-        <multiple name="tasks">
-
-          <tr>
-            <td><input type="checkbox" name="task_id" value="@tasks.item_id@">#@tasks.item_id@</input></td>
-
-            <td><a href="task-one?project_item_id=@item_id@&task_id=@tasks.item_id@&project_id=@project_id@">@tasks.title@</a></td>
-
-            <td>@tasks.percent_complete@%</td>
-
-            <td>@tasks.end_date@</td>
-
-            <td valign="center">
-
-              <if @tasks.parent_task_id@ not nil>
-                <a href="task-one?project_item_id=@item_id@&task_id=@tasks.parent_task_id@&project_id=@project_id@">@tasks.parent_task_id@</a>
-              </if>
-
-              <if @tasks.const_type@ eq start_before_start>
-                <img src="images/start_before_start.png">
-              </if>
-              <if @tasks.const_type@ eq start_before_finish>
-                <img src="images/start_before_finish.png">
-              </if>
-              <if @tasks.const_type@ eq finish_before_start>
-                <img src="images/finish_before_start.png">
-              </if>
-              <if @tasks.const_type@ eq finish_before_finish>
-                <img src="images/finish_before_finish.png">
-              </if>
-            </td>
-          </tr>
-
-        </multiple>
-
-        <if @tasks:rowcount@ ne 0>
-  </tr>
-
-  <tr>
-    <td colspan="4">
-      <!--<input type="submit" name="edit" value="Edit" />-->
-    </form>
-    </if>
-
-</table>
-
 <ul>
   <li> 
     <form action="task-add-edit" method="post">