Index: openacs-4/contrib/packages/project-manager/www/dependency-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/dependency-add-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/dependency-add-edit.tcl	4 Sep 2003 22:45:23 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/dependency-add-edit.tcl	12 Sep 2003 21:36:32 -0000	1.3
@@ -46,6 +46,10 @@
     set project_item_id [db_string get_parent_project { }]
 }
 
+if {![exists_and_not_null task_revisions]} {
+    ad_returnredirect "one?[export_url_vars project_item_id]"
+}
+
 # terminology
 set project_term    [parameter::get -parameter "ProjectName" -default "Project"]
 set task_term       [parameter::get -parameter "TaskName"    -default "Task"]
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/index.tcl	12 Sep 2003 01:20:57 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/index.tcl	12 Sep 2003 21:36:32 -0000	1.9
@@ -75,6 +75,9 @@
             display_template "@projects.actual_hours_completed@/@projects.estimated_hours_total@"
         }
     } \
+    -main_class {
+        narrow
+    } \
     -filters {
         orderby_project {}
     } \
Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	12 Sep 2003 01:20:57 -0000	1.15
+++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql	12 Sep 2003 21:36:32 -0000	1.16
@@ -89,7 +89,9 @@
 	to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
 	to_char(t.latest_start,'Mon DD ''YY') as latest_start,
 	to_char(t.latest_finish,'Mon DD ''YY') as latest_finish,
-        t.latest_start-t.earliest_start as slack_time,
+        to_char(t.latest_start-t.earliest_start,'DD') || ' days' as slack_time,
+        u.first_names,
+        u.last_name,
         t.percent_complete,
         d.parent_task_id,
         d.dependency_type,
@@ -98,10 +100,11 @@
         t.estimated_hours_work_max,
         t.actual_hours_worked
 	FROM
-	pm_tasks_revisionsx t, cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id
+	pm_tasks_revisionsx t LEFT JOIN pm_task_assignment a ON t.item_id = a.task_id, cr_items i LEFT JOIN pm_task_dependency d ON i.item_id = d.task_id, cc_users u
 	WHERE
         t.parent_id = :project_item_id and
-        t.revision_id = i.live_revision
+        t.revision_id = i.live_revision and
+        a.party_id = u.party_id
         [template::list::orderby_clause -name tasks -orderby]
     </querytext>
   </fullquery>
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.21 -r1.22
--- openacs-4/contrib/packages/project-manager/www/one.adp	12 Sep 2003 01:20:57 -0000	1.21
+++ openacs-4/contrib/packages/project-manager/www/one.adp	12 Sep 2003 21:36:32 -0000	1.22
@@ -55,6 +55,20 @@
         <td>@project.description@</td>
       </tr>
 
+  </table>
+
+  </table>
+
+  <p />
+
+  <table border="1" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <th colspan="2">Dates</th>
+  </tr>
+
+  <tr>
+  <td>
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
       <tr>
         <th>Start</th>
         <td>@project.planned_start_date@</td>
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.18 -r1.19
--- openacs-4/contrib/packages/project-manager/www/one.tcl	12 Sep 2003 01:20:57 -0000	1.18
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	12 Sep 2003 21:36:32 -0000	1.19
@@ -127,24 +127,39 @@
         }
         earliest_start {
             label "Earliest Start"
+            html {valign top}
             display_template "@tasks.earliest_start@"
         }
         earliest_finish {
             label "Earliest Finish"
+            html {valign top}
             display_template "@tasks.earliest_finish@"
         }
         latest_start {
             label "Latest Start"
+            html {valign top}
             display_template "@tasks.latest_start@"
         }
         latest_finish {
             label "Latest Finish"
+            html {valign top}
             display_template {
                 @tasks.latest_finish@
                 <if @tasks.end_date@ eq @tasks.latest_finish@>!</if>
             }
         }
+        last_name {
+            label "Who"
+            html {valign top}
+            display_template {
+                <group column="item_id">@tasks.first_names@&nbsp;@tasks.last_name@<br></group>
+            }
+
+        }
     } \
+    -main_class {
+        narrow
+    } \
     -filters {
         project_item_id {}
         orderby_subproject {}
@@ -191,6 +206,9 @@
             label "Hours completed"
         }
     } \
