Index: openacs-4/packages/static-portlet/www/element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/static-portlet/www/element.tcl	13 Jan 2005 13:58:43 -0000	1.13
+++ openacs-4/packages/static-portlet/www/element.tcl	8 Aug 2006 21:27:12 -0000	1.14
@@ -53,7 +53,7 @@
 ad_form -name static_element -form {
     element_content_id:key
     {pretty_name:text(text)     {label "[_ static-portlet.Name]"} {html {size 60}}}
-    {content:richtext(richtext)     {label "[_ static-portlet.Content]"} {html {rows 15 cols 80 wrap soft}} {htmlarea_p 1}}
+    {content:richtext(richtext)     {label "[_ static-portlet.Content]"} {html {rows 15 cols 80 wrap soft}}}
 }
 
 if {[lsearch $templates $type] >= 0} {
@@ -70,23 +70,22 @@
     {package_id:text(hidden)    {value $package_id}}
     {referer:text(hidden)       {value $referer}}
 } -edit_request {
-  db_1row get_content_element ""
-  ad_set_form_values pretty_name
+    db_1row get_content_element ""
+    set content [template::util::richtext::create $body $format]
+    ad_set_form_values pretty_name
 } -new_data {
     db_transaction {
+       
         set item_id [static_portal_content::new \
                          -package_id $package_id  \
-                         -content $content \
-                         -pretty_name $pretty_name
-        ]
-
+                         -content [template::util::richtext::get_property contents $content] \
+                         -format [template::util::richtext::get_property format $content] \
+		         -pretty_name $pretty_name]
+	
         set old_element_id [static_portal_content::add_to_portal \
 				-portal_id $portal_id \
 				-package_id $package_id \
 				-content_id $item_id]
-
-
-
     }
 
     # support for templates & already created portals for users,
@@ -114,16 +113,19 @@
 	    # clone the template's content
 	    set new_content_id [static_portal_content::new \
 				    -package_id $community_id \
-				    -content $content \
-				    -pretty_name $pretty_name ]
+				    -content [template::util::richtext::get_property contents $content] \
+				    -format [template::util::richtext::get_property format $content] \
+                                    -pretty_name $pretty_name ]
 	}
 	
 
 	set new_element_id [ static_portal_content::add_to_portal \
 				 -portal_id $target_portal_id \
 				 -package_id $community_id \
 				 -content_id $new_content_id]
+                 
 
+
 	portal::set_element_param $new_element_id "package_id" $community_id
 	portal::set_element_param $new_element_id "content_id" $new_content_id
 
@@ -133,7 +135,6 @@
 
     }
 
-
     # redirect and abort
     ad_returnredirect $referer
     ad_script_abort
@@ -144,9 +145,9 @@
         static_portal_content::update \
                 -portal_id $portal_id \
                 -content_id $element_content_id \
-                -pretty_name $pretty_name \
-                -content $content
-
+	        -pretty_name $pretty_name \
+	        -content [template::util::richtext::get_property contents $content] \
+		-format [template::util::richtext::get_property format $content]
     }
 
 
@@ -189,8 +190,9 @@
 		# clone the template's content
 		set element_content_id [static_portal_content::new \
 					    -package_id $community_id \
-					    -content $content \
-					    -pretty_name $pretty_name ]
+					    -content [template::util::richtext::get_property contents $content] \
+					    -format [template::util::richtext::get_property format $content] \
+                                            -pretty_name $pretty_name ]
 	    }
 
 	    set new_element_id [ static_portal_content::add_to_portal \
@@ -209,7 +211,8 @@
 		-portal_id $target_portal_id \
 		-content_id $element_content_id \
 		-pretty_name $pretty_name \
-		-content $content
+		-content [template::util::richtext::get_property contents $content] \
+		-format [template::util::richtext::get_property format $content]
 	}
 
 	if {$enforce_portlet == 0} {
@@ -220,7 +223,6 @@
 
     }
     
-
     # redirect and abort
     ad_returnredirect $referer
     ad_script_abort
@@ -232,6 +234,9 @@
     file_content_id:key
     {pretty_name:text(text)     {label "[_ static-portlet.Name]"} {html {size 60}}}
     {upload_file:file           {label "[_ static-portlet.File]"}}
+    {content_format:text(select) {label "Format"} 
+	{options { {"Enhanced Text" "text/enhanced"} {"Plain Text" "text/plain"} {"Fixed-width Text" "text/fixed-width"} { "HTML" "text/html"} }} 
+	{value "text/plain"}}
 }
 
 if {[lsearch $templates $type] >= 0} {
@@ -268,7 +273,8 @@
         set item_id [static_portal_content::new \
                          -package_id $package_id  \
                          -content $content \
-                         -pretty_name $pretty_name
+			 -format $content_format \
+		         -pretty_name $pretty_name
         ]
 
         static_portal_content::add_to_portal \
@@ -304,6 +310,7 @@
 	    set new_content_id [static_portal_content::new \
 				    -package_id $community_id \
 				    -content $content \
+				    -format $content_format \
 				    -pretty_name $pretty_name ]
 	}
 
@@ -344,7 +351,8 @@
                 -portal_id $portal_id \
                 -content_id $file_content_id \
                 -pretty_name $pretty_name \
-                -content $content
+	        -content $content \
+	        -format $content_format
     }
 
     switch $type {
@@ -388,7 +396,8 @@
 		set file_content_id [static_portal_content::new \
 					    -package_id $community_id \
 					    -content $content \
-					    -pretty_name $pretty_name ]
+					    -format $content_format \
+                                            -pretty_name $pretty_name ]
 	    }
 
 	    set new_element_id [ static_portal_content::add_to_portal \
@@ -407,7 +416,8 @@
 		-portal_id $target_portal_id \
 		-content_id $file_content_id \
 		-pretty_name $pretty_name \
-		-content $content
+		-content $content \
+		-format $content_format
 	}
 
 	if {$enforce_portlet == 0} {