Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.180.2.33 -r1.180.2.34
--- openacs-4/packages/xowiki/xowiki.info 20 Feb 2020 10:15:21 -0000 1.180.2.33
+++ openacs-4/packages/xowiki/xowiki.info 28 Feb 2020 14:05:05 -0000 1.180.2.34
@@ -10,12 +10,12 @@
t
xowiki
-
- Gustaf Neumann
- A xotcl-based enterprise wiki system with multiple object types
- 2017-08-06
- WU Vienna
- <pre>
+
+ Gustaf Neumann
+ A xotcl-based enterprise wiki system with multiple object types
+ 2017-08-06
+ WU Vienna
+ <pre>
XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
trying to implement the full set of Wiki markup commands of systems
like MediaWiki, XoWiki is based on a rich text editor and focuses more
@@ -45,92 +45,92 @@
- different appearances (template_file)
- book-structures
- prototype pages
- - import/export
+ - import/export
- virtual presence
- analysis of collaboration networks
- forms
- named/unnamed pages
- various security policies
</pre>
- BSD-Style
- 2
+ BSD-Style
+ 2
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -N -r1.11.2.14 -r1.11.2.15
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl 6 Feb 2020 05:25:29 -0000 1.11.2.14
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl 28 Feb 2020 14:05:05 -0000 1.11.2.15
@@ -33,15 +33,6 @@
BootstrapNavbar instproc init {} {
::xo::Page requireJS urn:ad:js:jquery
- #
- # TODO: We should dynamically be able to determine (some of) the
- # CSP directives. However, for the time being, the URLs below are
- # trusted.
- #
- security::csp::require script-src maxcdn.bootstrapcdn.com
- security::csp::require style-src maxcdn.bootstrapcdn.com
- security::csp::require font-src maxcdn.bootstrapcdn.com
-
::xo::Page requireCSS urn:ad:css:bootstrap3
::xo::Page requireJS urn:ad:js:bootstrap3
next
@@ -510,8 +501,6 @@
BootstrapTableRenderer instproc render {} {
::xo::Page requireCSS urn:ad:css:bootstrap3
- security::csp::require style-src maxcdn.bootstrapcdn.com
- security::csp::require font-src maxcdn.bootstrapcdn.com
if {![nsf::is object [self]::__actions]} {:actions {}}
if {![nsf::is object [self]::__bulkactions]} {:__bulkactions {}}
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.6 -r1.3.2.7
--- openacs-4/packages/xowiki/tcl/resource-init.tcl 7 Feb 2020 08:44:05 -0000 1.3.2.6
+++ openacs-4/packages/xowiki/tcl/resource-init.tcl 28 Feb 2020 14:05:05 -0000 1.3.2.7
@@ -5,13 +5,19 @@
template::register_urn -urn urn:ad:js:jquery-ui -resource /resources/xowiki/jquery/jquery-ui.min.js
template::register_urn -urn urn:ad:css:jquery-ui -resource /resources/xowiki/jquery/jquery-ui.css
-template::register_urn -urn urn:ad:js:bootstrap3 -resource //maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js
+template::register_urn -urn urn:ad:js:bootstrap3 \
+ -resource //maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js \
+ -csp_list {script-src maxcdn.bootstrapcdn.com}
+
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
+ -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/highcharts.js
+ -resource //code.highcharts.com/highcharts.js \
+ -csp_list {script-src code.highcharts.com}
#template::register_urn -urn urn:ad:js:highcharts-theme -resource /resources/xowiki/highcharts/js/themes/gray.js
#
@@ -34,7 +40,10 @@
}
}
-template::register_urn -urn urn:ad:css:bootstrap3 -resource //maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css
+template::register_urn -urn urn:ad:css:bootstrap3 \
+ -resource //maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css \
+ -csp_list {font-src maxcdn.bootstrapcdn.com style-src maxcdn.bootstrapcdn.com}
+
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 \
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -N -r1.31.2.2 -r1.31.2.3
--- openacs-4/packages/xowiki/www/admin/index.tcl 14 May 2019 15:25:45 -0000 1.31.2.2
+++ openacs-4/packages/xowiki/www/admin/index.tcl 28 Feb 2020 14:05:05 -0000 1.31.2.3
@@ -14,9 +14,14 @@
set pretty_plural [$object_type set pretty_plural]
set title [_ xowiki.admin_all_title]
+set CSSToolkit [::xowiki::Package preferredCSSToolkit]
+if {$CSSToolkit eq "bootstrap"} {
+ template::head::add_css -href urn:ad:css:bootstrap3
+}
template::head::add_css \
- -href urn:ad:css:xowiki-[::xowiki::Package preferredCSSToolkit]
+ -href urn:ad:css:xowiki-$CSSToolkit
+
set object_types [$object_type object_types]
set return_url [ns_conn url]
set category_url [export_vars -base [::$package_id package_url] { {manage-categories 1} {object_id $package_id}}]
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -N -r1.38.2.5 -r1.38.2.6
--- openacs-4/packages/xowiki/www/admin/list.tcl 13 Feb 2020 07:48:05 -0000 1.38.2.5
+++ openacs-4/packages/xowiki/www/admin/list.tcl 28 Feb 2020 14:05:05 -0000 1.38.2.6
@@ -34,8 +34,12 @@
set with_children true
}
+set CSSToolkit [::xowiki::Package preferredCSSToolkit]
+if {$CSSToolkit eq "bootstrap"} {
+ template::head::add_css -href urn:ad:css:bootstrap3
+}
template::head::add_css \
- -href urn:ad:css:xowiki-[::xowiki::Package preferredCSSToolkit]
+ -href urn:ad:css:xowiki-$CSSToolkit
# if you would like to have a confirmation popup before deleting, uncomment the following lines
# template::add_confirm_handler -CSSclass "list delete-item-button" \