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.5 -r1.6
--- openacs-4/packages/assessment/lib/session-items.adp	2 Mar 2005 17:18:25 -0000	1.5
+++ openacs-4/packages/assessment/lib/session-items.adp	11 Mar 2005 20:21:48 -0000	1.6
@@ -6,66 +6,113 @@
 
 <multiple name="items">
 
-  <if @items.rownum@ odd>
+  <if @items.num@ odd>
     <tr class="odd">
   </if>
   <else>
     <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></tr>
+  <if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if></td><td>&nbsp;</td></tr>
 
-  <if @items.rownum@ odd>
+  <if @items.num@ odd>
     <tr class="odd">
   </if>
   <else>
     <tr class="even">
   </else>
 
 <td>
-<if @survey_p@ ne t>
-    <if @items.result_points@ not nil><b>@items.result_points@ / @items.points@ #assessment.points#
+<if @survey_p@ ne t and @items.title@ ne @items.next_title@>
+  <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@</b></if>
-    </if>	
-    </b>
+      <if @items.feedback@ not nil>: @items.feedback;noquote@</if>
     </if>
-    <else>
-      <if @items.answered_p@ eq t><b>#assessment.not_yet_reviewed#</b> </if>
-      <else><b>#assessment.not_answered#</b> </else>
-    </else>
-    <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
-    <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
+    </b>
+  </if>
+  <else>
+    <if @items.answered_p@ eq t><b>#assessment.not_yet_reviewed#</b> </if>
+    <else><b>#assessment.not_answered#</b> </else>
+  </else>
+  <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
+  <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
 </if>
-</td></tr>
+</td><td>&nbsp;</td></tr>
 
-  <if @items.rownum@ odd>
+  <if @items.num@ odd>
     <tr class="odd">
   </if>
   <else>
     <tr class="even">
   </else>
 <td>
-  <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.presentation_type@ ne fitb>
+    @items.title;noquote@</td><td>
+    <if @items.title@ ne @items.next_title@>
+      </td></tr>
+      <if @items.num@ odd>
+        <tr class="odd">
+      </if>
+      <else>
+        <tr class="even">
+      </else>
+      <td colspan=2>
     </if>
-    <elseif @items.presentation_type@ eq fitb>
-      @items.html;noquote@
-    </elseif>
-    <else>
-      <formwidget id="response_to_item.@items.as_item_id@">
-    </else>
-    <if @items.subtext@ not nil>
-      <div class="form-help-text">
-      <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
-      <noparse>@items.subtext@</noparse>
-      </div>
-    </if>
+  </if>
+  <blockquote><table>
+    <group column=title>
+      <td valign=top>@items.description@
+        <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#
+              <if @show_feedback@ ne none>
+                <if @items.feedback@ not nil>:<br>@items.feedback;noquote@</if>
+              </if>
+              </b>
+            </if>
+            <else>
+              <if @items.answered_p@ eq t><br><b>#assessment.not_yet_reviewed#</b> </if>
+              <else><br><b>#assessment.not_answered#</b> </else>
+            </else>
+            <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
+            <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
+          </if>
+        </if>
+      </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@">
+             @formgroup.widget;noquote@ @formgroup.label;noquote@<br>
+          </formgroup>
+        </if>
+        <elseif @items.title@ ne @items.next_title@ and @items.groupnum@ eq 1>
+          <td><formgroup id="response_to_item.@items.as_item_id@">
+            @formgroup.widget;noquote@ @formgroup.label;noquote@
+          </formgroup>
+          <br>
+        </elseif>
+        <else>
+          <formgroup id="response_to_item.@items.as_item_id@">
+            <td align=left>@formgroup.widget;noquote@ @formgroup.label;noquote@</td>
+          </formgroup>
+          </tr><tr><td></td><td colspan=10>
+        </else>
+      </if>
+      <elseif @items.presentation_type@ eq fitb>
+        <td>@items.html;noquote@
+      </elseif>
+      <else>
+        <td colspan=10><formwidget id="response_to_item.@items.as_item_id@">
+      </else>
+      <if @items.subtext@ not nil>
+        <div class="form-help-text">
+        <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+        <noparse>@items.subtext@</noparse>
+        </div>
+      </if>
+      </td></tr>
+    </group></table>
   </blockquote>
 </td></tr>
 
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/lib/session-items.tcl	2 Mar 2005 17:18:25 -0000	1.5
+++ openacs-4/packages/assessment/lib/session-items.tcl	11 Mar 2005 20:21:48 -0000	1.6
@@ -7,14 +7,19 @@
 }
 
 # todo: display feedback text
