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.24 -r1.25
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	12 Mar 2004 13:44:45 -0000	1.24
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	27 Apr 2004 00:49:29 -0000	1.25
@@ -26,6 +26,7 @@
     orderby_dependency:optional
     orderby_dependency2:optional
 } -properties {
+    closed_message:onevalue
     notification_chunk:onevalue
     task_info:onerow
     project_item_id:onevalue
@@ -93,7 +94,6 @@
 set comments_link [general_comments_create_link -object_name pm_task -link_text "Add a comment" -context_id $package_id $task_id "[ad_conn url]?task_id=$task_id"]
 
 
-
 # permissions
 permission::require_permission -party_id $user_id -object_id $package_id -privilege read
 
@@ -105,15 +105,30 @@
 # Task info ----------------------------------------------------------
 
 db_1row task_query { } -column_array task_info
-set task_info(description) [ad_text_to_html -- $task_info(description)]
 
+set richtext_list [list $task_info(description) $task_info(mime_type)]
+
+set task_info(description) [template::util::richtext::get_property html_value $richtext_list]
+
 if {[exists_and_not_null task_info(earliest_start_j)]} {
     set task_info(slack_time) [pm::task::slack_time \
                                    -earliest_start_j $task_info(earliest_start_j) \
                                    -today_j $task_info(today_j) \
                                    -latest_start_j $task_info(latest_start_j)]
 }
 
+if {$task_info(percent_complete) >= 100} {
+    set closed_message "-- Closed"
+} else {
+    set closed_message ""
+}
+
+# how to get back here
+set return_url "[ad_conn url]?[ad_conn query]"
+
+set task_edit_url "task-add-edit?my_key=1&task_id=$task_id&project_item_id=$project_item_id&return_url=$return_url"
+
+
 set logger_project [pm::project::get_logger_project \
                         -project_item_id $project_item_id]
 set logger_variable_id [logger::variable::get_default_variable_id]
@@ -149,6 +164,9 @@
         }
         description {
             label "Description"
+            display_template {
+                @revisions.description_rich;noquote@
+            }
         }
         percent_complete {
             label "Status"
@@ -186,9 +204,14 @@
     }
 
 
-db_multirow -extend { item_url } revisions task_revisions_query {
+db_multirow -extend { item_url description_rich } 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}]
+
+    set richtext_list [list $description $mime_type]
+
+    set description_rich [template::util::richtext::get_property html_value $richtext_list]
+
 }
 
 # Dependency info ------------------------------------------------
@@ -323,7 +346,7 @@
     -elements {
         first_names {
             label {
-                Who <a href="task-assign-add-edit?revision_no_dependencies=$task_revision_id&[export_url_vars project_item_id]"><img border="0" src="/shared/images/Edit16.gif" align="center"></a>
+                Who <a href="task-assign-add-edit?revisions=$task_revision_id&[export_url_vars project_item_id task_id return_url]"><img border="0" src="/shared/images/Edit16.gif" align="center"></a>
             }
             display_template {
                 @people.user_info@ 
@@ -388,7 +411,10 @@
             label "LS"
         }
         latest_finish_pretty {
-            label "ES"
+            label "LF"
+            display_template {
+                <b>@xrefs.latest_finish_pretty@</b>
+            }
         }
     } \
     -sub_class {