Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v diff -u -r1.30.2.3 -r1.30.2.4 --- openacs-4/packages/acs-admin/www/apm/version-view.tcl 3 Jul 2020 07:43:20 -0000 1.30.2.3 +++ openacs-4/packages/acs-admin/www/apm/version-view.tcl 24 Apr 2022 16:29:53 -0000 1.30.2.4 @@ -31,7 +31,6 @@ db_0or1row apm_enabled_version_info {} set installed_version_name_greater_p [expr {[apm_version_names_compare $installed_version_name $version_name] == 1}] - db_0or1row apm_data_model_install_version {} if { $vendor eq "" } { @@ -80,10 +79,7 @@ version $installed_version_name, is installed and [expr {$installed_enabled_p ? "enabled" : "disabled"}]. }] if { !$installed_version_name_greater_p } { - set href [export_vars -base version-upgrade {version_id}] - append body [subst { - You may upgrade to this version now. - }] + set version_upgrade_href [export_vars -base version-upgrade {version_id}] } } @@ -116,10 +112,8 @@ lappend owners "-" } -if { [llength $prompts] == 0 } { - set prompt_text "" -} else { - set prompt_text "" +if { [llength $prompts] > 0 } { + set prompt_text [subst {}] } set title "$pretty_name $version_name" @@ -128,40 +122,19 @@ [list "/acs-admin/apm/" "Package Manager"] \ $title] -append body [subst { - $prompt_text +foreach var {initial_install_p singleton_p implements_subsite_p inherit_templates_p} { + set ${var}_text #acs-admin.[expr {[set $var] ? "Yes" : "No"}]# +} -

Package Information

- -
- - - - - - - - - - -}] - set supported_databases_list [apm_package_supported_databases $package_key] if { $supported_databases_list eq "" } { set supported_databases "none specified" } else { set supported_databases [join $supported_databases_list ", "] } -append body [subst { - - - - - - - -}] +set nr_owners [llength $owners] +set owners_text [join $owners "
"] # Dynamic package version attributes array set all_attributes [apm::package_version::attributes::get_spec] @@ -170,33 +143,28 @@ -array attributes] foreach attribute_name [array names attributes] { array set attribute $all_attributes($attribute_name) - append body [subst { + append attribute_text [subst { }] } set vendorHTML [expr {$vendor_uri eq "" ? $vendor : [subst {$vendor}]}] -append body [subst { - - - - -
Package Name:$pretty_name
Version:$version_name
OpenACS Core:[expr {$initial_install_p ? "Yes" : "No"}]
Singleton:[expr {$singleton_p ? "Yes" : "No"}]
Implements Subsite:[expr {$implements_subsite_p ? "Yes" : "No"}]
Inherit Templates:[expr {$inherit_templates_p ? "Yes" : "No"}]
Auto-mount:$auto_mount
Status:$status
Data Model:$data_model_status
Database Support:$supported_databases
CVS:$cvs_status
[expr {[llength $owners] == 1 ? "Owner" : "Owners"}]:[join $owners "
"]
Package Key:$package_key
Summary:$summary
Description:$description
Release Date:$release_date
$attribute(pretty_name):$attributes($attribute_name)
Vendor:$vendorHTML
Package URL:$package_uri
Version URL:$version_uri
Distribution File: -}] +set distributionHTML "" if { $tarball_length ne "" && $tarball_length > 0 } { set href [export_vars -base packages/[file tail $version_uri] {version_id}] - append body [subst { + append distributionHTML [subst { [format "%.1f" [expr { $tarball_length / 1024.0 }]]KB }] if { $distribution_uri eq "" } { - append body "(generated on this system" + append distributionHTML "(generated on this system" if { $distribution_date ne "" } { - append body " on $distribution_date" + append distributionHTML " on $distribution_date" } - append body ")" + append distributionHTML ")" set href [export_vars -base "https://openacs.org/xowf/package-submissions/PackageSubmit.wf" \ {{m create-new} {p.description $summary} {title "[file tail $version_uri]"}}] - append body [subst { + append distributionHTML [subst {

In order to contribute this package back to the OpenACS community,

    @@ -207,17 +175,17 @@
}] } else { - append body "(downloaded from $distribution_uri" + append distributionHTML "(downloaded from $distribution_uri" if { $distribution_date ne "" } { - append body " on $distribution_date" + append distributionHTML " on $distribution_date" } - append body ")" + append distributionHTML ")" } } else { - append body "None available" + append distributionHTML "None available" if { $installed_p == "t" } { set href [export_vars -base version-generate-tarball {version_id}] - append body [subst { + append distributionHTML [subst { (generate one now from the filesystem) }] } @@ -226,105 +194,64 @@ set nr_instances [apm_num_instances $package_key] if {$nr_instances > 0} { - set instances [subst { + set instancesHTML [subst { Installed instances of this package: $nr_instances }] } else { - set instances "No installed instance of this package\n" + set instancesHTML "No installed instance of this package\n" } if {$nr_instances == 0 || ($nr_instances > 0 && !$singleton_p)} { set href [export_vars -base package-instance-create { package_key {return_url [ad_return_url]}}] - set instance_create [subst { + set instance_createHTML [subst {
  • Create (unmounted) instance of this package
    • }] } else { - set instance_create "" + set instance_createHTML "" } -append body [subst { -
    -
    +set edit_package_info_href [export_vars -base version-edit {version_id}] +set version_files_href [export_vars -base version-files {version_id}] +set version_dependency_href [export_vars -base version-dependencies {version_id}] +set version_parameters_href [export_vars -base version-parameters {version_id}] +set version_callbacks_href [export_vars -base version-callbacks {version_id}] +set i18_href [export_vars -base version-i18n-index {version_id}] +set reload_href [export_vars -base version-reload {version_id {return_url [ad_return_url]}}] +set watch_href [export_vars -base package-watch {package_key {return_url [ad_return_url]}}] +set version_generate_href [export_vars -base version-generate-info {version_id}] - -

    Manage

    - -

    Reload

    - -

    XML .info package specification file

    -

    Disable/Uninstall