+    -main_class {
+        narrow
+    } \
     -filters {
         project_item_id {}
         orderby_versions {}
@@ -231,6 +249,9 @@
             label "Role"
         }
     } \
+    -main_class {
+        narrow
+    } \
     -filters {
         party_id {}
         orderby_subproject {}
@@ -273,6 +294,9 @@
             label "Deadline"
         }
     } \
+    -main_class {
+        narrow
+    } \
     -filters {
         project_item_id {}
         orderby_subproject {}
Index: openacs-4/contrib/packages/project-manager/www/style.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/style.css,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/project-manager/www/style.css	22 Aug 2003 00:27:33 -0000	1.5
+++ openacs-4/contrib/packages/project-manager/www/style.css	12 Sep 2003 21:36:32 -0000	1.6
@@ -11,7 +11,7 @@
 
 #leftcontent {
         float:left;
-        width:300px;
+        width:30%;
         margin-right:15px;
 }
 
Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	12 Sep 2003 01:20:57 -0000	1.14
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	12 Sep 2003 21:36:32 -0000	1.15
@@ -46,7 +46,10 @@
 	to_char(t.earliest_finish,'Mon DD ''YY') as earliest_finish,
 	to_char(t.latest_start,'Mon DD ''YY') as latest_start,
 	to_char(t.latest_finish,'Mon DD ''YY') as latest_finish,
-        t.latest_start-t.earliest_start as slack_time,
+        to_char(t.latest_start-t.earliest_start,'DD') || ' days' as slack_time,
+        t.estimated_hours_work,
+        t.estimated_hours_work_min,
+        t.estimated_hours_work_max,
         t.percent_complete,
         i.live_revision
 	FROM
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.13 -r1.14
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	12 Sep 2003 01:20:57 -0000	1.13
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	12 Sep 2003 21:36:32 -0000	1.14
@@ -29,13 +29,18 @@
 </tr>
 
 <tr>
-<th colspan="2">Overview</th>
+<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>
 
@@ -78,17 +83,17 @@
 
 <div id="rightcontent">
 
-<B>@task_term@(s) this relies on.</B>
+<listtemplate name="people"></listtemplate>
+
+<P />
+
+<center><B>@task_term@(s) this depends on.</B></center>
 <listtemplate name="dependency"></listtemplate>
 <P>
 
-<B>@task_term@(s) relying on this @task_term@</B>
+<center><B>@task_term@(s) depending on this @task_term@</B></center>
 <listtemplate name="dependency2"></listtemplate>
 
-<P />
-<B>People</B> <a href="task-assign-add-edit?task_item_ids=@task_id@&project_item_id=@project_item_id@"><img src="/shared/images/Edit16.gif" align="center"></a>
-<listtemplate name="people"></listtemplate>
-
 </div>
 
 </div>
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	12 Sep 2003 01:20:57 -0000	1.16
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	12 Sep 2003 21:36:32 -0000	1.17
@@ -123,6 +123,9 @@
         default_value revision_id,desc
     } \
     -orderby_name orderby_revisions \
+    -main_class {
+        narrow
+    } \
     -filters {
         task_revision_id {}
         orderby_dependency {}
@@ -181,6 +184,9 @@
         end_date {orderby end_date}
     } \
     -orderby_name orderby_dependency \
+    -main_class {
+        narrow
+    } \
     -filters {
         task_revision_id {}
         orderby_revisions {}
@@ -238,6 +244,9 @@
         end_date {orderby end_date}
     } \
     -orderby_name orderby_dependency2 \
+    -main_class {
+        narrow
+    } \
     -filters {
         task_revision_id {}
         orderby_revisions {}
@@ -263,14 +272,21 @@
     -key item_id \
     -elements {
         first_names {
-            label "Who"
-            display_template "@people.user_info@"
+            label {
+                Who <a href="task-assign-add-edit?revision_no_dependencies=$task_revision_id&[export_url_vars project_item_id]"><img src="/shared/images/Edit16.gif" align="center"></a>
+            }
+            display_template {
+                @people.user_info@ 
+            }
         }
         role_id {
             label "Role"
             display_template "@people.one_line@"
         }
     } \
+    -main_class {
+        narrow
+    } \
     -filters {
         party_id {}
         orderby_subproject {}