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.8.4 -r1.14.8.5
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	17 Aug 2014 08:11:10 -0000	1.14.8.4
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	17 Aug 2014 11:36:55 -0000	1.14.8.5
@@ -29,68 +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 [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
-	}
+        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 { $version(auto-mount) eq "" 
-	     && $version(package.type) eq "apm_application" 
-	   } {
+             && $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)">
-	    }]
+                <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 [subst {
-	Select what data files to load for $version(package-name) $final_version_name
-	<blockquote>
-	<table cellpadding='3' cellspacing='3' class='list-table'>
-	  <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>
+        }]
     }
 }
 
@@ -107,3 +107,10 @@
 }
 
 ad_return_template apm
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
+
Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.22.4.7 -r1.22.4.8
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	17 Aug 2014 08:11:10 -0000	1.22.4.7
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	17 Aug 2014 11:36:55 -0000	1.22.4.8
@@ -55,7 +55,7 @@
             } else {
                 ns_log Notice "need upgrade of package $package_key $version_name"
                 lappend already_installed_list \
-		    "Package $package_name; ($package_key) version $version_name or higher is already installed."
+                    "Package $package_name; ($package_key) version $version_name or higher is already installed."
             }
         } else {
             lappend spec_files $spec_file
@@ -72,38 +72,38 @@
 if { $spec_files eq "" } {
     # No spec files to work with.
     append body [subst {
-    <h2>No New Packages to Install</h2><p>
+        <h2>No New Packages to Install</h2><p>
 
-    There are no new packages to install.  Please load some
-    using the <a href="package-load">Package Loader</a>.<p>
-    Return to the <a href="index">APM</a>.<p>
+        There are no new packages to install.  Please load some
+        using the <a href="package-load">Package Loader</a>.<p>
+        Return to the <a href="index">APM</a>.<p>
     }]
 } else {   
     
     append body {
-    <h2>Select Packages to Install</h2><p>
-    <p>Please select the set of packages you'd like to install.</p>
+        <h2>Select Packages to Install</h2><p>
+        <p>Please select the set of packages you'd like to install.</p>
     }
 
     append body [subst {
 
-<script type="text/javascript">
-function uncheckAll() {
-    for (var i = 0; i < [llength $spec_files]; ++i)
-        document.forms\[0\].elements\[i\].checked = false;
-    this.href='';
-}
-function checkAll() {
-    for (var i = 0; i < [llength $spec_files]; ++i)
-        document.forms\[0\].elements\[i\].checked = true;
-    this.href='';
-}
-</script>
-<a href="packages-install?checked_by_default_p=0" onclick="javascript:uncheckAll();return false"><b>uncheck all boxes</b></a> |
-<a href="packages-install?checked_by_default_p=1" onclick="javascript:checkAll(); return false"><b>check all boxes</b></a>
+        <script type="text/javascript">
+        function uncheckAll() {
+            for (var i = 0; i < [llength $spec_files]; ++i)
+            document.forms\[0\].elements\[i\].checked = false;
+            this.href='';
+        }
+        function checkAll() {
+            for (var i = 0; i < [llength $spec_files]; ++i)
+            document.forms\[0\].elements\[i\].checked = true;
+            this.href='';
+        }
+        </script>
+        <a href="packages-install?checked_by_default_p=0" onclick="javascript:uncheckAll();return false"><b>uncheck all boxes</b></a> |
+        <a href="packages-install?checked_by_default_p=1" onclick="javascript:checkAll(); return false"><b>check all boxes</b></a>
     }]
 
-   append body "<form action='packages-install-2' method='post'>\n"
+    append body "<form action='packages-install-2' method='post'>\n"
 
     # Client properties do not deplete the limited URL variable space.
     # But they are limited to the maximum length of a varchar ...
@@ -115,43 +115,43 @@
     set pkg_key_list [list]
     apm_log APMDebug "APM: Specification files available: $spec_files"
     foreach spec_file $spec_files {
-	### Parse the package.
-	if { [catch {
-	    array set package [apm_read_package_info_file $spec_file]
-	} errmsg] } {
-	    lappend errors "<li>Unable to parse $spec_file.  The following error was generated:
-	    <blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote><p>"
-	} else {
-	    apm_log APMDebug "APM: Adding $package(package.key) to list for installation." 
-	    lappend pkg_info_list [pkg_info_new $package(package.key) $spec_file \
-		    $package(embeds) $package(extends) $package(provides) $package(requires) ""]
+        ### Parse the package.
+        if { [catch {
+            array set package [apm_read_package_info_file $spec_file]
+        } errmsg] } {
+            lappend errors "<li>Unable to parse $spec_file.  The following error was generated:
+        <blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote><p>"
+        } else {
+            apm_log APMDebug "APM: Adding $package(package.key) to list for installation." 
+            lappend pkg_info_list [pkg_info_new $package(package.key) $spec_file \
+                                       $package(embeds) $package(extends) $package(provides) $package(requires) ""]
             lappend pkg_key_list $package(package.key)
-	}
+        }
     }
-	
+    
     if { $checked_by_default_p } {
         set widget [apm_package_selection_widget $pkg_info_list $pkg_key_list]
     } else {
         set widget [apm_package_selection_widget $pkg_info_list]
-}
+    }
 
     if {$widget eq ""} {
-	append body "There are no new packages available."
-	ad_script_abort
+        append body "There are no new packages available."
+        ad_script_abort
     }
 
     append body $widget
     append body [subst {
-    <input type="submit" value="Next -->">
-    </form>
+        <input type="submit" value="Next -->">
+        </form>
     }]
     
     if {$errors ne ""} {
-	append body "The following errors were generated
-	<ul>
-	    $errors
-	</ul>
-	"
+        append body "The following errors were generated
+    <ul>
+        $errors
+    </ul>
+    "
     }    
 }
 
@@ -163,3 +163,10 @@
     ns_log Notice "APM packages-install: Already Installed Packages\n- [join $already_installed_list "\n- "]"
 }
 ad_return_template apm
+
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: