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.20.8.6 -r1.20.8.7 --- openacs-4/packages/acs-admin/www/apm/version-view.tcl 3 Sep 2014 12:59:26 -0000 1.20.8.6 +++ openacs-4/packages/acs-admin/www/apm/version-view.tcl 3 Sep 2014 13:01:01 -0000 1.20.8.7 @@ -17,8 +17,8 @@ tarball_length, distribution_uri, to_char(deactivation_date, 'Month DD, YYYY') as deactivation_date, to_char(distribution_date, 'Month DD, YYYY') as distribution_date - from apm_package_version_info - where version_id = :version_id + from apm_package_version_info + where version_id = :version_id } set downloaded_p [ad_decode $version_uri "" 0 1] @@ -28,8 +28,8 @@ # installed and enabled. db_0or1row apm_enabled_version_info { select version_id as installed_version_id, version_name as installed_version_name, - enabled_p as installed_enabled_p, - apm_package_version.version_name_greater(version_name, :version_name) as version_name_greater + enabled_p as installed_enabled_p, + apm_package_version.version_name_greater(version_name, :version_name) as version_name_greater from apm_package_versions where package_key = :package_key and installed_p = 't' @@ -38,11 +38,11 @@ db_0or1row apm_data_model_install_version { select data_model_installed_version from ( - select version_name as data_model_installed_version - from apm_package_versions - where package_key = :package_key - and data_model_loaded_p = 't' - order by apm_package_version.sortable_version_name(version_name) desc + select version_name as data_model_installed_version + from apm_package_versions + where package_key = :package_key + and data_model_loaded_p = 't' + order by apm_package_version.sortable_version_name(version_name) desc ) where rownum = 1 } @@ -52,7 +52,7 @@ } foreach field { summary description release_date vendor } { if { [set $field] eq "" } { - set $field "-" + set $field "-" } } @@ -63,36 +63,36 @@ if { ![info exists installed_version_id] } { if { !$downloaded_p } { - set status [subst { - No version of this package is installed: there is no .info file in the - packages/$package_key directory. If you're building the package now, you probably - want to generate one. - }] + set status [subst { + No version of this package is installed: there is no .info file in the + packages/$package_key directory. If you're building the package now, you probably + want to generate one. + }] } else { - set status [subst { - No version of this package is installed. You may - install this package now. - }] + set status [subst { + No version of this package is installed. You may + install this package now. + }] } lappend prompts $status } elseif { $installed_version_id == $version_id } { set status "This version of the package is installed" if { $enabled_p == "t" } { - append status " and enabled." - set can_disable_p 1 + append status " and enabled." + set can_disable_p 1 } else { - append status " but disabled." - set can_enable_p 1 + append status " but disabled." + set can_enable_p 1 } } else { set status [subst { - [ad_decode $version_name_greater -1 "An older" "A newer"] version of this package, - version $installed_version_name, is installed and [ad_decode $installed_enabled_p "t" "enabled" "disabled"]. + [ad_decode $version_name_greater -1 "An older" "A newer"] version of this package, + version $installed_version_name, is installed and [ad_decode $installed_enabled_p "t" "enabled" "disabled"]. }] if { $version_name_greater < 0 } { - append body [subst { - You may upgrade to this version now. - }] + append body [subst { + You may upgrade to this version now. + }] } } @@ -117,9 +117,9 @@ select owner_uri, owner_name from apm_package_owners where version_id = :version_id } { if { $owner_uri eq "" } { - lappend owners $owner_name + lappend owners $owner_name } else { - lappend owners "$owner_name ($owner_uri)" + lappend owners "$owner_name ($owner_uri)" } } @@ -135,26 +135,26 @@ set title "$pretty_name $version_name" set context [list \ - [list "../developer" "Developer's Administration"] \ - [list "/acs-admin/apm/" "Package Manager"] \ - $title] + [list "../developer" "Developer's Administration"] \ + [list "/acs-admin/apm/" "Package Manager"] \ + $title] append body [subst { -$prompt_text + $prompt_text -

Package Information

+

Package Information

-
- - - - - - - - - - +
+
Package Name:$pretty_name
Version:$version_name
OpenACS Core:[ad_decode $initial_install_p "t" "Yes" "No"]
Singleton:[ad_decode $singleton_p "t" "Yes" "No"]
Implements Subsite:[ad_decode $implements_subsite_p t Yes No]
Inherit Templates:[ad_decode $inherit_templates_p t Yes No]
Auto-mount:$auto_mount
Status:$status
Data Model:$data_model_status
+ + + + + + + + + }] set supported_databases_list [apm_package_supported_databases $package_key] @@ -165,13 +165,13 @@ } append body [subst { - - - - - - - + + + + + + + }] # Dynamic package version attributes @@ -182,40 +182,40 @@ foreach attribute_name [array names attributes] { array set attribute $all_attributes($attribute_name) append body [subst { - + }] } append body [subst { - - - - + + + -
Package Name:$pretty_name
Version:$version_name
OpenACS Core:[ad_decode $initial_install_p "t" "Yes" "No"]
Singleton:[ad_decode $singleton_p "t" "Yes" "No"]
Implements Subsite:[ad_decode $implements_subsite_p t Yes No]
Inherit Templates:[ad_decode $inherit_templates_p t Yes No]
Auto-mount:$auto_mount
Status:$status
Data Model:$data_model_status
Database Support:$supported_databases
CVS:$cvs_status
[ad_decode [llength $owners] 1 "Owner" "Owners"]:[join $owners "
"]
Package Key:$package_key
Summary:$summary
Description:$description
Release Date:$release_date
Database Support:$supported_databases
CVS:$cvs_status
[ad_decode [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)
$attribute(pretty_name):$attributes($attribute_name)
Vendor:[ad_decode $vendor_uri "" $vendor "$vendor"]
Package URL:$package_uri
Version URL:$version_uri
Distribution File: +
Vendor:[ad_decode $vendor_uri "" $vendor "$vendor"]
Package URL:$package_uri
Version URL:$version_uri
Distribution File: }] if { $tarball_length ne "" && $tarball_length > 0 } { append body [subst { - [format "%.1f" [expr { $tarball_length / 1024.0 }]]KB + [format "%.1f" [expr { $tarball_length / 1024.0 }]]KB }] if { $distribution_uri eq "" } { - append body "(generated on this system" - if { $distribution_date ne "" } { - append body " on $distribution_date" - } - append body ")" + append body "(generated on this system" + if { $distribution_date ne "" } { + append body " on $distribution_date" + } + append body ")" } else { - append body "(downloaded from $distribution_uri" - if { $distribution_date ne "" } { - append body " on $distribution_date" - } - append body ")" + append body "(downloaded from $distribution_uri" + if { $distribution_date ne "" } { + append body " on $distribution_date" + } + append body ")" } } else { append body "None available" if { $installed_p == "t" } { - append body [subst { - (generate one now from the filesystem) - }] + append body [subst { + (generate one now from the filesystem) + }] } } @@ -228,33 +228,33 @@ }] } else { set instances "No installed instance of this package\n" - } +} append body [subst { -
-
+ + + - -

Manage

- -

Reload

- -

XML .info package specification file

-