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.19 -r1.20
--- openacs-4/packages/static-portlet/www/element.tcl	7 Aug 2017 23:48:29 -0000	1.19
+++ openacs-4/packages/static-portlet/www/element.tcl	17 Oct 2017 14:20:50 -0000	1.20
@@ -228,18 +228,23 @@
     ad_script_abort
 }
 
-
-
 ad_form -name static_file -html {enctype multipart/form-data} -form {
     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"}}
+    {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 [template::util::richtext::format_options]}
+        {value "text/plain"}
+    }
 }
 
-if {[lsearch $templates $type] >= 0} {
+if {$type in $templates} {
     set elements [list \
 		      [list {enforce_portlet:text(select)} [list label [_ static-portlet.lt_Enforce_this_applet_t]] \
 			   [list help_text [_ static-portlet.lt_Enforce_True_means_th]] \