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.17 -r1.18
--- openacs-4/packages/assessment/lib/section-items.adp	18 Apr 2005 10:20:40 -0000	1.17
+++ openacs-4/packages/assessment/lib/section-items.adp	12 Jun 2006 02:49:50 -0000	1.18
@@ -1,5 +1,4 @@
 <h3>#assessment.Items#</h3>
-
 <formtemplate id="admin_section">
 <table cellspacing=0>
 <if @items:rowcount@ eq 0>
@@ -19,7 +18,7 @@
     <tr class="even">
   </else>
 
-  <td valign="top">@items.rownum@. @items.field_name@<if @items.required_p@ eq t> <font color=red>*</font> </if></td></tr>
+ <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">
@@ -28,30 +27,21 @@
     <tr class="even">
   </else>
 
-<td><a href="item-edit?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@">#assessment.Edit#</a>
+<if @assessment_data.type@ ne 1>
+<td>
 
-<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>
+<a class=button href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_New#</a>
 
-<a href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Add_New#</a>
-
-<a href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=@items.sort_order@">#assessment.Search_Item#</a><img src="/resources/assessment/spacer.gif" border="0" alt="" width="10">
-
+<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
-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">
+<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.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>
-<if @items.rownum@ gt 1>
-  <a href="item-swap?section_id=@section_id@&assessment_id=@assessment_id@&sort_order=@items.sort_order@&direction=up"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
-</if>
-<a href="item-delete?as_item_id=@items.as_item_id@&section_id=@section_id@&assessment_id=@assessment_id@"><img src="/resources/assessment/delete.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#)
-</td></tr>
+</td>
+</if>
+</tr>
 
   <if @items.rownum@ odd>
     <tr class="odd">
@@ -61,7 +51,20 @@
   </else>
 <td>
   <blockquote>
-    <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@ ne fitb>@items.title;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>
+    <if @items.rownum@ gt 1>
+   <a href="item-swap?section_id=@section_id@&assessment_id=@assessment_id@&sort_order=@items.sort_order@&direction=up"><img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#"></a>
+ </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.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@">
@@ -87,6 +90,7 @@
       <noparse>@items.subtext@</noparse>
       </div>
     </if>
+
   </blockquote>
 </td></tr>