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 -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} \