Index: openacs-4/packages/assessment/www/asm-admin/item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.adp,v
diff -u -r1.2.6.2 -r1.2.6.3
--- openacs-4/packages/assessment/www/asm-admin/item-add.adp	5 Feb 2007 14:15:04 -0000	1.2.6.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add.adp	5 Feb 2007 19:54:42 -0000	1.2.6.3
@@ -177,11 +177,11 @@
               </span>
             </formerror>
 
-<div style="float:right">        <fieldset>
+<div style="float:right; width: 40%;">        <fieldset>
         <legend>Multiple Choice</legend>
 <p class="form-help-text">       #assessment.item_type_multiple_choice_help#</p>
         <formgroup-widget id="item_type" row=2></formgroup-widget><br />
-        <formgroup-widget id="item_type" row=5></formgroup-widget><formwidget id="ms_label">
+        <formgroup-widget id="item_type" row=5></formgroup-widget>
            
        <p><span class="form-label">Correct<br>Answer</span><br>
         <multiple name="choice_elements">
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 -r1.13.2.3 -r1.13.2.4
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	24 Jan 2007 21:58:15 -0000	1.13.2.3
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	5 Feb 2007 19:54:42 -0000	1.13.2.4
@@ -107,7 +107,6 @@
 ##############################################################################
 
 ad_form -extend -name item-add -form {
-    {ms_label:text,optional}
     {add_another_choice:text(submit) {label "[_ assessment.Add_another_choice]"}}
 }
 if {[template::form::is_submission item-add] \
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp,v
diff -u -r1.2.6.1 -r1.2.6.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	5 Feb 2007 14:15:04 -0000	1.2.6.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.adp	5 Feb 2007 19:54:42 -0000	1.2.6.2
@@ -1,7 +1,7 @@
 <master>
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
-
+<h1>@display_type@</h1>
 <formtemplate id="item_edit_general">
   <formwidget id="__confirmed_p"><formwidget id="__refreshing_p"><formwidget id="assessment_id"><formwidget id="section_id"><formwidget id="__key_signature"><formwidget id="__new_p"><formwidget id="as_item_id">
       <br/>
@@ -199,8 +199,7 @@
 <switch @item_type@>
 <case value="mc">
 <formwidget id="num_choices">
-<formwidget id="ms_label">
-          
+         
        <p><span class="form-label">Correct<br>Answer</span><br>
         <multiple name="choice_elements">
     
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v
diff -u -r1.15.2.2 -r1.15.2.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	5 Feb 2007 14:15:04 -0000	1.15.2.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	5 Feb 2007 19:54:42 -0000	1.15.2.3
@@ -37,6 +37,8 @@
 set type $assessment_data(type)
 
 set item_type [string range [db_string get_item_type {}] end-1 end]
+set display_type [string range [db_string get_display_type {}] end-1 end]
+
 set display_types [list]
 foreach display_type [db_list display_types {}] {
     lappend display_types [list "[_ assessment.item_display_$display_type]" $display_type]
@@ -81,7 +83,6 @@
     "mc" {
     ad_form -extend -name item_edit_general -form {
         {num_choices:text(hidden)}
-        {ms_label:text,optional}
         {add_another_choice:text(submit) {label "[_ assessment.Add_another_choice]"}}
     }
 ns_log notice "Add Another = '[template::element::get_value item_edit_general add_another_choice]'"
@@ -94,6 +95,11 @@
     } 
 
 #####
+	if {$display_type eq "cb"} {
+	    ad_form -extend -name item_edit_general -form {
+		{ms_label:text,optional {label "Multiple Selection Instruction"}}		
+	    }
+	}
 #####
     set as_item_type_id [as::item::get_item_type_id -as_item_id $as_item_id]
     if {[array exists move_up]} {
@@ -195,7 +201,6 @@
 	set data_type varchar
     }
     set data_type_disp "[_ assessment.data_type_$data_type]" 
-    set display_type [string range [db_string get_display_type {}] end-1 end]
     set question_text [template::util::richtext::create $question_text $mime_type]
 
     set feedback_right [template::util::richtext::create $feedback_right $mime_type]