Index: openacs-4/packages/assessment/lib/section-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/lib/section-items.adp	11 Mar 2005 18:54:12 -0000	1.14
+++ openacs-4/packages/assessment/lib/section-items.adp	15 Mar 2005 22:46:15 -0000	1.15
@@ -61,7 +61,7 @@
   </else>
 <td>
   <blockquote>
-    <if @items.presentation_type@ ne fitb>@items.title;noquote@<br></if>
+    <if @items.presentation_type@ ne fitb>@items.title;noquote@<br><if @items.description@ not nil>@items.description;noquote@<br></if></if>
     <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
       <if @items.choice_orientation@ ne horizontal>
         <formgroup id="response_to_item.@items.as_item_id@">
Index: openacs-4/packages/assessment/lib/section-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/lib/section-items.xql	11 Mar 2005 18:54:12 -0000	1.6
+++ openacs-4/packages/assessment/lib/section-items.xql	15 Mar 2005 22:46:15 -0000	1.7
@@ -4,8 +4,8 @@
 <fullquery name="section_items">
       <querytext>
       
-    select i.as_item_id, i.subtext, cr.title, ci.name, ism.required_p,
-           ism.section_id, ism.sort_order,
+    select i.as_item_id, i.subtext, cr.title, cr.description, ci.name,
+            ism.required_p, ism.section_id, ism.sort_order,
            ism.max_time_to_complete, ism.points
     from as_items i, cr_revisions cr, cr_items ci, as_item_section_map ism
     where ci.item_id = cr.item_id
Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/lib/session-items.adp	11 Mar 2005 20:21:48 -0000	1.6
+++ openacs-4/packages/assessment/lib/session-items.adp	15 Mar 2005 22:46:15 -0000	1.7
@@ -13,8 +13,8 @@
     <tr class="even">
   </else>
 
-  <td valign="top"><b><if @show_item_name_p@ eq t>@items.name@:</if><else>#assessment.Question# @items.rownum@:</else></b>
-  <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if></td><td>&nbsp;</td></tr>
+  <td valign="top"><if @show_item_name_p@ eq t><b>@items.name@:</b></if></td>
+  <td>&nbsp;</td></tr>
 
   <if @items.num@ odd>
     <tr class="odd">
@@ -25,6 +25,7 @@
 
 <td>
 <if @survey_p@ ne t and @items.title@ ne @items.next_title@>
+  <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
   <if @items.result_points@ not nil><b>@items.result_points@ / @items.points@ #assessment.points#
     <if @show_feedback@ ne none>
       <if @items.feedback@ not nil>: @items.feedback;noquote@</if>
@@ -62,7 +63,7 @@
   </if>
   <blockquote><table>
     <group column=title>
-      <td valign=top>@items.description@
+      <td valign=top>@items.description;noquote@
         <if @survey_p@ ne t>
           <if @items.title@ eq @items.next_title@ or @items.groupnum@ gt 1>
             <if @items.result_points@ not nil><br><b>@items.result_points@ / @items.points@ #assessment.points#
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	11 Mar 2005 20:21:48 -0000	1.6
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	15 Mar 2005 22:46:15 -0000	1.7
@@ -4,7 +4,7 @@
 
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr><th colspan="3">@assessment_data.title@</th></tr>
-<tr><td><i><font size="1">@assessment_data.instructions@</font></i></td></tr>
+<tr><td><i><font size="1">@assessment_data.instructions;noquote@</font></i></td></tr>
 <tr><td align=right>
 #assessment.section_counter#
 <br>#assessment.item_counter#
@@ -30,12 +30,12 @@
 
       <multiple name="items">
       <tr>
-      <tr><td bgcolor="#e4eaef" colspan="2" nowrap><b><if @assessment_data.show_item_name_p@ eq t>@items.name@:</if><else>#assessment.Question# @items.rownum@:</else></b><if @items.required_p@ eq t> <span style="color: #f00;">*</span></if></td>
-        <td bgcolor="#e4eaef"><b><if @items.presentation_type@ ne fitb>@items.title;noquote@</if></b>
+      <tr><if @assessment_data.show_item_name_p@ eq t><td bgcolor="#e4eaef" colspan="2" nowrap><b>@items.name@:</b><if @items.required_p@ eq t> <span style="color: #f00;">*</span></if></td></if>
+        <td bgcolor="#e4eaef"><b><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p@ eq f and @items.required_p@ eq t> <span style="color: #f00;">*</span></if></if></b>
       <if @items.content@ not nil><tr><td bgcolor="#e4eaef" colspan="4"><br>@items.content;noquote@</if>
       <if @items.title@ ne @items.next_title@>
         </td></tr>
