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.6 -r1.6.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 3 Aug 2018 09:50:08 -0000 1.6 +++ openacs-4/packages/openacs-bootstrap3-theme/openacs-bootstrap3-theme.info 22 Apr 2019 10:21:39 -0000 1.6.2.1 @@ -9,7 +9,7 @@ f f - + manderga Theme for OpenACS based on Twitter Bootstrap 3 2017-08-06 @@ -22,10 +22,10 @@ GPL version 2 2 - + - - + + Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl,v diff -u -N -r1.6 -r1.6.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl 13 Oct 2018 15:49:13 -0000 1.6 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl 22 Apr 2019 10:21:39 -0000 1.6.2.1 @@ -8,45 +8,46 @@ # Insert this package's themes db_transaction { - subsite::new_subsite_theme \ + -create_or_replace \ -key openacs_bootstrap3 \ -name #openacs-bootstrap3-theme.tabbed# \ -template tabbed-master \ -css { - {-href /resources/acs-subsite/site-master.css -media all -order 0} - {-href urn:ad:css:bootstrap3 -media all -order 1} - {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} - {-href /resources/openacs-bootstrap3-theme/css/color/grey.css -media all -order 3} - {-href /resources/acs-templating/forms.css -media all -order 4} - {-href /resources/acs-templating/lists.css -media all -order 5} + {-href /resources/acs-subsite/site-master.css -media all -order 0} + {-href urn:ad:css:bootstrap3 -media all -order 1} + {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} + {-href /resources/openacs-bootstrap3-theme/css/color/grey.css -media all -order 3} + {-href /resources/acs-templating/forms.css -media all -order 4} + {-href /resources/acs-templating/lists.css -media all -order 5} } \ -js { - {-src /resources/openacs-bootstrap3-theme/js/jquery-1.12.3.min.js -order 1} - {-src urn:ad:js:bootstrap3 -order 2} - } \ - -form_template standard \ - -list_template table \ + {-src urn:ad:js:jquery -order 1} + {-src urn:ad:js:bootstrap3 -order 2} + } \ + -form_template standard \ + -list_template table \ -list_filter_template filters \ -dimensional_template dimensional \ -resource_dir /packages/openacs-bootstrap3-theme/resources \ - -streaming_head tabbed-streaming-head \ + -streaming_head tabbed-streaming-head - subsite::new_subsite_theme \ + subsite::new_subsite_theme \ + -create_or_replace \ -key openacs_bootstrap3_turquois \ -name #openacs-bootstrap3-theme.tabbed-turquois# \ -template tabbed-master-turquois \ -css { - {-href /resources/acs-subsite/site-master.css -media all -order 0} - {-href urn:ad:css:bootstrap3 -media all -order 1} - {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} - {-href /resources/openacs-bootstrap3-theme/css/color/turquois.css -media all -order 3} - {-href /resources/acs-templating/forms.css -media all -order 4} - {-href /resources/acs-templating/lists.css -media all -order 5} + {-href /resources/acs-subsite/site-master.css -media all -order 0} + {-href urn:ad:css:bootstrap3 -media all -order 1} + {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2} + {-href /resources/openacs-bootstrap3-theme/css/color/turquois.css -media all -order 3} + {-href /resources/acs-templating/forms.css -media all -order 4} + {-href /resources/acs-templating/lists.css -media all -order 5} } \ -js { - {-src /resources/openacs-bootstrap3-theme/js/jquery-1.12.3.min.js -order 1} - {-src urn:ad:js:bootstrap3 -order 2} + {-src urn:ad:js:jquery -order 1} + {-src urn:ad:js:bootstrap3 -order 2} } \ -form_template standard \ -list_template table \ 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.5.2.1 -r1.5.2.2 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 1 Apr 2019 20:13:56 -0000 1.5.2.1 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 22 Apr 2019 10:21:39 -0000 1.5.2.2 @@ -1,5 +1,5 @@ namespace eval openacs_bootstrap3_theme { - set bootstrap_version 3.3.7 + set bootstrap_version 3.4.1 ad_proc -private ::openacs_bootstrap3_theme::resource_info {} { @@ -8,7 +8,7 @@ local file system, or from CDN. @return dict containing resourceDir, resourceName, cdn, - cdnHost, prefix, cssFiles, jsFiles and extraFiles. + cdnHost, prefix, cssFiles, jsFiles and extraFiles. } { # Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl 20 Oct 2018 16:36:35 -0000 1.3 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/resource-init.tcl 22 Apr 2019 10:21:39 -0000 1.3.2.1 @@ -12,8 +12,11 @@ set prefix [dict get $resource_info prefix] foreach URN [dict keys [dict get $resource_info urnMap]] { - ns_log notice "TEST -urn $URN -resource $prefix/[dict get $resource_info urnMap $URN]" template::register_urn \ -urn $URN \ -resource $prefix/[dict get $resource_info urnMap $URN] } + +template::register_urn \ + -urn urn:ad:js:jquery \ + -resource /resources/openacs-bootstrap3-theme/js/jquery-3.4.0.min.js