Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/contrib/packages/project-manager/www/one.tcl	29 Aug 2003 00:35:35 -0000	1.13
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	4 Sep 2003 22:45:23 -0000	1.14
@@ -89,9 +89,9 @@
 db_multirow tasks project_tasks_query { }
 
 if {$use_uncertain_completion_times_p} {
-    set work_display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ hrs"
+    set work_display_template "@tasks.estimated_hours_work_min@ - @tasks.estimated_hours_work_max@ h"
 } else {
-    set work_display_template "@tasks.estimated_hours_work@ hrs"
+    set work_display_template "@tasks.estimated_hours_work@ h"
 }
 
 template::list::create \
@@ -104,24 +104,8 @@
             display_col title
             link_url_col item_url
             link_html { title "View this task" }
-        }
-        percent_complete {
-            label "Status"
-            display_template "@tasks.percent_complete@\%"
-        }
-        actual_hours_worked {
-            label "Hour to date"
-            display_template "@tasks.actual_hours_worked@ hrs"
-            aggregate "sum"
-        }
-        estimated_hours_work {
-            label "Work estimate"
-            display_template "[set work_display_template]"
-        }
-        end_date {
-            label "Deadline"
             display_template {
-                @tasks.end_date@
+                @tasks.title@
                 <a href="task-one?task_id=@tasks.parent_task_id@">
                 <if @tasks.dependency_type@ eq start_before_start>
                   <img src="images/start_before_start.png">
@@ -138,6 +122,29 @@
                 </a>
             }
         }
+        percent_complete {
+            label "Status"
+            display_template "@tasks.percent_complete@\% <font size=\"-2\" color=\"grey\">@tasks.actual_hours_worked@/[set work_display_template]</font>"
+        }
+        earliest_start {
+            label "Earliest Start"
+            display_template "@tasks.earliest_start@"
+        }
+        earliest_finish {
+            label "Earliest Finish"
+            display_template "@tasks.earliest_finish@"
+        }
+        latest_start {
+            label "Latest Start"
+            display_template "@tasks.latest_start@"
+        }
+        latest_finish {
+            label "Latest Finish"
+            display_template {
+                @tasks.latest_finish@
+                <if @tasks.end_date@ eq @tasks.latest_finish@>!</if>
+            }
+        }
     } \
     -filters {
         project_item_id {}