Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	24 Mar 2005 15:21:41 -0000	1.40
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	29 Mar 2005 10:53:34 -0000	1.41
@@ -24,6 +24,7 @@
   <msg key="add_item_display_tb">Add new question: Textbox Display</msg>
   <msg key="add_item_type_mc">Add new question: Multiple Choice</msg>
   <msg key="add_item_type_mc_choices">Add new question: Multiple Choices</msg>
+  <msg key="add_item_type_mc_existing">Add existing choice set</msg>
   <msg key="add_item_type_oq">Add new question: Open Question</msg>
   <msg key="add_item_type_sa">Add new question: Short Answer</msg>
   <msg key="Add_Items">Add items to section</msg>
@@ -416,6 +417,7 @@
   <msg key="section_num_Items">Number of questions per page</msg>
   <msg key="Section_Order">Order of questions</msg>
   <msg key="section_order_help">In which order will the questions be displayed in this section.</msg>
+  <msg key="section_preview">Preview Section</msg>
   <msg key="section_Required_help">Is this section required in display?&lt;br&gt;
 Only useful if you display less than the total number of sections.</msg>
   <msg key="section_select">Section Select</msg>
Index: openacs-4/packages/assessment/lib/item-show-display-cb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-cb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-cb.tcl	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-cb.tcl	29 Mar 2005 10:53:34 -0000	1.2
@@ -6,7 +6,5 @@
 ad_form -name item_show_display_cb -mode display -action item-edit-display-cb -export { assessment_id section_id as_item_id } -form {
     {html_options:text,optional {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {value $html_display_options} {help_text "[_ assessment.Html_Options_help]"}}
     {choice_orientation:text {label "[_ assessment.Choice_Orientation]"} {value "[_ assessment.$choice_orientation]"} {help_text "[_ assessment.Choice_Orientation_help]"}}
-    {label_orientation:text {label "[_ assessment.Label_Orientation]"} {value "[_ assessment.$choice_label_orientation]"} {help_text "[_ assessment.Label_Orientation_help]"}}
     {order_type:text {label "[_ assessment.Order_Type]"} {value "[_ assessment.$sort_order_type]"} {help_text "[_ assessment.Order_Type_help]"}}
-    {answer_alignment:text {label "[_ assessment.Answer_Alignment]"} {value "[_ assessment.$item_answer_alignment]"} {help_text "[_ assessment.Answer_Alignment_help]"}}
 }
Index: openacs-4/packages/assessment/lib/item-show-display-rb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-rb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-rb.tcl	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-rb.tcl	29 Mar 2005 10:53:34 -0000	1.2
@@ -6,7 +6,8 @@
 ad_form -name item_show_display_rb -mode display -action item-edit-display-rb -export { assessment_id section_id as_item_id } -form {
     {html_options:text,optional {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {value $html_display_options} {help_text "[_ assessment.Html_Options_help]"}}
     {choice_orientation:text {label "[_ assessment.Choice_Orientation]"} {value "[_ assessment.$choice_orientation]"} {help_text "[_ assessment.Choice_Orientation_help]"}}
-    {label_orientation:text {label "[_ assessment.Label_Orientation]"} {value "[_ assessment.$choice_label_orientation]"} {help_text "[_ assessment.Label_Orientation_help]"}}
     {order_type:text {label "[_ assessment.Order_Type]"} {value "[_ assessment.$sort_order_type]"} {help_text "[_ assessment.Order_Type_help]"}}
-    {answer_alignment:text {label "[_ assessment.Answer_Alignment]"} {value "[_ assessment.$item_answer_alignment]"} {help_text "[_ assessment.Answer_Alignment_help]"}}
 }
+
+##     {label_orientation:text {label "[_ assessment.Label_Orientation]"} {value "[_ assessment.$choice_label_orientation]"} {help_text "[_ assessment.Label_Orientation_help]"}}
+##     {answer_alignment:text {label "[_ assessment.Answer_Alignment]"} {value "[_ assessment.$item_answer_alignment]"} {help_text "[_ assessment.Answer_Alignment_help]"}}
Index: openacs-4/packages/assessment/lib/item-show-display-sb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/item-show-display-sb.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/lib/item-show-display-sb.tcl	8 Dec 2004 15:30:32 -0000	1.1
+++ openacs-4/packages/assessment/lib/item-show-display-sb.tcl	29 Mar 2005 10:53:34 -0000	1.2
@@ -7,7 +7,5 @@
 ad_form -name item_show_display_sb -mode display -action item-edit-display-sb -export { assessment_id section_id as_item_id } -form {
     {html_options:text,optional {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {value $html_display_options} {help_text "[_ assessment.Html_Options_help]"}}
     {multiple_p:text(select) {label "[_ assessment.Multiple]"} {options $boolean_options} {value $multiple_p} {help_text "[_ assessment.Multiple_help]"}}
-    {label_orientation:text {label "[_ assessment.Label_Orientation]"} {value "[_ assessment.$choice_label_orientation]"} {help_text "[_ assessment.Label_Orientation_help]"}}
     {order_type:text {label "[_ assessment.Order_Type]"} {value "[_ assessment.$sort_order_type]"} {help_text "[_ assessment.Order_Type_help]"}}
-    {answer_alignment:text {label "[_ assessment.Answer_Alignment]"} {value "[_ assessment.$item_answer_alignment]"} {help_text "[_ assessment.Answer_Alignment_help]"}}
 }
Index: openacs-4/packages/assessment/tcl/as-assessment-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-assessment-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/assessment/tcl/as-assessment-procs.tcl	21 Feb 2005 14:32:56 -0000	1.19
+++ openacs-4/packages/assessment/tcl/as-assessment-procs.tcl	29 Mar 2005 10:53:35 -0000	1.20
@@ -513,6 +513,7 @@
     Quotes a string for csv export
 } {
     regsub -all {;} $text {,,} text
+    regsub -all "\n" $text {} text
     return $text
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -53,9 +53,9 @@
     {as_item_id:key}
     {html_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {choice_orientation:text(select) {label "[_ assessment.Choice_Orientation]"} {options $choice_or_types} {help_text "[_ assessment.Choice_Orientation_help]"}}
-    {label_orientation:text(select) {label "[_ assessment.Label_Orientation]"} {options $label_or_types} {help_text "[_ assessment.Label_Orientation_help]"}}
+    {label_orientation:text(hidden)}
     {order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}}
-    {answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {answer_alignment:text(hidden)}
 } -edit_request {
     set html_options ""
     set choice_orientation "vertical"
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -53,9 +53,9 @@
     {as_item_id:key}
     {html_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {choice_orientation:text(select) {label "[_ assessment.Choice_Orientation]"} {options $choice_or_types} {help_text "[_ assessment.Choice_Orientation_help]"}}
-    {label_orientation:text(select) {label "[_ assessment.Label_Orientation]"} {options $label_or_types} {help_text "[_ assessment.Label_Orientation_help]"}}
+    {label_orientation:text(hidden)}
     {order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}}
-    {answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {answer_alignment:text(hidden)}
 } -edit_request {
     set html_options ""
     set choice_orientation "vertical"
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -49,9 +49,9 @@
     {as_item_id:key}
     {html_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {multiple_p:text(select) {label "[_ assessment.Multiple]"} {options $boolean_options} {help_text "[_ assessment.Multiple_help]"}}
-    {label_orientation:text(select) {label "[_ assessment.Label_Orientation]"} {options $label_or_types} {help_text "[_ assessment.Label_Orientation_help]"}}
+    {label_orientation:text(hidden)}
     {order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}}
-    {answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {answer_alignment:text(hidden)}
 } -edit_request {
     set html_options ""
     set multiple_p f
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -39,7 +39,7 @@
     {as_item_id:key}
     {html_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {abs_size:text,nospell {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.Absolute_Size_help]"}}
-    {answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {answer_alignment:text(hidden)}
 } -edit_request {
     set html_options ""
     set abs_size 1000
Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -39,7 +39,7 @@
     {as_item_id:key}
     {html_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {abs_size:text,nospell {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.Absolute_Size_help]"}}
-    {answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {answer_alignment:text(hidden)}
 } -edit_request {
     set html_options ""
     set abs_size 20
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc.adp	29 Mar 2005 10:53:35 -0000	1.2
@@ -2,6 +2,7 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
+<a href="@add_existing_link@">#assessment.add_item_type_mc_existing#</a>
 <blockquote>
   <formtemplate id="item_add_mc"></formtemplate>
 </blockquote>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc.tcl	15 Mar 2005 22:46:15 -0000	1.5
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc.tcl	29 Mar 2005 10:53:35 -0000	1.6
@@ -34,9 +34,8 @@
 
 set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]]
 set correct_options [list [list "[_ assessment.yes]" t]]
+set add_existing_link [export_vars -base "item-add-mc-existing" {assessment_id section_id as_item_id after}]
 
-set choice_sets [db_list_of_lists existing_choice_sets {}]
-set choice_sets [concat [list [list "" ""]] $choice_sets]
 set display_types [list]
 foreach display_type [db_list display_types {}] {
     lappend display_types [list "[_ assessment.item_display_$display_type]" $display_type]
@@ -51,7 +50,6 @@
     {num_correct_answers:text,optional,nospell {label "[_ assessment.num_Correct_Answer]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.num_Correct_help]"}}
     {num_answers:text,optional,nospell {label "[_ assessment.num_Answers]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.num_Answers_help]"}}
     {display_type:text(select) {label "[_ assessment.Display_Type]"} {options $display_types} {help_text "[_ assessment.Display_Type_help]"}}
-    {mc_id:text(select),optional {label "[_ assessment.Choice_Sets]"} {options $choice_sets} {help_text "[_ assessment.Choice_Sets_help]"}}
 }
 
 # add form entries for each choice
@@ -69,7 +67,9 @@
     } else {
 	append ad_form_code "\{correct.$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $i\"\} \{options \$correct_options\} \{help_text \"[_ assessment.Correct_Answer_help]\"\}\}\n"
     }
-    lappend validate_list "correct.$i {\$count_correct > 0} \"\[_ assessment.one_correct_choice_req\]\""
+    if {[exists_and_not_null num_correct_answers] && $num_correct_answers > 0} {
+	lappend validate_list "correct.$i {\$count_correct > 0} \"\[_ assessment.one_correct_choice_req\]\""
+    }
 }
 append ad_form_code "\}"
 if {[exists_and_not_null mc_id]} {
@@ -99,20 +99,16 @@
 set edit_data "{
     db_transaction {
 	if {!\[db_0or1row item_type {}\] || \$object_type != \"as_item_type_mc\"} {
-	    if {\[empty_string_p \$mc_id\]} {
-		set new_mc_id \[as::item_type_mc::new \\
+	    set mc_id \[as::item_type_mc::new \\
 			   -title \$title \\
 			   -increasing_p \$increasing_p \\
 			   -allow_negative_p \$negative_p \\
 			   -num_correct_answers \$num_correct_answers \\
 			   -num_answers \$num_answers\]
-	    } else {
-		set new_mc_id \$mc_id
-	    }
 	    
 	    if {!\[info exists object_type\]} {
 		# first item type mapped
-		as::item_rels::new -item_rev_id \$as_item_id -target_rev_id \$new_mc_id -type as_item_type_rel
+		as::item_rels::new -item_rev_id \$as_item_id -target_rev_id \$mc_id -type as_item_type_rel
 	    } else {
 		# old item type existing
 		set as_item_id \[as::item::new_revision -as_item_id \$as_item_id\]
@@ -121,27 +117,22 @@
 	} else {
 	    # old mc item type existing
 	    set as_item_id \[as::item::new_revision -as_item_id \$as_item_id\]
-	    if {\[empty_string_p \$mc_id\]} {
-		set new_mc_id \[as::item_type_mc::edit \\
+	    set mc_id \[as::item_type_mc::edit \\
 			   -as_item_type_id \$as_item_type_id \\
 			   -title \$title \\
 			   -increasing_p \$increasing_p \\
 			   -allow_negative_p \$negative_p \\
 			   -num_correct_answers \$num_correct_answers \\
 			   -num_answers \$num_answers\]
-	    } else {
-		set new_mc_id \$mc_id
-	    }
 	    
 	    db_dml update_item_type {}
 	}
 	
 	set count 0
-	if {\[empty_string_p \$mc_id\]} {
-	    foreach i \[lsort -integer \[array names choice\]\] {
-		if {!\[empty_string_p \$choice(\$i)\]} {
-		    incr count
-		    set choice_id \[as::item_choice::new -mc_id \$new_mc_id \\
+	foreach i \[lsort -integer \[array names choice\]\] {
+	    if {!\[empty_string_p \$choice(\$i)\]} {
+		incr count
+		set choice_id \[as::item_choice::new -mc_id \$mc_id \\
 				   -title \$choice(\$i) \\
 				   -numeric_value \"\" \\
 				   -text_value \"\" \\
@@ -151,19 +142,14 @@
 				   -correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] \\
 				   -sort_order \$count \\
 				   -percent_score \"\"\]
-		}
 	    }
 	}
     }
 }"
 
 set after_submit "{
     # now go to form to enter choice-specific data
-    if {\[empty_string_p \$mc_id\]} {
-	ad_returnredirect \[export_vars -base \"item-add-mc-choices\" {assessment_id section_id as_item_id after mc_id display_type}\]
-    } else {
-	ad_returnredirect \[export_vars -base \"item-add-display-\$display_type\" {assessment_id section_id as_item_id after}\]
-    }
+    ad_returnredirect \[export_vars -base \"item-add-mc-choices\" {assessment_id section_id as_item_id after mc_id display_type}\]
     ad_script_abort
 }"
 
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc.xql	11 Mar 2005 18:54:12 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc.xql	29 Mar 2005 10:53:35 -0000	1.3
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="existing_choice_sets">
-      <querytext>
-
-    select r.title, r.revision_id
-    from cr_revisions r, cr_items i
-    where r.revision_id = i.latest_revision
-    and i.parent_id = :folder_id
-    and i.content_type = 'as_item_type_mc'
-
-      </querytext>
-</fullquery>
-
 <fullquery name="display_types">
       <querytext>
 
@@ -39,7 +27,7 @@
       <querytext>
 
 		update as_item_rels
-		set target_rev_id = :new_mc_id
+		set target_rev_id = :mc_id
 		where item_rev_id = :as_item_id
 		and rel_type = 'as_item_type_rel'
 
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl	28 Feb 2005 22:38:33 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl	29 Mar 2005 10:53:35 -0000	1.4
@@ -52,9 +52,9 @@
     {as_item_id:key}
     {html_display_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {choice_orientation:text(select) {label "[_ assessment.Choice_Orientation]"} {options $choice_or_types} {help_text "[_ assessment.Choice_Orientation_help]"}}
-    {choice_label_orientation:text(select) {label "[_ assessment.Label_Orientation]"} {options $label_or_types} {help_text "[_ assessment.Label_Orientation_help]"}}
+    {choice_label_orientation:text(hidden)}
     {sort_order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}}
-    {item_answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {item_answer_alignment:text(hidden)}
     {as_item_display_id:text(hidden)}
 } -edit_request {
     db_1row last_used_display_type {}
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl	28 Feb 2005 22:45:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl	29 Mar 2005 10:53:35 -0000	1.4
@@ -52,9 +52,9 @@
     {as_item_id:key}
     {html_display_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {choice_orientation:text(select) {label "[_ assessment.Choice_Orientation]"} {options $choice_or_types} {help_text "[_ assessment.Choice_Orientation_help]"}}
-    {choice_label_orientation:text(select) {label "[_ assessment.Label_Orientation]"} {options $label_or_types} {help_text "[_ assessment.Label_Orientation_help]"}}
+    {choice_label_orientation:text(hidden)}
     {sort_order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}}
-    {item_answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {item_answer_alignment:text(hidden)}
     {as_item_display_id:text(hidden)}
 } -edit_request {
     db_1row last_used_display_type {}
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl	28 Feb 2005 22:45:51 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl	29 Mar 2005 10:53:35 -0000	1.4
@@ -49,9 +49,9 @@
     {as_item_id:key}
     {html_display_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {multiple_p:text(select) {label "[_ assessment.Multiple]"} {options $boolean_options} {help_text "[_ assessment.Multiple_help]"}}
-    {choice_label_orientation:text(select) {label "[_ assessment.Label_Orientation]"} {options $label_or_types} {help_text "[_ assessment.Label_Orientation_help]"}}
+    {choice_label_orientation:text(hidden)}
     {sort_order_type:text(select) {label "[_ assessment.Order_Type]"} {options $order_types} {help_text "[_ assessment.Order_Type_help]"}}
-    {item_answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {item_answer_alignment:text(hidden)}
     {as_item_display_id:text(hidden)}
 } -edit_request {
     db_1row last_used_display_type {}
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -37,7 +37,7 @@
     {as_item_id:key}
     {html_display_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {abs_size:text,nospell {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.Absolute_Size_help]"}}
-    {item_answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {item_answer_alignment:text(hidden)}
     {as_item_display_id:text(hidden)}
 } -edit_request {
     db_1row last_used_display_type {}
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -37,7 +37,7 @@
     {as_item_id:key}
     {html_display_options:text,optional,nospell {label "[_ assessment.Html_Options]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.Html_Options_help]"}}
     {abs_size:text,nospell {label "[_ assessment.Absolute_Size]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.Absolute_Size_help]"}}
-    {item_answer_alignment:text(select) {label "[_ assessment.Answer_Alignment]"} {options $alignment_types} {help_text "[_ assessment.Answer_Alignment_help]"}}
+    {item_answer_alignment:text(hidden)}
     {as_item_display_id:text(hidden)}
 } -edit_request {
     db_1row last_used_display_type {}
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.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	28 Feb 2005 22:30:39 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	29 Mar 2005 10:53:35 -0000	1.4
@@ -40,7 +40,7 @@
 ad_form -name item_edit_general -action item-edit-general -export { assessment_id section_id } -html {enctype multipart/form-data} -form {
     {as_item_id:key}
     {name:text(inform),nospell {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.item_Name_help]"}}
-    {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.item_Title_help]"}}
+    {title:text(textarea) {label "[_ assessment.Title]"} {html {rows 3 cols 80}} {help_text "[_ assessment.item_Title_help]"}}
     {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}}
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.adp	29 Mar 2005 10:53:35 -0000	1.2
@@ -9,3 +9,5 @@
 <include src="/packages/assessment/lib/item-show-@item_type@" assessment_id="@assessment_id@" section_id="@section_id@" as_item_id="@as_item_id@">
 
 <include src="/packages/assessment/lib/item-show-display-@display_type@" assessment_id="@assessment_id@" section_id="@section_id@" as_item_id="@as_item_id@">
+
+<a href="one-a?assessment_id=@assessment_id@">@assessment_data.title@</a>
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 -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -36,7 +36,7 @@
 
 ad_form -name item_edit -mode display -action item-edit-general -export { assessment_id section_id as_item_id } -form {
     {name:text {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {value $name} {help_text "[_ assessment.item_Name_help]"}}
-    {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {value $title} {help_text "[_ assessment.item_Title_help]"}}
+    {title:text(textarea) {label "[_ assessment.Title]"} {html {rows 3 cols 80}} {value $title} {help_text "[_ assessment.item_Title_help]"}}
     {description:text(textarea) {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {value $description} {help_text "[_ assessment.item_Description_help]"}}
 }
 
Index: openacs-4/packages/assessment/www/asm-admin/one-a.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/one-a.adp	24 Mar 2005 15:21:41 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/one-a.adp	29 Mar 2005 10:53:35 -0000	1.4
@@ -22,7 +22,7 @@
 	<a href="../sessions?assessment_id=@assessment_id@">#assessment.All#</a> |
 	<a href="results-users?assessment_id=@assessment_id@">#assessment.By_user#</a> |
 <!--	<a href="results-summary?assessment_id=@assessment_id@">#assessment.Summary#</a> | -->
-	<if @assessment_data.anonymous_p@>#assessment.CSV_file#</if><else><a href="results-export?assessment_id=@assessment_id@">#assessment.CSV_file#</a></else></td>
+	<a href="results-export?assessment_id=@assessment_id@">#assessment.CSV_file#</a></td>
 </tr>
 <!--
 <tr class="odd">
@@ -106,9 +106,10 @@
 
 <if @sections.display_type_id@ not nil><a href="section-display-form?assessment_id=@assessment_id@&section_id=@sections.section_id@&display_type_id=@sections.display_type_id@">#assessment.edit_section_display#</a></if>
 
-<a
-href="checks-admin?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.admin_triggers#</a>
+<a href="section-preview?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.section_preview#</a>
 
+<a href="checks-admin?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.admin_triggers#</a>
+
 <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
 
 <if @sections.rownum@ lt @sections:rowcount@>
Index: openacs-4/packages/assessment/www/asm-admin/results-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-export.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/results-export.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/results-export.tcl	29 Mar 2005 10:53:35 -0000	1.3
@@ -46,7 +46,11 @@
 	if {$column_format == "name"} {
 	    lappend csv_first_row [as::assessment::quote_export -text $name]
 	} else {
-	    lappend csv_first_row [as::assessment::quote_export -text $title]
+	    if {[empty_string_p $description]} {
+		lappend csv_first_row [as::assessment::quote_export -text $title]
+	    } else {
+		lappend csv_first_row [as::assessment::quote_export -text "$title / $description"]
+	    }
 	}
     }
     
Index: openacs-4/packages/assessment/www/asm-admin/results-export.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-export.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/results-export.xql	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/results-export.xql	29 Mar 2005 10:53:35 -0000	1.2
@@ -4,8 +4,8 @@
 <fullquery name="all_items">
       <querytext>
 
-	select ci.name, cr.title, o.object_type, i.data_type, ci.item_id as as_item_item_id,
-	       rs.item_id as section_item_id
+	select ci.name, cr.title, cr.description, o.object_type, i.data_type,
+	       ci.item_id as as_item_item_id, rs.item_id as section_item_id
 	from as_assessment_section_map asm, as_item_section_map ism, cr_revisions cr,
 	     cr_items ci, as_items i, as_item_rels ir, acs_objects o, cr_revisions rs
 	where asm.assessment_id = :assessment_rev_id
Index: openacs-4/packages/assessment/www/view/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/view/index.vuh,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/view/index.vuh	7 Jan 2005 16:10:45 -0000	1.2
+++ openacs-4/packages/assessment/www/view/index.vuh	29 Mar 2005 10:53:35 -0000	1.3
@@ -17,7 +17,7 @@
 set the_url $name
 set content_root [as::assessment::folder_id -package_id $package_id]
 
-set template_root ""
+set template_root [db_1row template_root {}]
 
 # Serve the page