Index: openacs-4/packages/project-manager/templates/project-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/project-manager/templates/project-ae.tcl	11 Dec 2006 18:30:54 -0000	1.11
+++ openacs-4/packages/project-manager/templates/project-ae.tcl	22 Jan 2007 16:05:20 -0000	1.12
@@ -94,8 +94,8 @@
         {description:richtext(richtext),optional
             {label "[_ project-manager.Description]"}
             {value $description}
-            {html { rows 5 cols 40 wrap soft}}}
-        
+            {html {cols 80 wrap soft}}
+	}
     }
 
 
Index: openacs-4/packages/project-manager/templates/project-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/project-manager/templates/project-one.adp	10 Aug 2006 09:18:09 -0000	1.18
+++ openacs-4/packages/project-manager/templates/project-one.adp	22 Jan 2007 16:05:20 -0000	1.19
@@ -39,6 +39,16 @@
       />
     <p />
   </if>
+    <include
+      src="/packages/project-manager/lib/logger-portlet"
+      project_item_id="@project_item_id@"
+      return_url="@return_url@"
+      master="@portlet_master@"
+      logger_project="@project.logger_project@"
+      logger_days="@logger_days@"
+      return_url="@return_url;noquote@"
+      pm_url="@package_url;noquote@" />
+    <p />
 </td>
 <td valign="top">
     <include
@@ -59,27 +69,19 @@
     folder_id="@folder_id@" />
 	<p />
   </if>
-  <include
-    src="/packages/project-manager/lib/comments-portlet"
-    project_id="@project_id@"
-    project_item_id="@project_item_id@"
-    return_url="@return_url@" />
 <p /> 
-    <include
-      src="/packages/project-manager/lib/logger-portlet"
-      project_item_id="@project_item_id@"
-      return_url="@return_url@"
-      master="@portlet_master@"
-      logger_project="@project.logger_project@"
-      logger_days="@logger_days@"
-      return_url="@return_url;noquote@"
-      pm_url="@package_url;noquote@" />
-    <p />
         <if @forum_id@ ge 0>
           <include
             src="/packages/project-manager/lib/forums-portlet"
             forum_id="@forum_id@" />
         </if>
+	<else>
+	  <include
+	    src="/packages/project-manager/lib/comments-portlet"
+	    project_id="@project_id@"
+    project_item_id="@project_item_id@"
+    return_url="@return_url@" />
+</else>
         <p />
 </td>
 </tr>
Index: openacs-4/packages/project-manager/templates/task-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/project-manager/templates/task-ae.tcl	11 Dec 2006 17:34:58 -0000	1.13
+++ openacs-4/packages/project-manager/templates/task-ae.tcl	22 Jan 2007 16:05:20 -0000	1.14
@@ -133,8 +133,8 @@
             {html {size 40}}
         }
         
-        {description:text(textarea),optional
-            {label "[_ project-manager.Description_1]"}
+        {description:richtext(richtext),optional
+            {label "[_ project-manager.Task_description]"}
             {html { rows 14 cols 40 wrap soft}}
 	}
         
@@ -429,8 +429,7 @@
 ad_form -extend -name task_add_edit -new_request {
     set send_email_p t
     set task_title ""
-    set description ""
-    set description_mime_type "text/plain"
+    set description  [template::util::richtext::create "" "text/html"]
     set estimated_hours_work 0
     set estimated_hours_work_min 0
     set estimated_hours_work_max 0
@@ -442,7 +441,9 @@
     set priority 0
 } -edit_request {
     db_1row get_task_data {}
-    
+
+    set description [template::util::richtext::create $description_content $description_mime_type]
+
     set task_end_time [template::util::date::from_ansi $task_end_date [lc_get frombuilder_time_format]]
     set task_end_date [lindex $task_end_date 0]
 
@@ -464,6 +465,9 @@
 
     ad_page_contract_filter_proc_date end_date end_date
 
+    set description_content [template::util::richtext::get_property content $description]
+    set description_format [template::util::richtext::get_property format $description]
+
     set task_end_date_list [split $end_date(date) "-"]
     append task_end_date_list " [lrange $task_end_time 3 5]"
     
@@ -537,7 +541,7 @@
 			 -object_id $task_id \
 			 -form task_add_edit \
 			 -cr_widget none \
-			 -defaults [list title $task_title description $description mime_type $description_mime_type context_id $project_item_id parent_id $project_item_id object_type pm_task] \
+			 -defaults [list title $task_title description $description_content mime_type $description_format context_id $project_item_id parent_id $project_item_id object_type pm_task] \
 			 -default_fields {percent_complete {end_date $end_date_sql} estimated_hours_work estimated_hours_work_min estimated_hours_work_max priority dform} \
 			 -exclude_static]
 
@@ -632,7 +636,7 @@
 			 -object_id $task_id \
 			 -form task_add_edit \
 			 -cr_widget none \
-			 -defaults [list title $task_title description $description mime_type $description_mime_type context_id $project_item_id parent_id $project_item_id object_type pm_task] \
+			 -defaults [list title $task_title description $description_content mime_type $description_format context_id $project_item_id parent_id $project_item_id object_type pm_task] \
 			 -default_fields {percent_complete {end_date $end_date_sql} estimated_hours_work estimated_hours_work_min estimated_hours_work_max priority dform} \
 			 -exclude_static]
 
Index: openacs-4/packages/project-manager/templates/task-ae.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-ae.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/templates/task-ae.xql	11 Dec 2006 17:34:58 -0000	1.4
+++ openacs-4/packages/project-manager/templates/task-ae.xql	22 Jan 2007 16:05:20 -0000	1.5
@@ -20,7 +20,7 @@
 
   <fullquery name="get_task_data">
     <querytext>
-	select title as task_title, description, mime_type as description_mime_type,
+	select title as task_title, description as description_content, mime_type as description_mime_type,
 	       percent_complete, to_char(end_date,'YYYY-MM-DD HH24:MI:SS') as task_end_date,
 	       estimated_hours_work, estimated_hours_work_min,
 	       estimated_hours_work_max, priority