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>