Index: openacs-4/packages/acs-tcl/acs-tcl.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v diff -u -N -r1.88 -r1.89 --- openacs-4/packages/acs-tcl/acs-tcl.info 1 Aug 2018 17:11:47 -0000 1.88 +++ openacs-4/packages/acs-tcl/acs-tcl.info 2 Aug 2018 11:20:04 -0000 1.89 @@ -9,7 +9,7 @@ f t - + OpenACS The Kernel Tcl API library. 2017-08-06 @@ -18,7 +18,7 @@ GPL version 2 3 - + Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -N -r1.170 -r1.171 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 1 Aug 2018 17:24:14 -0000 1.170 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 2 Aug 2018 11:20:04 -0000 1.171 @@ -4026,9 +4026,10 @@ # The configuration information is provided via dict named resource_info, # containing typically the following fields: # -# - resource_dir: the top-level directory on the local disk, +# - resourceDir: the top-level directory on the local disk, # where the resource are to be stored -# - cdn: the CDN which olds the content +# - cdn: the CDN URL prefix for obtaining the content (e.g. //maxcdn.bootstrapcdn.com/bootstrap) +# - cdnHost: CDN host, sometimes needed for content security policies # - cssFiles: list of CSS files for that package (can be provided via URN) # - jsFiles: list oj JavaScript files for that package (can be provided via URN) # - extraFiles: list of more files, probably included by cssFiles (e.g. fonts) @@ -4046,13 +4047,13 @@ When the version_dir is specified, it is possible to have different versions locally installed. - @param resource_info a dict containing resource_dir, cssFiles, jsFiles, and extraFiles - @param resource_dir the www/resources directory of the package + @param resource_info a dict containing resourceDir, cssFiles, jsFiles, and extraFiles + @param version_dir an optional directory, under the resource directory @author Gustaf Neumann } { set installed 1 - set resource_dir [dict get $resource_info resource_dir] + set resource_dir [dict get $resource_info resourceDir] set files [concat \ [dict get $resource_info cssFiles] \ [dict get $resource_info jsFiles] \ @@ -4080,13 +4081,13 @@ Check, whether the operating system's permissions allow us to install in the configured directories. - @param resource_info a dict containing at least resource_dir + @param resource_info a dict containing at least resourceDir @param version_dir an optional directory, under the resource directory @author Gustaf Neumann } { set can_install 1 - set resource_dir [dict get $resource_info resource_dir] + set resource_dir [dict get $resource_info resourceDir] if {![file isdirectory $resource_dir]} { try { @@ -4118,13 +4119,12 @@ Download resources typically from a CDN and install it for local usage. The installed files are as well gzipped for faster delivery, when gzip is available.- - @param resource_dir the www/resources directory of the package @param version_dir an optional directory, under the resource directory - @param resource_info a dict containing resource_dir, cdn, cssFiles, jsFiles, and extraFiles + @param resource_info a dict containing resourceDir, cdn, cssFiles, jsFiles, and extraFiles @author Gustaf Neumann } { - set resource_dir [dict get $resource_info resource_dir] + set resource_dir [dict get $resource_info resourceDir] set can_install [::util::resources::can_install_locally \ -resource_info $resource_info \ -version_dir $version_dir] Index: openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 2 Aug 2018 09:13:17 -0000 1.4 +++ openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 2 Aug 2018 11:20:04 -0000 1.5 @@ -9,22 +9,21 @@ f f - + manderga Theme for OpenACS based on Twitter Bootstrap 3 2017-08-06 WU Vienna This package provides a Theme based on Twitter Bootstrap 3. The theme can be activated via "/admin/configure" and it can be configured via - "/shared/parameters". - This theme is currently in use at openacs.org + "/shared/parameters". This theme is currently in use at openacs.org GPL version 2 2 - - + + Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 2 Aug 2018 09:13:17 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 2 Aug 2018 11:20:04 -0000 1.2 @@ -7,24 +7,28 @@ packages. The goal is to deliver resources either from the local file system, or from CDN. + @return dict containing cdn, cdnHost, resourceDir, prefix, cssFiles, jsFiles and extraFiles. + } { # # Provide paths for loading either via resources or CDN # - set resource_dir [acs_package_root_dir openacs-bootstrap3-theme/www/resources]/bootstrap - set resource_url /resources/openacs-bootstrap3-theme/bootstrap - set cdn "//maxcdn.bootstrapcdn.com/bootstrap" - set version $openacs_bootstrap3_theme::bootstrap_version + set resourceDir [acs_package_root_dir openacs-bootstrap3-theme/www/resources]/bootstrap + set resourceUrl /resources/openacs-bootstrap3-theme/bootstrap + set cdn "//maxcdn.bootstrapcdn.com/bootstrap" + set version $openacs_bootstrap3_theme::bootstrap_version - if {[file exists $resource_dir/$version]} { - set prefix $resource_url/$version + if {[file exists $resourceDir/$version]} { + set prefix $resourceUrl/$version + set cdnHost "" } else { set prefix $cdn/$version + set cdnHost maxcdn.bootstrapcdn.com } lappend result \ cdn $cdn \ - resource_dir $resource_dir \ + resourceDir $resourceDir \ prefix $prefix \ cssFiles {css/bootstrap.min.css} \ jsFiles {js/bootstrap.min.js} \ Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 2 Aug 2018 09:13:17 -0000 1.1 +++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 2 Aug 2018 11:20:04 -0000 1.2 @@ -16,7 +16,7 @@ # locally installed, offer a link for download. # set resource_info [::openacs_bootstrap3_theme::resource_info] -set resource_dir [dict get $resource_info resource_dir] +set resource_dir [dict get $resource_info resourceDir] set cdn [dict get $resource_info cdn] #