-        <tr class="form-widget"><td colspan=4>
+        <tr class="form-widget"><if @assessment_data.show_item_name_p@ eq t><td colspan=4></if><else><td colspan=3></else>
           <blockquote><table>
       </if>
       <else>
@@ -52,7 +52,7 @@
               </tr><tr class="form-widget">
             </if>
           </if>
-          <td valign=top>@items.description@</td>
+          <td valign=top>@items.description;noquote@</td>
           <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
             <if @items.choice_orientation@ ne horizontal>
               <td><formgroup id="response_to_item.@items.as_item_id@">
Index: openacs-4/packages/assessment/www/assessment-single-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-single-submit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/assessment-single-submit.adp	11 Mar 2005 18:54:12 -0000	1.4
+++ openacs-4/packages/assessment/www/assessment-single-submit.adp	15 Mar 2005 22:46:15 -0000	1.5
@@ -4,7 +4,7 @@
 
 <table width="100%" cellpadding="3" cellspacing="0" border="0">
 <tr><th colspan="3">@assessment_data.title@</th></tr>
-<tr><td><i><font size="1">@assessment_data.instructions@</font></i></td></tr>
+<tr><td><i><font size="1">@assessment_data.instructions;noquote@</font></i></td></tr>
 <tr><td align=right>
 #assessment.section_counter#
 <br>#assessment.item_counter#
@@ -32,14 +32,14 @@
     <formtemplate id="show_item_form_@items.as_item_id@">
       <input type="hidden" name="as_item_id" value="@items.as_item_id@">
       <tr>
-      <tr bgcolor="#e4eaef"><td colspan="2" nowrap><b><if @assessment_data.show_item_name_p@ eq t>@items.name@:</if><else>#assessment.Question# @items.rownum@:</else><if @items.required_p@ eq t> <span style="color: #f00;">*</span></if></b></td>
-        <td><b><if @items.presentation_type@ ne fitb>@items.title;noquote@</if></b></td></tr>
-      <if @items.content@ not nil><tr><td colspan="4">@items.content;noquote@</td></tr></if>
+      <tr bgcolor="#e4eaef"><if @assessment_data.show_item_name_p@ eq t><td colspan="2" nowrap><b>@items.name@:<if @items.required_p@ eq t> <span style="color: #f00;">*</span></if></b></td></if>
+        <td><b><if @items.presentation_type@ ne fitb>@items.title;noquote@<if @assessment_data.show_item_name_p@ eq f and @items.required_p@ eq t> <span style="color: #f00;">*</span></if></if></b></td></tr>
+      <if @items.content@ not nil><tr><if @assessment_data.show_item_name_p@ eq t><td colspan="4"></if><else><td colspan="3"></else>@items.content;noquote@</td></tr></if>
 
-      <tr><td colspan="4">
+      <tr><if @assessment_data.show_item_name_p@ eq t><td colspan="4"></if><else><td colspan="3"></else>
         <blockquote><table>
           <tr class="form-widget">
-          <td valign=top>@items.description@</td><td>
+          <if @items.description@ not nil><td valign=top>@items.description;noquote@</td></if><td>
           <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
             <formgroup id="response_to_item.@items.as_item_id@">
               <if @items.choice_orientation@ ne horizontal>
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.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc.tcl	11 Mar 2005 18:54:12 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc.tcl	15 Mar 2005 22:46:15 -0000	1.5
@@ -72,6 +72,9 @@
     lappend validate_list "correct.$i {\$count_correct > 0} \"\[_ assessment.one_correct_choice_req\]\""
 }
 append ad_form_code "\}"
+if {[exists_and_not_null mc_id]} {
+    set count_correct 1
+}
 eval ad_form -extend -name item_add_mc $ad_form_code