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.22 -r1.23
--- openacs-4/packages/assessment/lib/section-items.adp	2 Feb 2008 15:08:03 -0000	1.22
+++ openacs-4/packages/assessment/lib/section-items.adp	2 Sep 2008 17:41:43 -0000	1.23
@@ -1,68 +1,78 @@
-<if @items:rowcount@ eq 0>
-    <div>
-    <a href="@item_add_url@" class="button">#assessment.Add_New#</a>
-    <a href="@catalog_search_url@" class="button">#assessment.Search_Item#</a>
-    </div>
-</if>
-<else>
- <formtemplate id="admin_section_@section_id@">
-<multiple name="items">
+    <formtemplate id="admin_section_@section_id@">
+      <if @items:rowcount@ eq 0>
+	<a class="button" href="item-add?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Add_New#</a>
+	<a class="button" href="catalog-search?section_id=@section_id@&assessment_id=@assessment_id@&after=0">#assessment.Search_Item#</a>
+      </if>
 
-<h4><a name="Q@items.as_item_id@">#assessment.Question_Number#</a></h4>
+      <a class="button" href="@item_add_top_url@">#assessment.lt_Insert_new_question_h#</a>
 
-<if @assessment_data.type@ ne 1>
+      <multiple name="items">
 
-    <div><a class="button" href="@item_edit_general_url@">#assessment.Edit#</a>
-    <a class="button" href="@item_copy_url@">#assessment.Copy#</a>
-    <a class=button href="@item_add_url@">#assessment.Add_New#</a>
-    <a class=button href="@catalog_search_url@">#assessment.Search_Item#</a>
-    <img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
-    <if @items.rownum@ lt @items:rowcount@>
-        <a href="@item_swap_down_url@"><img src="/resources/assessment/down.gif" style="border: 0;" alt="#assessment.Move_Down#"></a>
-    </if>
-    <if @items.rownum@ gt 1>
-        <a href="@item_swap_up_url"><img src="/resources/assessment/up.gif" style="border: 0;" alt="#assessment.Move_Up#"></a>
-    </if>
-    <a href="@item_delete_url@"><img src="/resources/acs-subsite/Delete16.gif" style="border: 0;" alt="#assessment.remove_item#"></a>
+	<div class="section-item">
 
-    <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="@add_edit_check_url@">#assessment.add_trigger#</a> (<a href="@check_admin_url@">@items.checks_related@</a>)<img src="/resources/assessment/spacer.gif" style="border: 0;" alt="" width="10">
-    </if>
-    </div>
+	  <a name="Q@items.as_item_id@">
+	  </a>
+	  <h4>#assessment.Question_Number#</h4>
+	  <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@">
+		@formgroup.widget;noquote@ @formgroup.label;noquote@<br />
+	      </formgroup>
+	    </if>
+	    <else>
+	      <formgroup id="response_to_item.@items.as_item_id@">
+		@formgroup.widget;noquote@ @formgroup.label;noquote@
+	      </formgroup>
+	      <br />
+	    </else>
+	  </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>
+	  <p>
+	    <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>
+	  </p>
+	  <p>
+	    <if @assessment_data.type@ ne 1>
+	      <a class="button" href="@items.item_edit_url@" title="#assessment.Edit#">#assessment.Edit#</a>
+	      <a class="button" href="@items.item_copy_url@" title="#assessment.Copy#">#assessment.Copy#</a>
+	      <a class="button" href="@items.item_delete_url@" title="#assessment.remove_item#">#assessment.remove_item#</a>
+	    </if>
+	    <if @items.rownum@ lt @items:rowcount@>
+	      <a href="@items.item_swap_down_url@">
+		<img src="/resources/assessment/down.gif" border="0" alt="#assessment.Move_Down#" />
+	      </a>
+	    </if>
+	    <if @items.rownum@ gt 1>
+	      <a href="@items.item_swap_down_url@">
+		<img src="/resources/assessment/up.gif" border="0" alt="#assessment.Move_Up#" />
+	      </a>
+	    </if>
+	  </p>
+	</div>
 
-    <if @items.presentation_type@ ne fitb><p>@items.question_text;noquote@</p>
-<div>
-<if @items.description@ not nil>@items.description;noquote@<br></if></if>
+	<a class="button" href="@items.item_add_url@">#assessment.lt_Insert_new_question_h#</a>
 
