Index: openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info,v
diff -u -N -r1.15 -r1.15.2.1
--- openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info	14 Nov 2018 19:01:11 -0000	1.15
+++ openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info	27 Mar 2019 17:56:51 -0000	1.15.2.1
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>request-monitor</auto-mount>
 
-    <version name="0.53" url="http://media.wu-wien.ac.at/download/xotcl-request-monitor-0.53.apm">
+    <version name="0.54" url="http://media.wu-wien.ac.at/download/xotcl-request-monitor-0.54.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <summary>Request Monitor with user tracking functionality</summary>
@@ -34,9 +34,10 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xotcl-request-monitor" version="0.53"/>
+        <provides url="xotcl-request-monitor" version="0.54"/>
 	<requires url="acs-kernel" version="5.9.1"/>
         <requires url="xotcl-core" version="0.122"/>
+	<requires url="acs-templating" version="5.10.0d9"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/xotcl-request-monitor/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.tcl,v
diff -u -N -r1.31 -r1.31.2.1
--- openacs-4/packages/xotcl-request-monitor/www/index.tcl	30 Jan 2019 21:05:26 -0000	1.31
+++ openacs-4/packages/xotcl-request-monitor/www/index.tcl	27 Mar 2019 17:56:51 -0000	1.31.2.1
@@ -116,9 +116,16 @@
 if {$jsGraph} {
   set nonce [::security::csp::nonce]
 
-  template::add_body_script -src "//code.jquery.com/jquery-1.12.3.min.js"
+  if {[template::head::can_resolve_urn urn:ad:js:jquery]} {
+    template::add_body_script -src urn:ad:js:jquery
+  } else {
+    template::add_body_script -src "//code.jquery.com/jquery-1.12.3.min.js"
+    security::csp::require script-src code.jquery.com
+  }
+
   template::add_body_script -src "//code.highcharts.com/highcharts.js"
   template::add_body_script -src "//code.highcharts.com/modules/exporting.js"
+  security::csp::require script-src code.highcharts.com
 
   proc js_time {clock} {
     set year [clock format $clock -format %Y]