Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	29 Jul 2008 22:04:14 -0000	1.14
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	27 Oct 2014 16:38:52 -0000	1.15
@@ -8,21 +8,18 @@
 } {
 
 }
+set title "Package Installation"
+set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
+set body {
+    <h2>Select Data Model Scripts to Run</h2>
+    <p>
+    Check all the files you want to be loaded into the database.<p>
+    <form action="packages-install-4" method="post">
+}
 
-set pkg_install_list [ad_get_client_property apm pkg_install_list]
-set body ""
-
-append body "[apm_header "Package Installation"]
-<h2>Select Data Model Scripts to Run</h2>
-<p>
-
-Check all the files you want to be loaded into the database.<p>
-<form action=\"packages-install-4\" method=\"post\">
-"
-
 set sql_file_list [list]
 set file_count 0
-foreach pkg_info $pkg_install_list {
+foreach pkg_info [ad_get_client_property apm pkg_install_list] {
 
     set package_key [pkg_info_key $pkg_info]
     set package_path [pkg_info_path $pkg_info]
@@ -32,59 +29,68 @@
 
     # Determine if we are upgrading or installing.
     if { [apm_package_upgrade_p $package_key $final_version_name] == 1} {
-	ns_log Debug "Upgrading package [string totitle $version(package-name)] to $final_version_name."
-	set upgrade_p 1
-	set initial_version_name [db_string apm_package_upgrade_from {
-	    select version_name from apm_package_versions
-	    where package_key = :package_key
-	    and version_id = apm_package.highest_version(:package_key)
-	} -default ""]
+        ns_log Debug "Upgrading package [string totitle $version(package-name)] to $final_version_name."
+        set upgrade_p 1
+        set initial_version_name [db_string apm_package_upgrade_from {
+            select version_name from apm_package_versions
+            where package_key = :package_key
+            and version_id = apm_package.highest_version(:package_key)
+        } -default ""]
     } else {
-	set upgrade_p 0
-	set initial_version_name ""
+        set upgrade_p 0
+        set initial_version_name ""
     }
 
     # Find out which script is appropriate to be run.
     set data_model_in_package 0
     set table_rows ""
     set data_model_files [apm_data_model_scripts_find \
-                                 -upgrade_from_version_name $initial_version_name \
-                                 -upgrade_to_version_name $final_version_name \
-                                 -package_path $package_path \
-                                 $package_key]
+                              -upgrade_from_version_name $initial_version_name \
+                              -upgrade_to_version_name $final_version_name \
+                              -package_path $package_path \
+                              $package_key]
 
     set sql_file_list [concat $sql_file_list $data_model_files]
 
     if {$data_model_files ne ""} {
-	foreach file $data_model_files {
-	    set path [lindex $file 0]
-	    set file_type [lindex $file 1]
-	    append table_rows "  <tr>
-    <td><input type=checkbox checked name=\"sql_file\" value=\"$file_count\"></td>
-    <td>$path</td>
-    <td>[apm_pretty_name_for_file_type $file_type]</td>
-  </tr>"
-	    incr file_count
-	}
+        foreach file $data_model_files {
+            set path [lindex $file 0]
+            set file_type [lindex $file 1]
+            append table_rows [subst {
+                <tr>
+                <td><input type="checkbox" checked name="sql_file" value="$file_count"></td>
+                <td>$path</td>
+                <td>[apm_pretty_name_for_file_type $file_type]</td>
+                </tr>
+            }]
+            incr file_count
+        }
 
-        if { [empty_string_p $version(auto-mount)] && [string equal $version(package.type) apm_application] } {
-            set mount_html "<input type=\"checkbox\" name=\"mount_p\" value=\"$version(package.key)\" checked> Mount package under the main site at path <input type=\"text\" name=\"mount_path.$version(package.key)\" value=\"$version(package.key)\">"
+        if { $version(auto-mount) eq "" 
+             && $version(package.type) eq "apm_application" 
+         } {
+            set mount_html [subst {
+                <input type="checkbox" name="mount_p" value="$version(package.key)" checked> 
+                Mount package under the main site at path 
+                <input type="text" name="mount_path.$version(package.key)" value="$version(package.key)">
+            }]
         } else {
             set mount_html ""
         }
-	append body "
-	Select what data files to load for $version(package-name) $final_version_name
-	<blockquote>
-	<table cellpadding=3 cellspacing=3>
-	  <tr>
+        append body [subst {
+            Select what data files to load for $version(package-name) $final_version_name
+            <blockquote>
+            <table cellpadding='3' cellspacing='3' class='list-table'>
+            <tr>
             <th>Load</th>
-	    <th>File Name</th>
-	    <th>File Type</th>
-          </tr>
-	$table_rows
-	</table>
-        $mount_html
-       </blockquote> <p>"
+            <th>File Name</th>
+            <th>File Type</th>
+            </tr>
+            $table_rows
+            </table>
+            $mount_html
+            </blockquote> <p>
+        }]
     }
 }
 
@@ -95,10 +101,16 @@
     ad_script_abort
 }
 
-append body "
-<input type=submit value=\"Install Packages\">
-</form>
-[ad_footer]
-"
+append body {
+    <input type=submit value="Install Packages">
+    </form>
+}
 
-doc_return 200 text/html $body
+ad_return_template apm
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
+