Index: openacs-4/packages/xowiki/tcl/resource-info-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/resource-info-procs.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 29 Jul 2020 11:00:15 -0000 1.1.2.1 @@ -0,0 +1,70 @@ +::xo::library doc { + Classes for creating, manageing and rendering trees + + @creation-date 2009-05-29 + @author Gustaf Neumann + @cvs-id $Id: resource-info-procs.tcl,v 1.1.2.1 2020/07/29 11:00:15 gustafn Exp $ +} + +namespace eval ::xowiki::bootstrap-treeview { + + ad_proc -private ::xowiki::bootstrap-treeview::resource_info { + {-version "1.2.0"} + } { + + Get information about available version(s) of bootstrap-treeview either + from the local filesystem, or from CDN. + + } { + # + # Setup variables for access via CDN vs. local resources. + # + set resourceDir [acs_package_root_dir xowiki/www/resources/bootstrap-treeview] + set resourceUrl /resources/xowiki/bootstrap-treeview + set cdn //cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview + + if {[file exists $resourceDir/$version/bootstrap-treeview.min.css]} { + set prefix $resourceUrl/$version + set cdnHost "" + } else { + set prefix $cdn/$version + set cdnHost cdnjs.cloudflare.com + } + + # + # Return the dict with at least the required fields + # + lappend result \ + resourceName "bootstrap-treeview" \ + resourceDir $resourceDir \ + cdn $cdn \ + cdnHost $cdnHost \ + prefix $prefix \ + cssFiles {bootstrap-treeview.min.css} \ + jsFiles {bootstrap-treeview.min.js} \ + extraFiles {} \ + urnMap { + urn:ad:css:bootstrap3-treeview bootstrap-treeview.min.css + urn:ad:js:bootstrap3-treeview bootstrap-treeview.min.js + } + + if {$cdnHost ne ""} { + lappend result csp_lists [subst { + urn:ad:css:bootstrap3-treeview { + style-src $cdnHost + } + urn:ad:js:bootstrap3-treeview { + script-src $cdnHost + } + }] + } + return $result + } +} + + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/xowiki/tcl/resource-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/resource-init.tcl,v diff -u -N -r1.3.2.10 -r1.3.2.11 --- openacs-4/packages/xowiki/tcl/resource-init.tcl 13 Jul 2020 12:02:33 -0000 1.3.2.10 +++ openacs-4/packages/xowiki/tcl/resource-init.tcl 29 Jul 2020 11:00:15 -0000 1.3.2.11 @@ -11,9 +11,6 @@ template::register_urn -urn urn:ad:js:get-http-object \ -resource /resources/xowiki/get-http-object.js -template::register_urn -urn urn:ad:js:bootstrap3-treeview \ - -resource //cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview/1.2.0/bootstrap-treeview.min.js \ - -csp_list {script-src cdnjs.cloudflare.com} template::register_urn -urn urn:ad:js:highcharts \ -resource //code.highcharts.com/7.0/highcharts.js \ @@ -46,9 +43,18 @@ template::register_urn -urn urn:ad:css:xowiki-yui -resource /resources/xowiki/xowiki-yui.css template::register_urn -urn urn:ad:css:xowiki-bootstrap -resource /resources/xowiki/xowiki-bootstrap3.css -template::register_urn -urn urn:ad:css:bootstrap3-treeview \ - -resource //cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview/1.2.0/bootstrap-treeview.min.css +set resource_info [xowiki::bootstrap-treeview::resource_info -version 1.2.0] +foreach URN [dict keys [dict get $resource_info urnMap]] { + template::register_urn \ + -urn $URN \ + -resource [dict get $resource_info prefix]/[dict get $resource_info urnMap $URN] \ + -csp_list [expr {[dict exists $resource_info csp_lists $URN] + ? [dict set $resource_info csp_lists $URN] + : ""}] +} + + # # Local variables: # mode: tcl Index: openacs-4/packages/xowiki/www/sitewide-admin/download.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/sitewide-admin/Attic/download.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/sitewide-admin/download.tcl 29 Jul 2020 11:00:15 -0000 1.1.2.1 @@ -0,0 +1,39 @@ +ad_page_contract { + @author Gustaf Neumann + + @creation-date Jan 04, 2017 +} { + {version:token,notnull ""} +} + +set resource_info [::xowiki::bootstrap-treeview::resource_info -version $version] +set resourceDir [dict get $resource_info resourceDir] +file mkdir $resourceDir/$version + +if {![file writable $resourceDir/$version]} { + error "directory $resourceDir/$version is not writable" +} + +::util::resources::download \ + -resource_info $resource_info \ + -version_dir $version + +# foreach url [dict get $resource_info downloadURLs] { +# set fn [file tail $url] +# set output [exec $unzip -o $resourceDir/$version/$fn -d $resourceDir/$version] +# file rename -- \ +# $resourceDir/$version/ckeditor \ +# $resourceDir/$version/$ck_package +# } + +ad_returnredirect . + +#https://cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview/1.2.0//bootstrap-treeview.min.css +# //cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview/1.2.0/bootstrap-treeview.min.css + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: + Index: openacs-4/packages/xowiki/www/sitewide-admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/sitewide-admin/Attic/index.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/sitewide-admin/index.adp 29 Jul 2020 11:00:15 -0000 1.1.2.1 @@ -0,0 +1,7 @@ + +@title;literal@ +@context;literal@ + +

@title;noquote@

+

Checking for @resoure_name@ in version @version@. + Index: openacs-4/packages/xowiki/www/sitewide-admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/sitewide-admin/Attic/index.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/sitewide-admin/index.tcl 29 Jul 2020 11:00:15 -0000 1.1.2.1 @@ -0,0 +1,19 @@ +ad_page_contract { + @author Gustaf Neumann + + @creation-date July, 2020 +} { +} +set version 1.2.0 +set resource_info [::xowiki::bootstrap-treeview::resource_info -version $version] +set resoure_name [dict get $resource_info resourceName] +set title "$resoure_name - Sitewide Admin" +set download_url download?version=$version +set context [list $title] + + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: