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.17 -r1.18
--- openacs-4/contrib/packages/project-manager/www/one.adp	26 Aug 2003 00:05:58 -0000	1.17
+++ openacs-4/contrib/packages/project-manager/www/one.adp	29 Aug 2003 00:35:35 -0000	1.18
@@ -29,45 +29,53 @@
         <td>@project.project_name@</td>
       </tr>
 
-      <tr>
-        <th>Code</th>
-        <td>@project.project_code@</td>
-      </tr>
+      <if @use_project_code_p@ eq 1>
+        <tr>
+          <th>Code</th>
+          <td>@project.project_code@</td>
+        </tr>
+      </if>
 
-      <tr>
-        <th>Goal</th>
-        <td>@project.goal@</td>
-      </tr>   
+      <if @use_goal_p@ eq 1>
+        <tr>
+          <th>Goal</th>
+          <td>@project.goal@</td>
+        </tr>   
+      </if>
 
       <tr>
         <th valign="top">Description</th>
         <td>@project.description@</td>
       </tr>
 
       <tr>
-        <th>Start date (planned)</th>
+        <th>Start</th>
         <td>@project.planned_start_date@</td>
       </tr>
 
       <tr>
-        <th>End date (planned)</th>
-        <td>@project.planned_end_date@</td>
+        <th>Deadline</th>
+        <td><B>@project.planned_end_date@</B></td>
       </tr>
 
-      <tr>
-        <th>Earliest completion date</th>
-        <td>@project.earliest_completion_date@</td>
-      </tr>
+      <if @use_uncertain_completion_times_p@ eq 1>
+        <tr>
+          <th>Earliest finish</th>
+          <td>@project.earliest_finish_date@</td>
+        </tr>
+      </if>
 
       <tr>
-        <th>Estimated completion date</th>
-        <td><I>@project.estimated_completion_date@</I></td>
+        <th>Estimated finish</th>
+        <td><I>@project.estimated_finish_date@</I></td>
       </tr>
 
-      <tr>
-        <th>Latest completion date</th>
-        <td>@project.latest_completion_date@</td>
-      </tr>
+      <if @use_uncertain_completion_times_p@ eq 1>
+        <tr>
+          <th>Latest finish</th>
+          <td>@project.latest_finish_date@</td>
+        </tr>
+      </if>
 
       <tr>
         <th>Actual hours completed</th>
@@ -129,47 +137,7 @@
 
   <p />
 
-  <table border="1" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <th>@project_term@ versions</th>
-  </tr>
-  <tr>
-    <td>
+  <listtemplate name="versions"></listtemplate>
 
-      <table border="0" cellpadding="2" cellspacing="1" width="100%">
-      <tr>
-        <th width="15%">@project_term@</th>
-        <th width="10%">Code</th>
-        <th width="15%">Goal</th>
-        <th width="30%">Description</th>
-        <th>Start date (planned)</th>
-        <th>End date (planned)</th>
-        <th>Ongoing?</th>
-      </tr>
-
-      <multiple name="versions">
-
-        <tr>
-          <if @versions.project_id@ eq @versions.live_revision@>
-            <td><b><a href="one?project_id=@versions.project_id@">@versions.project_name@</a></b></td>
-          </if>
-
-          <else>
-            <td><a href="one?project_id=@versions.project_id@">@versions.project_name@</a></td>
-          </else>
-
-          <td>@versions.project_code@</td>
-          <td>@versions.goal@</td>
-          <td>@versions.description@</td>
-          <td>@versions.planned_start_date@</td>
-          <td>@versions.planned_end_date@</td>
-          <td>@versions.ongoing_p@</td>
-        </tr>
-      </multiple>
-    </table>
-  </td>
-</tr>
-</table>
-
 <!--left out because of display bug on Safari</div>-->