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.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/one.adp	4 Aug 2003 20:34:47 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/one.adp	4 Aug 2003 21:24:06 -0000	1.9
@@ -2,11 +2,9 @@
 
 <link rel="stylesheet" href="style.css" type="text/css">
 
-<property name="title">One Project</property>
+<property name="title">Project #@item_id@: @project_name@</property>
 <property name="context_bar">@context_bar@</property>
 
-<h3>@project_name@</h3>
-
 <if @live_revision@ ne @project_id@>
 <h4>(not current, select live version below)</h4>
 </if>
@@ -24,7 +22,7 @@
 
 <if @tasks:rowcount@ ne 0>
   <tr>
-  <th></th>
+  <th>ID</th>
   <th>Name</th>
   <th>Start date</th>
   <th>End date</th>
@@ -37,7 +35,8 @@
 <multiple name="tasks">
 
 <tr>
-<td><input type="checkbox" name="task_id" value="@tasks.item_id@"></td>
+<td><input type="checkbox" name="task_id" value="@tasks.item_id@"> #@tasks.item_id@
+</td>
 
 <td><a href="task-one?project_item_id=@item_id@&task_id=@tasks.item_id@&project_id=@project_id@">@tasks.title@</a></td>
 
@@ -86,6 +85,11 @@
 
 <div id="leftcontent">
 
+<a class="button" href=add-edit?project_id=@project_id@>Edit</a>
+<a class="button" href=add-edit?parent_id=@item_id@>Add sub-project</a>
+
+<P>
+
 <!-- PROJECT INFO-->
 
 <table border="1" cellpadding="0" cellspacing="0">
@@ -95,8 +99,6 @@
 <tr>
 <td>
 
-<a class="button" href=add-edit?project_id=@project_id@>Edit</a>
-<a class="button" href=add-edit?parent_id=@item_id@>Add sub-project</a>
 <P>
 
 <table border=0>
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.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	30 Jul 2003 23:36:08 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	4 Aug 2003 21:24:06 -0000	1.3
@@ -16,4 +16,25 @@
         t.revision_id = i.live_revision
     </querytext>
   </fullquery>
+
+  <fullquery name="task_revisions_query">
+    <querytext>
+	SELECT
+        t.item_id,
+        t.revision_id,
+        i.live_revision,
+        t.title as task_title,
+        t.description,
+	to_char(t.start_date,'MM/DD/YYYY') as start_date,
+	to_char(t.end_date,'MM/DD/YYYY') as end_date,
+        t.percent_complete
+	FROM
+	pm_tasks_revisionsx t, cr_items i
+	WHERE
+        t.item_id = :task_id and
+        t.item_id = i.item_id
+        ORDER BY
+        t.revision_id
+    </querytext>
+  </fullquery>
 </queryset>
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.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	30 Jul 2003 23:36:08 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	4 Aug 2003 21:24:06 -0000	1.3
@@ -2,55 +2,130 @@
 
 <link rel="stylesheet" href="style.css" type="text/css">
 
-<property name="title">One Task</property>
+<property name="title">Task #@item_id@: @task_title@</property>
 <property name="context_bar">@context_bar@</property>
 
-<a href="">breakdown</a> this task into subtasks.
-<a href="task-add-edit?&task_id=">edit</a>
+<div id="rightcontent">
 
+<table border="1" cellpadding="0" cellspacing="0" width="100%">
+<tr>
+<td>
+
+
+<table border=0 cellpadding=3 cellspacing=1 width="100%">
+
+<tr>
+<th colspan=2>Constraints</th>
+</tr>
+
+</table>
+
 <P>
 
-<table>
+<table border=0 cellpadding=3 cellspacing=1 width="100%">
 
 <tr>
-<th>Subject</th>
-<td>@task_title@</td>
+<th colspan=2>People</th>
 </tr>
 
 <tr>
-<th>Description</th>
-<td>@description@
+<td valign="top">Assigned:
+
+</td>
+
+<td valign="top">
+Watchers:
+
+</td>
 </tr>
+</table>
 
+</table>
+</div>
+
+
+<div id="leftcontent">
+
+<a class="button" href="">breakdown</a>
+<a class="button" href="">edit</a>
+
+<P>
+
+<table border="1" cellpadding="0" cellspacing="0" width="100%">
 <tr>
-<th>Start date</th>
-<td>@start_date@</td>
+<td>
+
+<table border=0 cellpadding=3 cellspacing=1>
+
+<tr>
+<th colspan="2">Description</th>
+<tr>
+<td colspan="2">@description@
 </tr>
 
 <tr>
-<th>End date</th>
-<td>@end_date@</td>
+<th colspan="2">Overview</th>
 </tr>
+<tr>
+<td colspan="2">@percent_complete@% complete</td>
+</tr>
 
 <tr>
-<th>Status</th>
-<td>@percent_complete@% complete</td>
+<th colspan="2">Dates</th>
+
+<tr>
+<td>Start date</td>
+<td>@start_date@</td>
 </tr>
 
 <tr>
-<th>Priority</th>
+<td>End date</th>
+<td>@end_date@</td>
 </tr>
 
 </table>
+</table>
 
 <P>
 
-How this ticket relates to others:
+</div>
 
+<div id="bottomcontent">
+<!-- REVISIONS -->
+
 <P>
 
-Assigned:
+<table border=1 cellpadding=0 cellspacing=0 width="100%">
+<tr>
+<th>Task versions
+<tr>
+<td>
 
-<P>
+<table border=0>
+<th>Version ID</th>
+<th>Subject</th>
+<th>Description</th>
+<th>Start date (planned)</th>
+<th>End date (planned)</th>
 
-Watchers:
+<multiple name="versions">
+
+<tr>
+
+<if @versions.revision_id@ eq @versions.live_revision@>
+<td><B><a href="task-one?task_revision_id=@versions.revision_id@">@versions.revision_id@</a></B></td>
+</if>
+<else>
+<td><a href="task-one?task_revision_id=@versions.revision_id@">@versions.revision_id@</a></td>
+</else>
+
+<td>@versions.task_title@</td>
+<td>@versions.description@</td>
+<td>@versions.start_date@</td>
+<td>@versions.end_date@</td>
+</tr>
+</multiple>
+
+</table>
+</table>
+
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.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	31 Jul 2003 20:11:41 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	4 Aug 2003 21:24:06 -0000	1.4
@@ -23,6 +23,7 @@
     percent_complete:onevalue
     write_p:onevalue
     create_p:onevalue
+    versions:multirow
 }
 
 # --------------------------------------------------------------- #
@@ -42,6 +43,8 @@
 
 db_1row task_query { }
 
+db_multirow versions task_revisions_query { }
+
 ad_return_template
 
 # ------------------------- END OF FILE ------------------------- #