-db_multirow -extend { presentation_type html result_points feedback answered_p } items session_items {} {
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title num } items session_items {} {
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
 
     set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback]
 
     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"} {
+	db_1row choice_orientation {}
+    } else {
+	set choice_orientation ""
+    }
 
     if {[empty_string_p $points]} {
 	set points 0
@@ -41,3 +46,18 @@
 	set answered_p f
     }    
 }
+
+set counter 1
+for {set i 1; set j 2} {$i <= ${items:rowcount}} {incr i; incr j} {
+    upvar 0 items:$i this
+    set this(num) $counter
+    if {$i < ${items:rowcount}} {
+	upvar 0 items:$j next
+	set this(next_title) $next(title)
+	if {$this(title) != $next(title)} {
+	    incr counter
+	}
+    } else {
+	set this(next_title) ""
+    }
+}
Index: openacs-4/packages/assessment/lib/session-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/session-items.xql	21 Feb 2005 14:32:55 -0000	1.4
+++ openacs-4/packages/assessment/lib/session-items.xql	11 Mar 2005 20:21:48 -0000	1.5
@@ -4,9 +4,9 @@
 <fullquery name="session_items">
       <querytext>
       
-    select i.as_item_id, i.subtext, cr.title, ci.name, ism.required_p,
-           ism.section_id, ism.sort_order, i.feedback_right, i.feedback_wrong,
-           ism.max_time_to_complete, ism.points
+    select i.as_item_id, i.subtext, cr.title, cr.description, ci.name,
+	   ism.required_p, ism.section_id, ism.sort_order, i.feedback_right,
+	   i.feedback_wrong, ism.max_time_to_complete, ism.points
     from as_items i, cr_revisions cr, cr_items ci, as_item_section_map ism,
          as_session_items si
     where ci.item_id = cr.item_id
@@ -21,4 +21,16 @@
       </querytext>
 </fullquery>
 
+<fullquery name="choice_orientation">
+	<querytext>
+
+	    select d.choice_orientation
+	    from as_item_rels r, as_item_display_$presentation_type d
+	    where r.item_rev_id = :as_item_id
+	    and r.rel_type = 'as_item_display_rel'
+	    and r.target_rev_id = d.as_item_display_id
+
+	</querytext>
+</fullquery>
+	
 </queryset>
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.5 -r1.6
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	11 Mar 2005 18:54:12 -0000	1.5
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	11 Mar 2005 20:21:48 -0000	1.6
@@ -43,12 +43,14 @@
       </else>
 <group column=title>
           <tr class="form-widget">
-          <if @items.title@ eq @items.next_title@ and @items.groupnum@ eq 1>
-            <td></td>
-            <formgroup id="response_to_item.@items.as_item_id@">
-              <td align=center>@formgroup.label;noquote@</td>
-            </formgroup>
-            </tr><tr class="form-widget">
+          <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
+            <if @items.title@ eq @items.next_title@ and @items.groupnum@ eq 1>
+              <td></td>
+              <formgroup id="response_to_item.@items.as_item_id@">
+                <td align=center>@formgroup.label;noquote@</td>
+              </formgroup>
+              </tr><tr class="form-widget">
+            </if>
           </if>
           <td valign=top>@items.description@</td>
           <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -86,7 +88,7 @@
 
           <div class="form-error"><formerror id="response_to_item.@items.as_item_id@"></formerror></div>
 </td></tr>
-</group></td></tr></table>
+</group></table>
 
         </blockquote>
         </td></tr>