-    <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@">
-          @formgroup.widget;noquote@ @formgroup.label;noquote@<br>
-        </formgroup>
-      </if>
-      <else>
-        <formgroup id="response_to_item.@items.as_item_id@">
-          @formgroup.widget;noquote@ @formgroup.label;noquote@
-        </formgroup>
-        <br>
-      </else>
-    </if>
-    <elseif @items.presentation_type@ eq fitb>
-      @items.html;noquote@
-    </elseif>
-    <else>
-      <formwidget id="response_to_item.@items.as_item_id@">
-    </else>
-</div>
-    <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" style="border: 0;">
-      <noparse>@items.subtext@</noparse>
-      </div>
-    </if>
-</if>
-</multiple>
-</formtemplate>
-</else>
+      </multiple>
+
+    </formtemplate>
+
Index: openacs-4/packages/assessment/lib/section-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/lib/section-items.tcl	2 Feb 2008 15:08:03 -0000	1.14
+++ openacs-4/packages/assessment/lib/section-items.tcl	2 Sep 2008 17:41:43 -0000	1.15
@@ -1,37 +1,46 @@
+set package_url [ad_conn package_url]
 as::assessment::data -assessment_id $assessment_id
+
+set item_add_top_url [export_vars -base item-add {as_item_id section_id assessment_id return_url}]
 ad_form -name admin_section_${section_id} -form {
     {section_id:text(hidden) {value $section_id}}
 }
 
-set item_add_url [export_vars -base item-add {section_id assessment_id {after 0}}]
-set catalog_search_url [export_vars -base catalog-search {section_id assessment_id {after 0}}]
-
-db_multirow -extend { checks_related presentation_type html item_type choice_orientation item_edit_general_url item_copy_url catalog_search_url item_swap_url add_edit_check_url check_admin_url } items section_items {} {
-
-    # Build URLs
-    set item_edit_general_url [export_vars -base item-edit-general {as_item_id section_id assessment_id}]
-    set item_copy_url [export_vars -base item-copy {section_id assessment_id as_item_id {after $sort_order}}]
-    set item_add_url [export_vars -base item-add {section_id assessment_id {after $sort_order}}]
-    set catalog_search_url [export_vars -base catalog-search {section_id assessment_id {after $sort_order}}]
-    set item_swap_down_url [export_vars -base item-swap {section_id assessment_id sort_order {direction down}}]
-    set item_swap_up_url [export_vars -base item-swap {section_id assessment_id sort_order {direction up}}]
-    set item_delete_url [export_vars -base item-swap {as_item_id section_id assessment_id}]
-    set add_edit_check_url [export_vars -base ../asm-admin/add-edit-check {as_item_id section_id assessment_id {after $sort_order}}]
-    set check_admin_url [export_vars -base ../asm-admin/checks-admin {section_id assessment_id {item_id $as_item_id}}]
-
-
+db_multirow -extend { 
+    checks_related 
+    presentation_type 
+    html 
+    item_type 
+    choice_orientation 
+    allow_other_p 
+    item_edit_url 
+    item_copy_url 
+    item_delete_url 
+    item_add_url 
+    item_swap_up_url 
+    item_swap_down_url 
+} items section_items {} {
     set presentation_type [as::item_form::add_item_to_form -name admin_section_${section_id} -section_id $section_id -item_id $as_item_id -random_p f]
     if {$presentation_type == "fitb"} {
         regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
     }
     array set item [as::item::item_data -as_item_id $as_item_id]
 
+    set item_edit_url [export_vars -base item-edit-general {as_item_id section_id assessment_id return_url}]
+    set item_copy_url [export_vars -base item-copy {as_item_id section_id assessment_id return_url {after $sort_order}}]
+    set item_delete_url [export_vars -base item-delete {as_item_id section_id assessment_id return_url}]
+    set item_add_url [export_vars -base item-add {as_item_id section_id assessment_id return_url {after $sort_order}}]
+    set item_swap_up_url [export_vars -base item-swap {as_item_id section_id assessment_id return_url sort_order {direction up}}]
+    set item_swap_down_url [export_vars -base item-swap {as_item_id section_id assessment_id return_url sort_order {direction down}}]
+
     if {$presentation_type == "rb" || $presentation_type == "cb"} {
 	array set type [as::item_display_$presentation_type\::data -type_id $item(display_type_id)]
 	set choice_orientation $type(choice_orientation)
+#        set allow_other_p $item(allow_other_p)
 	array unset type
     } else {
 	set choice_orientation ""
+#        set allow_other_p "f"
     }
 
     set item_type $item(item_type)