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.19.2.1
--- 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	26 Jan 2007 20:31:05 -0000	1.19.2.1
@@ -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=@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?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,6 +24,15 @@
  </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>
 
+
+<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>@items.question_text;noquote@
+
 <br><br><if @items.description@ not nil>@items.description;noquote@<br></if></if>
 
     <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
@@ -91,21 +61,8 @@
       </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>
Index: openacs-4/packages/assessment/www/asm-admin/questions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	24 Jan 2007 20:15:30 -0000	1.1.2.1
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	26 Jan 2007 20:31:05 -0000	1.1.2.2
@@ -4,54 +4,35 @@
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="@tab@">
 
-<h3>#assessment.Sections#</h3>
-
-<table cellspacing=0>
-
 <multiple name="sections">
+<h3>#assessment.Section_Number#</h3>
+  <a class="button" href="section-form?section_id=@sections.section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a> 
 
-<tr class="odd">
-  <td valign="top"><a name=@sections.section_id@>@sections.sort_order@. @sections.name@</a></td>
-</tr>
-
-<tr class="odd">
-  <td>
   <a class=button href="section-form?assessment_id=@assessment_id@&after=@sections.sort_order@">#assessment.add_new_section#</a>
   <a class=button href="catalog-search?assessment_id=@assessment_id@&after=@sections.sort_order@">#assessment.Search_Section#</a>
   <if @sections.display_type_id@ not nil><a class=button 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 class=button href="section-preview?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.section_preview#</a>
-  <a class=button href="checks-admin?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.admin_triggers#</a>
-  <a class=button href="add-edit-section-check?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.add_section_trigger#</a>
 
-  <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
-  (@sections.points@ #assessment.points#)
-  </td>
-</tr>
-
-<tr class="even">
-  <td colspan="3">
-  <blockquote>
-  @sections.title@ 
-  <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
-  <a href="section-form?section_id=@sections.section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a> 
-
   <if @sections.sort_order@ lt @max_sort_order@>
-  <a href="section-swap?assessment_id=@assessment_id@&sort_order=@sections.sort_order@&direction=down"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
+  <a  href="section-swap?assessment_id=@assessment_id@&sort_order=@sections.sort_order@&direction=down"><img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#"></a>
   </if>
   <if @sections.sort_order@ gt 1>
   <a href="section-swap?assessment_id=@assessment_id@&sort_order=@sections.sort_order@&direction=up"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
   </if>
 
   <a href="section-delete?section_id=@sections.section_id@&assessment_id=@assessment_id@"><img src="/resources/acs-subsite/Delete16.gif" border="0" alt="#assessment.remove_section#"></a>
+  <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
+  (@sections.points@ #assessment.points#)
 
-  </blockquote>
+<if @admin_trigger_p@>
+  <a class=button href="checks-admin?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.admin_triggers#</a>
+  <a class=button href="add-edit-section-check?assessment_id=@assessment_id@&section_id=@sections.section_id@">#assessment.add_section_trigger#</a>
+</if>
 
-<blockquote>
-  <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id@" section_id="@sections.section_id@">
-</blockquote>
-
+<p>  @sections.title@ </p>
+  <img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
+<fieldset><legend>#assessment.Items#</legend>
+  <include src="/packages/assessment/lib/section-items" assessment_id="@assessment_id@" section_id="@sections.section_id@" admin_trigger_p="@admin_trigger_p@">
+</fieldset>
 </multiple>
 
-  </td>
-</tr>
-</table>      
Index: openacs-4/packages/assessment/www/asm-admin/questions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/questions.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/assessment/www/asm-admin/questions.tcl	24 Jan 2007 20:15:30 -0000	1.1.2.1
+++ openacs-4/packages/assessment/www/asm-admin/questions.tcl	26 Jan 2007 20:31:05 -0000	1.1.2.2
@@ -14,6 +14,7 @@
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 permission::require_permission -object_id $assessment_id -privilege admin
+set admin_trigger_p [acs_user::site_wide_admin_p -user_id [ad_conn user_id]]
 set title "Questions"
 set context [list [list index [_ assessment.admin]] $title]
 set tab "questions"