Index: openacs-4/packages/assessment/tcl/as-assessment-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-assessment-procs.tcl,v
diff -u -r1.33.2.1 -r1.33.2.2
--- openacs-4/packages/assessment/tcl/as-assessment-procs.tcl	5 Feb 2007 14:12:47 -0000	1.33.2.1
+++ openacs-4/packages/assessment/tcl/as-assessment-procs.tcl	5 Feb 2007 14:18:47 -0000	1.33.2.2
@@ -592,3 +592,19 @@
 
 
 }
+
+ad_proc -private as::assessment::delete {
+    -assessment_id:required
+} {
+    Remove an assessment and all associated data
+
+    @author Dave Bauer (dave@solutiongrove.com)
+
+    @param assessment_id
+} {
+    foreach session_id [db_list get_subject_ids "select session_id from as_sessions,cr_revisions where assessment_id=revision_id and item_id=:assessment_id"] {
+        as::session::delete -session_id $session_id
+    }
+
+    content::item::delete -item_id $assessment_id
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/tcl/as-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-procs.tcl,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/assessment/tcl/as-item-procs.tcl	5 Feb 2007 14:12:47 -0000	1.18.2.1
+++ openacs-4/packages/assessment/tcl/as-item-procs.tcl	5 Feb 2007 14:18:47 -0000	1.18.2.2
@@ -333,4 +333,4 @@
     Get the item type id
 } {
     return [db_string item_type_id {}]    
-}
\ No newline at end of file
+}
Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl,v
diff -u -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	5 Feb 2007 14:12:47 -0000	1.21.2.1
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	5 Feb 2007 14:18:47 -0000	1.21.2.2
@@ -667,4 +667,5 @@
     db_dml move_up_choices {}
 }
 return [list as_item_id $new_item_id section_id $new_section_id assessment_rev_id $new_assessment_rev_id]
-}
\ No newline at end of file
+}
+
Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql	5 Feb 2007 14:12:47 -0000	1.12.2.1
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.xql	5 Feb 2007 14:18:47 -0000	1.12.2.2
@@ -114,7 +114,6 @@
       </querytext>
 </fullquery>
 
-
 <fullquery name="as::item_type_mc::add_to_assessment.iitem_type">
       <querytext>
 
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -r1.21 -r1.21.2.1
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	2 Dec 2006 01:04:24 -0000	1.21
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	5 Feb 2007 14:18:47 -0000	1.21.2.1
@@ -11,16 +11,10 @@
   <if @assessment_data.time_for_response@ not nil><br>#assessment.session_time_remaining#</if>
   <if @section.max_time_to_complete@ not nil><br>#assessment.section_time_remaining#</if>
 
-	<if @progress_bar_list@ defined>
-	<list name="progress_bar_list">
-	<if @progress_bar_list:item@ eq @current_page@>
-	<b>[@progress_bar_list:item@] </b>
-	</if>
-	<else>
-	[@progress_bar_list:item@] 
-	</else>
-	</list>
-	</if>
+  <if @progress_bar_list@ defined>
+  <include src="/packages/assessment/lib/progress-bar" total="@total_pages@" current="@current_page@" />
+  </if>
+
   <if @form_is_submit@ true and @form_is_valid@ false>
   <div class="form-error">#assessment.There_was_a_problem_with_your_answers#</div>
   </if>
Index: openacs-4/packages/assessment/www/asm-admin/item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	24 Jan 2007 20:15:30 -0000	1.10.2.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit.tcl	5 Feb 2007 14:18:47 -0000	1.10.2.2
@@ -65,6 +65,15 @@
     }
 }
 
+# old image links
+
+if {[db_0or1row get_item_content {}]} {
+    set remove_url [export_vars -base remove-content {as_item_id content_rev_id {return_url [ad_return_url]}}]
+    ad_form -extend -name item_edit -form {
+	{content2:text(inform),optional {label "OLD UI [_ assessment.item_display_Content]"} {value {<a href="../view/$content_filename?revision_id=$content_rev_id" target=view>$content_name</a> \[<a href="${remove_url}">Remove File</a>\]}} {help_text "[_ assessment.item_Content_help]"}}
+    }
+}
+
 if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
     category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $as_item_id -form_name item_edit
 }