Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp 11 Apr 2005 19:00:53 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp 25 Apr 2005 13:36:20 -0000 1.3 @@ -35,9 +35,17 @@ <blockquote> <if @items.presentation_type@ ne fitb>@items.title;noquote@<br></if> <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb> - <formgroup id="response_to_item.@items.as_item_id@"> - @formgroup.widget;noquote@ @formgroup.label;noquote@<br> - </formgroup> + <if @items.choice_orientation@ ne horizontal> + <formgroup id="response_to_item.@items.as_item_id@"> + @formgroup.widget;noquote@ @formgroup.label;noquote@<br> + </formgroup> + </if> + <else> + <formgroup id="response_to_item.@items.as_item_id@"> + @formgroup.widget;noquote@ @formgroup.label;noquote@ + </formgroup> + <br> + </else> </if> <elseif @items.presentation_type@ eq fitb> @items.html;noquote@ Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl 11 Apr 2005 19:00:48 -0000 1.4 +++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl 25 Apr 2005 13:36:20 -0000 1.5 @@ -75,11 +75,21 @@ {section_id:text(hidden) {value $section_id}} } -db_multirow -extend { presentation_type html } items items {} { +db_multirow -extend { presentation_type html choice_orientation } items items {} { set presentation_type [as::item_form::add_item_to_form -name show_items -section_id $section_id -item_id $as_item_id] if {$presentation_type == "fitb"} { regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html } + if {$presentation_type == "rb" || $presentation_type == "cb"} { + array set item [as::item::item_data -as_item_id $as_item_id] + array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)] + set choice_orientation $type(choice_orientation) + array unset type + array unset item + } else { + set choice_orientation "" + } + if {[empty_string_p $points]} { set points 0 }