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 { -

No New Packages to Install

+

No New Packages to Install

- There are no new packages to install. Please load some - using the Package Loader.

- Return to the APM.

+ There are no new packages to install. Please load some + using the Package Loader.

+ Return to the APM.

}] } else { append body { -

Select Packages to Install

-

Please select the set of packages you'd like to install.

+

Select Packages to Install

+

Please select the set of packages you'd like to install.

} append body [subst { - -uncheck all boxes | -check all boxes + + uncheck all boxes | + check all boxes }] - append body "
\n" + append body "\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 "
  • Unable to parse $spec_file. The following error was generated: -
    [ad_quotehtml $errmsg]

    " - } 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 "

  • Unable to parse $spec_file. The following error was generated: +
    [ad_quotehtml $errmsg]

    " + } 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 { - -

  • + + }] if {$errors ne ""} { - append body "The following errors were generated - - " + append body "The following errors were generated + + " } } @@ -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: