Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl,v
diff -u -N -r1.7 -r1.7.12.1
--- openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	4 Jun 2006 00:45:20 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	27 Sep 2013 18:47:52 -0000	1.7.12.1
@@ -13,26 +13,34 @@
 
 
 if {![apm_version_installed_p $version_id]} {
-    doc_body_append "[apm_header "Package Deleted."]
-The version you have indicated has been deleted.<p>
-Return to the <a href=\"index\">index</a>.
-[ad_footer]
-"
-ad_script_abort
+    set title "Package Deleted"
+    set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+    set body {The version you have indicated has been deleted.<p>
+	Return to the <a href="index">index</a>.
+    }
+} else {
+    apm_version_info $version_id
+
+    set title "Delete"
+    set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+    set body ""
+    if { [catch {apm_package_delete \
+		     -sql_drop_scripts $sql_drop_scripts \
+		     -remove_files=0 \
+		     -callback apm_doc_body_callback $package_key} errmsg] } {
+	append body [subst {
+	    We encountered the following error when deleting package "$package_key":
+	    <pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>
+	}]
+    } else {
+	append body {
+	    </ul>
+	    <p>You should restart the server now to make sure the memory footprint 
+	    and cache of the package is cleared out. <a href="../server-restart">Click here</a> 
+	    to restart the server now.</p>
+	}
+    }
 }
 
-apm_version_info $version_id
 
-doc_body_append [apm_header "Delete"]
 
-if { [catch {apm_package_delete -sql_drop_scripts $sql_drop_scripts -remove_files=0 -callback apm_doc_body_callback $package_key} errmsg] } {
-    doc_body_append "We encountered the following error when deleting package \"$package_key\":
-	<pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>"
-}
-
-doc_body_append "
-</ul>
-<p>
-<p>You should restart the server now to make sure the memory footprint and cache of the package is cleared out. <a href=\"../server-restart\">Click here</a> to restart the server now.</p>
-[ad_footer]
-"