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 -r1.16.2.10 -r1.16.2.11
--- openacs-4/contrib/packages/project-manager/project-manager.info	13 Aug 2004 19:38:13 -0000	1.16.2.10
+++ openacs-4/contrib/packages/project-manager/project-manager.info	19 Aug 2004 00:01:27 -0000	1.16.2.11
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.15b2" url="http://openacs.org/repository/download/apm/project-manager-2.15b2.apm">
+    <version name="2.15b3" url="http://openacs.org/repository/download/apm/project-manager-2.15b3.apm">
         <owner url="mailto:jader@bread.com">Jade Rubick</owner>
         <summary>Project management tool for OpenACS</summary>
-        <release-date>2004-08-13</release-date>
+        <release-date>2004-08-18</release-date>
         <vendor url="mailto:jader@bread.com">Integrated Bakery Resources</vendor>
         <description format="text/plain">Track tasks, estimates and actual progress for a project.  See the &lt;a href=&quot;http://openacs.org/projects/dotwrk/project_management/&quot;&gt;project page&lt;/a&gt; for more information.</description>
 
-        <provides url="project-manager" version="2.15b2"/>
+        <provides url="project-manager" version="2.15b3"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="acs-templating" version="4.6.4"/>
         <requires url="calendar" version="2.0.1"/>
@@ -25,8 +25,8 @@
         <requires url="organizations" version="0.3d"/>
 
         <callbacks>
-            <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
             <callback type="after-instantiate"  proc="pm::install::package_instantiate"/>
+            <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LoggerPrimaryURL"  description="This is the primary logger instance that is linked in to this project-manager instance. Links to this instance are added to 
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.4.2.9 -r1.4.2.10
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	16 Jul 2004 20:59:40 -0000	1.4.2.9
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	19 Aug 2004 00:01:27 -0000	1.4.2.10
@@ -450,6 +450,8 @@
     -title:required
     -description:required
     {-mime_type "text/plain"}
+    {-comment ""}
+    {-comment_type "text/plain"}
     -end_date:required
     -percent_complete:required
     -estimated_hours_work:required
@@ -474,6 +476,9 @@
 
     @param description
 
+    @param comment The comment to send out by email if the task
+    is closed. Otherwise, it is NOT sent out.
+
     @param mime_type
 
     @param end_date
@@ -531,9 +536,15 @@
 
     # if the we've done 100% of the work, then we close the task
     if {$percent_complete >= 100} {
-        pm::task::close -task_item_id $task_item_id
+        pm::task::close \
+            -task_item_id $task_item_id \
+            -comment "$comment" \
+            -comment_type $comment_type
     } else {
-        pm::task::open -task_item_id $task_item_id
+        # does not need comment because that's done later
+        pm::task::open \
+            -task_item_id $task_item_id 
+
     }
 
     return $return_val
@@ -983,6 +994,8 @@
 
 ad_proc -public pm::task::close {
     -task_item_id:required
+    {-comment ""}
+    {-comment_type "text/plain"}
 } {
     Closes a task, and sends notifications, unless it was already 
     closed. If it was already closed, does nothing.
@@ -1118,7 +1131,10 @@
 
         set task_description [ad_html_text_convert -from $mime_type -to "text/plain" -- $task_description]
 
+        set comment [ad_html_text_convert -from $comment_type -to "text/plain" -- $comment]
+
         append notification_text "
+$comment
 -------------
 Task ID:         \#$task_item_id
 Description:     $task_title
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v
diff -u -r1.27.2.7 -r1.27.2.8
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	13 Aug 2004 18:57:34 -0000	1.27.2.7
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	19 Aug 2004 00:01:27 -0000	1.27.2.8
@@ -1117,6 +1117,8 @@
                                   -title $p_task_title \
                                   -description $p_description \
                                   -mime_type $p_mime_type \
+                                  -comment $p_comment \
+                                  -comment_type $p_comment_type \
                                   -end_date "[set end_date_[set i]]" \
                                   -percent_complete $p_percent \
                                   -estimated_hours_work $p_work \
Index: openacs-4/contrib/packages/project-manager/www/task-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-calendar.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/contrib/packages/project-manager/www/task-calendar.tcl	13 Aug 2004 18:57:34 -0000	1.1.2.2
+++ openacs-4/contrib/packages/project-manager/www/task-calendar.tcl	19 Aug 2004 00:01:27 -0000	1.1.2.3
@@ -47,7 +47,7 @@
 }
 
 .calendar-item strong {
-    color: red;
+    color: \#f99;
 }
 
 .calendar-item strike {