Index: openacs-4/packages/boomerang/boomerang.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/boomerang.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/boomerang/boomerang.info 9 Jan 2018 14:16:21 -0000 1.2 +++ openacs-4/packages/boomerang/boomerang.info 10 Jan 2018 11:17:49 -0000 1.3 @@ -9,8 +9,8 @@ f f - + Gustaf Neumann @@ -33,7 +33,7 @@ BSD License 0 - + Index: openacs-4/packages/boomerang/tcl/boomerang-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/tcl/boomerang-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/boomerang/tcl/boomerang-procs.tcl 9 Jan 2018 09:51:19 -0000 1.9 +++ openacs-4/packages/boomerang/tcl/boomerang-procs.tcl 10 Jan 2018 11:17:49 -0000 1.10 @@ -339,8 +339,9 @@ set version_info [version_info] set prefix [dict get $version_info prefix] - - template::head::add_javascript -src $prefix/boomerang-${version}.min.js + foreach jsFile [dict get $version_info jsFiles] { + template::head::add_javascript -src ${prefix}/$jsFile + } # # One could add additional plugins here, but many are # already included in the provided .min.js file via the @@ -414,11 +415,12 @@ set prefix $cdn/$version/ lappend result host "cdnjs.cloudflare.com" } + lappend result \ cdn $cdn \ prefix $prefix \ cssFiles {} \ - jsFiles [list boomerang.js] + jsFiles [list boomerang-${version}.min.js] return $result } Index: openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl 10 Jan 2018 11:17:49 -0000 1.1 @@ -0,0 +1,20 @@ +ad_page_contract { + @author Gustaf Neumann + + @creation-date Jan 10, 2018 +} { + {version:word,notnull ""} +} + +set resource_prefix [acs_package_root_dir boomerang/www/resources] +set version_info [::boomerang::version_info] +set jsFile [lindex [dict get $version_info jsFiles] 0] +set plainFile $resource_prefix/$jsFile +set gzip [::util::which gzip] + +if {$gzip ne ""} { + ns_log notice "WANT TO COMPRESS <$resource_prefix> <$plainFile>" + exec $gzip -9 -k $plainFile +} +ad_returnredirect . +ad_script_abort Index: openacs-4/packages/boomerang/www/sitewide-admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/index.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/boomerang/www/sitewide-admin/index.adp 10 Jan 2018 11:17:49 -0000 1.1 @@ -0,0 +1,28 @@ + +@title;literal@ +@context;literal@ + +

@title;noquote@

+

+The current version of the @what@ is @version@. +The JavaScript code of the @what@ is installed locally +under
@resource_prefix@. +

This directory is not writable for the server. + + +

+ The JavaScript file @jsFile@ is not compressed. + +

Do you want to compress it now? compress +

+ + +

The directory @resource_prefix@ is + NOT writable for the server. If you make it writable, + you can compress the JavaScript file over this interface.

+
+ + +

There is a compressed version of @jsFile@ that can be used for +delivery via NaviServer. + Index: openacs-4/packages/boomerang/www/sitewide-admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/index.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/boomerang/www/sitewide-admin/index.tcl 10 Jan 2018 11:17:49 -0000 1.1 @@ -0,0 +1,28 @@ +set title "Cookie Consent Sitewide Admin" +set context [list $title] + +set resource_prefix [acs_package_root_dir boomerang/www/resources] +set what "Boomerang Plugin" +set version $::boomerang::version + +# +# Get version info about the resource files of this package. If not +# locally installed, offer a link for download. +# +set version_info [::boomerang::version_info] +set prefix [dict get $version_info prefix] +set jsFile [lindex [dict get $version_info jsFiles] 0] +set plainFile $resource_prefix/$jsFile +set gzip [::util::which gzip] + +set writable [file writable $resource_prefix] + +if {$writable} { + ns_log notice "check for <$plainFile.gz>" + if {[file exists $plainFile.gz]} { + set compressedFile $plainFile.gz + } +} else { + set path $resource_prefix +} +