Index: openacs-4/packages/fa-icons/tcl/resource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/tcl/resource-procs.tcl,v diff -u -r1.1.2.11 -r1.1.2.12 --- openacs-4/packages/fa-icons/tcl/resource-procs.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.11 +++ openacs-4/packages/fa-icons/tcl/resource-procs.tcl 30 Jul 2024 10:25:44 -0000 1.1.2.12 @@ -12,21 +12,22 @@ } namespace eval ::fa_icons { + variable parameter_info - set package_id [apm_package_id_from_key "fa-icons"] - # - # The Font Awesome Icons configuration can be tailored via the OpenACS + # The version configuration can be tailored via the OpenACS # configuration file: # # ns_section ns/server/${server}/acs/fa-icons # ns_param FAIconsVersion 6.5.2 # - set ::fa_icons::version [parameter::get \ - -package_id $package_id \ - -parameter FAIconsVersion \ - -default 6.5.2] + set parameter_info { + package_key fa-icons + parameter_name FAIconsVersion + default_value 6.5.2 + } + ad_proc ::fa_icons::resource_info { {-version ""} } { @@ -35,11 +36,17 @@ from the local filesystem, or from CDN. } { + variable parameter_info # - # If no version is specified, use the namespaced variable. + # If no version is specified, use the configured value # if {$version eq ""} { - set version $::fa_icons::version + dict with parameter_info { + set version [::parameter::get_global_value \ + -package_key $package_key \ + -parameter $parameter_name \ + -default $default_value] + } } # @@ -90,6 +97,7 @@ cspMap $cspMap \ urnMap {} \ versionCheckAPI {cdn cdnjs library font-awesome count 5} \ + parameterInfo $parameter_info \ configuredVersion $version return $result @@ -104,7 +112,7 @@ } { set resource_info [resource_info -version $version] - + # # If no version is specified, use the version from resouce_info #