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.19 -r1.20
--- openacs-4/packages/assessment/lib/section-items.adp	4 Aug 2006 19:06:03 -0000	1.19
+++ openacs-4/packages/assessment/lib/section-items.adp	15 May 2007 20:14:16 -0000	1.20
@@ -1,60 +1,21 @@
-<h3>#assessment.Items#</h3>
 <formtemplate id="admin_section">
-<table cellspacing=0>
 <if @items:rowcount@ eq 0>
-  <tr class="odd">
-  <td></td><td>
     <a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Add_New#</a>
     <a href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Search_Item#</a>
-  </td></tr>
 </if>
 
 <multiple name="items">
 
-  <if @items.rownum@ odd>
-    <tr class="odd">
-  </if>
-  <else>
-    <tr class="even">
-  </else>
+<a name="Q@items.as_item_id@"><h4>#assessment.Question_Number#</h4>
 
- <td valign="top"><a name=@items.as_item_id@> @items.rownum@. @items.field_name@</a><if @items.required_p@ eq t> <font color=red>*</font> </if></td></tr>
-
-  <if @items.rownum@ odd>
-    <tr class="odd">
-  </if>
-  <else>
-    <tr class="even">
-  </else>
-
 <if @assessment_data.type@ ne 1>
-<td>
 
+    <a class="button" href="item-edit-general?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a>
+    <a class="button" href="item-copy?section_id=@section_id@&assessment_id=@assessment_id@&as_item_id=@items.as_item_id@&after=@items.sort_order@">#assessment.Copy#</a>
 <a class=button href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_New#</a>
 
 <a class=button href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Search_Item#</a>
-<if @items.item_type@ eq "mc">
-<a class=button href="../asm-admin/add-edit-check?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.add_trigger#</a> (<a href="../asm-admin/checks-admin?section_id=@items.section_id@&assessment_id=@assessment_id@&item_id=@items.as_item_id@">@items.checks_related@</a>)<img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
-</if>
-
-<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
-(@items.points@ #assessment.points#)
-</td>
-</if>
-</tr>
-
-  <if @items.rownum@ odd>
-    <tr class="odd">
-  </if>
-  <else>
-    <tr class="even">
-  </else>
-<td>
-  <blockquote>
-    <if @items.presentation_type@ ne fitb>@items.question_text;noquote@
     <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
-    <a href="item-edit?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a>
-    <a href="item-copy?section_id=@section_id@&assessment_id=@assessment_id@&as_item_id=@items.as_item_id@&after=@items.sort_order@">#assessment.Copy#</a>
 <if @items.rownum@ lt @items:rowcount@>
     <a href="item-swap?section_id=@section_id@&assessment_id=@assessment_id@&sort_order=@items.sort_order@&direction=down"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
 </if>
@@ -63,8 +24,17 @@
  </if>
 <a href="item-delete?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@"><img src="/resources/acs-subsite/Delete16.gif" border="0" alt="#assessment.remove_item#"></a>
 
-<br><br><if @items.description@ not nil>@items.description;noquote@<br></if></if>
 
+<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
+(@items.points@ #assessment.points#)
+<if @items.item_type@ eq "mc" and @admin_trigger_p@>
+<a class=button href="../asm-admin/add-edit-check?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.add_trigger#</a> (<a href="../asm-admin/checks-admin?section_id=@items.section_id@&assessment_id=@assessment_id@&item_id=@items.as_item_id@">@items.checks_related@</a>)<img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
+</if>
+
+    <if @items.presentation_type@ ne fitb><p>@items.question_text;noquote@</p>
+
+<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@">
@@ -90,22 +60,6 @@
       <noparse>@items.subtext@</noparse>
       </div>
     </if>
-
-  </blockquote>
-</td></tr>
-
-<if @items.rownum@ eq @items:rowcount@>
-  <if @items.rownum@ odd>
-    <tr class="even">
-  </if>
-  <else>
-    <tr class="odd">
-  </else>
-  <td>
-    <a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items:rowcount@">#assessment.Add_New#</a>
-    <a href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=@items:rowcount@">#assessment.Search_Item#</a>
-  </td></tr>
 </if>
 </multiple>
-</table>      
 </formtemplate>