Index: openacs-4/contrib/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/Attic/project-manager.info,v
diff -u -N -r1.7 -r1.8
--- openacs-4/contrib/packages/project-manager/project-manager.info	6 Aug 2003 20:22:17 -0000	1.7
+++ openacs-4/contrib/packages/project-manager/project-manager.info	8 Aug 2003 19:13:53 -0000	1.8
@@ -8,14 +8,15 @@
     <singleton-p>f</singleton-p>
     <auto-mount>project-manager</auto-mount>
 
-    <version name="0.22d" url="http://openacs.org/repository/download/apm/project-manager-0.22d.apm">
-        <owner url="mailto:ncarroll@ee.usyd.edu.au">Nick Carroll</owner>
+    <version name="0.23d" url="http://openacs.org/repository/download/apm/project-manager-0.23d.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
+        <owner url="mailto:ncarroll@ee.usyd.edu.au">Nick Carroll</owner>
         <summary>Project management for OpenACS</summary>
-        <release-date>2003-08-06</release-date>
+        <release-date>2003-08-08</release-date>
         <description format="text/plain">http://openacs.org/projects/dotwrk/project_management/</description>
 
-        <provides url="project-manager" version="0.22d"/>
+        <provides url="project-manager" version="0.23d"/>
+        <requires url="acs-templating" version="4.6.4"/>
 
         <callbacks>
             <callback type="after-instantiate"  proc="project_manager::install::package_instantiate"/>
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 -N -r1.6 -r1.7
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	7 Aug 2003 23:08:45 -0000	1.6
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	8 Aug 2003 19:13:53 -0000	1.7
@@ -70,8 +70,7 @@
 	WHERE
         t.item_id = :task_id and
         t.item_id = i.item_id
-        ORDER BY
-        t.revision_id desc
+        $orderby_clause
     </querytext>
   </fullquery>
 
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 -N -r1.6 -r1.7
--- openacs-4/contrib/packages/project-manager/www/task-one.adp	7 Aug 2003 23:08:45 -0000	1.6
+++ openacs-4/contrib/packages/project-manager/www/task-one.adp	8 Aug 2003 19:13:53 -0000	1.7
@@ -2,7 +2,7 @@
 
 <link rel="stylesheet" href="style.css" type="text/css">
 
-<property name="title">@task_term@ #@item_id@: @task_title@</property>
+<property name="title">@task_term@ #@item_id@: @task_info.task_title@</property>
 <property name="context_bar">@context_bar@</property>
 
 <div id="rightcontent">
@@ -88,27 +88,27 @@
 <tr>
 <th colspan="2">Description</th>
 <tr>
-<td colspan="2">@description@
+<td colspan="2">@task_info.description@
 </tr>
 
 <tr>
 <th colspan="2">Overview</th>
 </tr>
 <tr>
-<td colspan="2">@percent_complete@% complete</td>
+<td colspan="2">@task_info.percent_complete@% complete</td>
 </tr>
 
 <tr>
 <th colspan="2">Dates</th>
 
 <tr>
 <td>Start date</td>
-<td>@start_date@</td>
+<td>@task_info.start_date@</td>
 </tr>
 
 <tr>
 <td>End date</th>
-<td>@end_date@</td>
+<td>@task_info.end_date@</td>
 </tr>
 
 </table>
@@ -121,37 +121,5 @@
 <div id="bottomcontent">
 <!-- REVISIONS -->
 
-<P>
+<listtemplate name="revisions"></listtemplate>
 
-<table border=1 cellpadding=0 cellspacing=0 width="100%">
-<tr>
-<th>Task versions
-<tr>
-<td>
-
-<table border=0>
-<th>Subject</th>
-<th>Description</th>
-<th>Start date (planned)</th>
-<th>End date (planned)</th>
-
-<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.task_title@</a></B></td>
-</if>
-<else>
-<td><a href="task-one?task_revision_id=@versions.revision_id@">@versions.task_title@</a></td>
-</else>
-
-<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 -N -r1.8 -r1.9
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	7 Aug 2003 23:08:45 -0000	1.8
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	8 Aug 2003 19:13:53 -0000	1.9
@@ -19,19 +19,16 @@
 } {
     task_id:integer,optional
     task_revision_id:integer,optional
+    orderby:optional
 
 } -properties {
+    task_info:onerow
     project_item_id:onevalue
     project_id:onevalue
     context_bar:onevalue
-    task_title:onevalue
-    description:onevalue
-    start_date:onevalue
-    end_date:onevalue
-    percent_complete:onevalue
     write_p:onevalue
     create_p:onevalue
-    versions:multirow
+    revisions:multirow
     consts:multirow
     task_term:onevalue
     task_term_lower:onevalue
@@ -76,10 +73,57 @@
 set create_p [permission::permission_p -object_id $package_id -privilege create]
 
 
-db_1row task_query { }
+db_1row task_query { } -column_array task_info
 
-db_multirow versions task_revisions_query { }
+# Trying to show the task revisions with list-builder
 
+template::list::create \
+    -name revisions \
+    -multirow revisions \
+    -key revision_id \
+    -elements {
+        revision_id {
+            label "Subject"
+            display_col task_title
+            link_url_col item_url
+            link_html { title "View this revision" }
+            display_template {<if @revisions.live_revision@ eq @revisions.revision_id@><B>@revisions.task_title@</B></if><else>@revisions.task_title@</else>}
+        }
+        description {
+            label "Description"
+        }
+        percent_complete {
+            label "Status"
+            display_template "@revisions.percent_complete@\%"
+        }
+        start_date {
+            label "Start date"
+        }
+        end_date {
+            label "End date"
+        }
+    } \
+    -orderby {
+        revision_id {orderby revision_id}
+        percent_complete {orderby percent_complete}
+        start_date {orderby start_date}
+        end_date {orderby end_date}
+    } \
+    -filters {
+        task_revision_id
+    }
+
+if {[exists_and_not_null orderby]} {
+    set orderby_clause "ORDER BY [template::list::orderby_clause -name revisions]"
+} else {
+    set orderby_clause "ORDER BY revision_id desc"
+}
+
+db_multirow -extend { item_url } revisions task_revisions_query {
+} {
+    set item_url [export_vars -base "task-one" -override {{task_revision_id $revision_id}} -exclude {revision_id} { revision_id task_id}]
+}
+
 db_multirow consts consts_query { }
 
 ad_return_template