Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	22 Aug 2006 13:48:30 -0000	1.10
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	20 Oct 2006 18:02:42 -0000	1.11
@@ -58,7 +58,6 @@
 if { $type > 1} {
 ad_form -extend -name item_add -form {
     {content:file,optional {label "[_ assessment.item_Content]"} {help_text "[_ assessment.item_Content_help]"}}
-    {subtext:text,optional {label "[_ assessment.Subtext]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.item_Subtext_help]"}}
     {field_name:text,optional,nospell {label "[_ assessment.Field_Name]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.Field_Name_help]"}}
     {field_code:text,optional,nospell {label "[_ assessment.Field_Code]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.Field_Code_help]"}}
 }
@@ -67,16 +66,15 @@
 }
 if { $type > 1} {
 ad_form -extend -name item_add -form {
-    {feedback_right:text(textarea),optional {label "[_ assessment.Feedback_right]"} {html {rows 5 cols 80}} {help_text "[_ assessment.Feedback_right_help]"}}
-    {feedback_wrong:text(textarea),optional {label "[_ assessment.Feedback_wrong]"} {html {rows 5 cols 80}} {help_text "[_ assessment.Feedback_wrong_help]"}}
+    {feedback_right:richtext,optional {label "[_ assessment.Feedback_right]"} {html {rows 5 cols 80}} {help_text "[_ assessment.Feedback_right_help]"}}
+    {feedback_wrong:richtext,optional {label "[_ assessment.Feedback_wrong]"} {html {rows 5 cols 80}} {help_text "[_ assessment.Feedback_wrong_help]"}}
     {max_time_to_complete:integer,optional,nospell {label "[_ assessment.time_for_completion]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.item_time_help]"}}
     {points:integer,optional,nospell {label "[_ assessment.points_item]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.points_item_help]"}}
 }
 } else {
 ad_form -extend -name item_add -form {
     {description:text(hidden) {value ""}}
     {content:text(hidden) {value ""}}
-    {subtext:text(hidden) {value ""}}
     {field_name:text,optional,nospell {label "[_ assessment.Field_Name]"} {html {size 80 maxlength 500}} {help_text "[_ assessment.Field_Name_help]"}}
     {field_code:text(hidden) {value ""}}
     {feedback_right:text(hidden) {value ""}}
@@ -100,7 +98,6 @@
     set name ""
     set question_text ""
     set description ""
-    set subtext ""
     set field_name ""
     set field_code ""
     set required_p t
@@ -136,7 +133,6 @@
 				-item_item_id $as_item_id \
 				-title $question_text \
 				-description $description \
-				-subtext $subtext \
 				-field_name $field_name \
 				-field_code $field_code \
 				-required_p $required_p \
@@ -151,7 +147,6 @@
 				-as_item_id $as_item_id \
 				-title $question_text \
 				-description $description \
-				-subtext $subtext \
 				-field_name $field_name \
 				-field_code $field_code \
 				-required_p $required_p \
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	3 Sep 2006 17:00:20 -0000	1.9
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	20 Oct 2006 18:02:42 -0000	1.10
@@ -36,8 +36,9 @@
 if {[string eq $display_type "_f"]} {
     set display_type f
 }
-
+set question_text [list $title text/html]
 ad_form -name item_edit -mode display -action item-edit-general -export { assessment_id section_id as_item_id } -form {
+    {question_text:richtext {label "[_ assessment.Question]"} {html {rows 3 cols 80}} {value $question_text} {help_text "[_ assessment.item_Question_help]"}}
     {description:text(textarea) {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {value $description} {help_text "[_ assessment.item_Description_help]"}}
 }
 
@@ -62,10 +63,6 @@
     }
 }
 
-ad_form -extend -name item_edit -form {
-    {title:text(textarea) {label "[_ assessment.Title]"} {html {rows 3 cols 80}} {value $title} {help_text "[_ assessment.item_Title_help]"}}
-}
-
 if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
     category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $as_item_id -form_name item_edit
 }
@@ -75,8 +72,8 @@
     {field_name:text,optional {label "[_ assessment.Field_Name]"} {html {size 80 maxlength 500}} {value $field_name} {help_text "[_ assessment.Field_Name_help]"}}
     {field_code:text,optional {label "[_ assessment.Field_Code]"} {html {size 80 maxlength 500}} {value $field_code} {help_text "[_ assessment.Field_Code_help]"}}
     {required_p:text(select) {label "[_ assessment.Required]"} {options $boolean_options} {value $required_p} {help_text "[_ assessment.item_Required_help]"}}
-    {feedback_right:text(textarea),optional {label "[_ assessment.Feedback_right]"} {html {rows 5 cols 80}} {value $feedback_right} {help_text "[_ assessment.Feedback_right_help]"}}
-    {feedback_wrong:text(textarea),optional {label "[_ assessment.Feedback_wrong]"} {html {rows 5 cols 80}} {value $feedback_wrong} {help_text "[_ assessment.Feedback_wrong_help]"}}
+    {feedback_right:richtext,optional {label "[_ assessment.Feedback_right]"} {html {rows 5 cols 80}} {value $feedback_right} {help_text "[_ assessment.Feedback_right_help]"}}
+    {feedback_wrong:richtext,optional {label "[_ assessment.Feedback_wrong]"} {html {rows 5 cols 80}} {value $feedback_wrong} {help_text "[_ assessment.Feedback_wrong_help]"}}
     {max_time_to_complete:integer,optional {label "[_ assessment.time_for_completion]"} {html {size 10 maxlength 10}} {value $max_time_to_complete} {help_text "[_ assessment.item_time_help]"}}
     {points:integer,optional {label "[_ assessment.points_item]"} {html {size 10 maxlength 10}} {value $points} {help_text "[_ assessment.points_item_help]"}}
     {data_type:text {label "[_ assessment.Data_Type]"} {html {size 20 maxlength 20}} {value "[_ assessment.data_type_$data_type]"} {help_text "[_ assessment.Data_Type_help]"}}