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 -N -r1.17 -r1.17.2.1
--- openacs-4/packages/assessment/lib/session-items.adp	12 Feb 2008 11:05:46 -0000	1.17
+++ openacs-4/packages/assessment/lib/session-items.adp	4 Jul 2008 10:22:35 -0000	1.17.2.1
@@ -4,7 +4,7 @@
     </if>
 
     <multiple name="items">
-<if @admin_p@><p><a href="@item_edit_general_url@">Edit this question</a></p></if>
+<if @admin_p@><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
 <if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
      <if @show_item_name_p@ eq t><p style="font-weight:bold;">@items.name@:</p></if>
       <if @survey_p@ ne t and @items.title@ ne @items.next_title@>
@@ -33,15 +33,15 @@
 			<if @items.answered_p@ eq t><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></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>
+		      <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="@items.results_edit_url@">#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>
 		    <else>
 		      <if @items.answered_p@ eq t><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
 		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
 		    <if @edit_p@ eq 1 and @items.answered_p@ eq t>
-              <a href="@results_edit_url@">#assessment.Edit#</a>
+              <a href="@items.results_edit_url@">#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>
@@ -83,7 +83,7 @@
 
   <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>    
   <if @edit_p@ eq 1 and @items.answered_p@ eq t>
-    <p><a href="@results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
+    <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
   </if>
   <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
     <p style="font-weight: bold">@items.result_points@ / @items.points@ #assessment.points#</p>
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 -N -r1.19 -r1.19.2.1
--- openacs-4/packages/assessment/lib/session-items.tcl	2 Feb 2008 21:15:46 -0000	1.19
+++ openacs-4/packages/assessment/lib/session-items.tcl	4 Jul 2008 10:22:35 -0000	1.19.2.1
@@ -37,7 +37,7 @@
     {section_id:text(hidden) {value $section_id}}
 }
 set feedback_count 0
-db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view} items session_items {} {
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view item_edit_general_url results_edit_url } items session_items {} {
 
     # build URLs
     set item_edit_general_url [export_vars -base "asm-admin/item-edit-general" {as_item_id assessment_id section_id}]
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 -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/assessment/www/asm-admin/questions.adp	27 May 2008 17:22:44 -0000	1.4.2.2
+++ openacs-4/packages/assessment/www/asm-admin/questions.adp	4 Jul 2008 10:22:36 -0000	1.4.2.3
@@ -8,12 +8,12 @@
 
 <multiple name="sections">
 <h3><a name="@sections.sort_order@">#assessment.Section_Number#: @sections.title@</a></h3>
-  <a class="button" href="@section_form_edit_url@">#assessment.Edit#</a> 
+  <a class="button" href="@sections.section_form_edit_url@">#assessment.Edit#</a> 
 
-  <a class=button href="@section_form_add_url@">#assessment.add_new_section#</a>
-  <a class=button href="@catalog_section_url@">#assessment.Search_Section#</a>
-  <if @sections.display_type_id@ not nil><a class=button href="@section_display_form_url@">#assessment.edit_section_display#</a></if>
-  <a class=button href="@section_preview_url@">#assessment.section_preview#</a>
+  <a class="button" href="@sections.section_form_add_url@">#assessment.add_new_section#</a>
+  <a class="button" href="@sections.catalog_section_url@">#assessment.Search_Section#</a>
+  <if @sections.display_type_id@ not nil><a class="button" href="@sections.section_display_form_url@">#assessment.edit_section_display#</a></if>
+  <a class="button" href="@sections.section_preview_url@">#assessment.section_preview#</a>
 
   <if @sections.sort_order@ lt @max_sort_order@>
   <a  href="@sections.section_swap_down_url@"><img src="/resources/assessment/down.gif" style="border: 0;" alt="#assessment.Move_Down#"></a>
@@ -27,8 +27,8 @@
   (@sections.points@ #assessment.points#)
 
 <if @admin_trigger_p@>
-  <a class=button href="@checks_admin_url@">#assessment.admin_triggers#</a>
-  <a class=button href="@add_edit_section_check_url@">#assessment.add_section_trigger#</a>
+  <a class="button" href="@sections.checks_admin_url@">#assessment.admin_triggers#</a>
+  <a class="button" href="@sections.add_edit_section_check_url@">#assessment.add_section_trigger#</a>
 </if>
 
   <img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">