Index: openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl,v
diff -u -r1.16.10.1 -r1.16.10.2
--- openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl	27 Sep 2013 18:46:36 -0000	1.16.10.1
+++ openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl	28 Sep 2013 18:17:36 -0000	1.16.10.2
@@ -15,12 +15,19 @@
 set pkg_enable_list [ad_get_client_property apm pkg_enable_list]
 set sql_file_paths [ad_get_client_property apm sql_file_paths]
 
-ad_return_top_of_page "[apm_header "Package Installation"]
-<h2>Installing packages...</h2>
-<p>
-<ul>
-"
+set title "Package Installation"
+set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
 
+ad_return_top_of_page [ad_parse_template -params [list context title] \
+			   "/packages/openacs-default-theme/lib/plain-streaming-head"]
+
+ns_write {
+    <h2>Installing packages...</h2>
+    <p>
+    <ul>
+}
+
+
 # We have a set of SQL files that need to be sourced at the appropriate time.
 set sql_files [list]
 foreach index $sql_file {
@@ -59,7 +66,10 @@
     }
 
     # Mount path of package
-    if { [lsearch $mount_p $package_key] != -1 && [info exists mount_path($package_key)] && $mount_path($package_key) ne "" } {
+    if { $package_key in $mount_p 
+	 && [info exists mount_path($package_key)] 
+	 && $mount_path($package_key) ne "" 
+     } {
         set selected_mount_path $mount_path($package_key)
     } else {
         set selected_mount_path ""
@@ -83,26 +93,23 @@
         # Installation of the package failed and we shouldn't continue with installation
         # as there might be packages depending on the failed package. Ideally we should
         # probably check for such dependencies and continue if there are none.
-        ns_write "</ul>
-[ad_footer]"
-
+        ns_write "</ul>\n"
         ad_script_abort
     }
 
     incr installed_count
 }
 
 if {$installed_count < 1} {
-    ns_write "</ul>
-    All packages in this directory have already been installed.
-    Please return to the <a href=\"index\">index</a>.<p>
-    [ad_footer]"
-    return
+    ns_write {
+	</ul>
+	All packages in this directory have already been installed.
+	Please return to the <a href="index">index</a>.<p>
+    }
 } else {
-
-ns_write "</ul><p>
-Done installing packages.
-<p>You should restart the server now to make installed and upgraded packages available. <a href=\"../server-restart\">Click here</a> to restart the server now.</p>
-[ad_footer]
-"
+    ns_write {</ul><p>
+	Done installing packages.
+	<p>You should restart the server now to make installed and upgraded packages available. 
+	<a href="../server-restart">Click here</a> to restart the server now.</p>
+    }
 }