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 -r1.10.2.4 -r1.10.2.5
--- openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info	26 Apr 2016 07:25:29 -0000	1.10.2.4
+++ openacs-4/packages/xotcl-request-monitor/xotcl-request-monitor.info	6 Sep 2016 17:45:09 -0000	1.10.2.5
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>request-monitor</auto-mount>
 
-    <version name="0.46" url="http://media.wu-wien.ac.at/download/xotcl-request-monitor-0.46.apm">
+    <version name="0.47" url="http://media.wu-wien.ac.at/download/xotcl-request-monitor-0.47.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,7 +34,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xotcl-request-monitor" version="0.46"/>
+        <provides url="xotcl-request-monitor" version="0.47"/>
 	<requires url="acs-kernel" version="5.9.0b2"/>
         <requires url="xotcl-core" version="0.122"/>
 
Index: openacs-4/packages/xotcl-request-monitor/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.adp,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/xotcl-request-monitor/www/index.adp	9 Jun 2016 08:58:36 -0000	1.8.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/index.adp	6 Sep 2016 17:45:09 -0000	1.8.2.3
@@ -1,14 +1,6 @@
 <master>
 <property name="doc(title)">@title;literal@</property>
 
-<if @jsGraph@ eq 1>
-<property name="head">
-<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-<script type="text/javascript" src="//code.highcharts.com/highcharts.js"></script>
-<script type="text/javascript" src="//code.highcharts.com/modules/exporting.js"></script>
-</property>
-</if>
-
 <table style="border: 0px solid blue; padding: 10px;">
   <tr><td><strong>Active Users:</strong></td><td>@active_user_string;noquote@</td><if @param_url@ ne "">
 <td align="right"><a class="button" href="@param_url@">#acs-subsite.parameters#</a></td>
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 -r1.24.2.3 -r1.24.2.4
--- openacs-4/packages/xotcl-request-monitor/www/index.tcl	1 Feb 2016 16:52:48 -0000	1.24.2.3
+++ openacs-4/packages/xotcl-request-monitor/www/index.tcl	6 Sep 2016 17:45:09 -0000	1.24.2.4
@@ -4,7 +4,7 @@
   @author Gustaf Neumann
   @cvs-id $Id$
 } -query {
-  {jsGraph 1}
+  {jsGraph:boolean 1}
 } -properties {
   title:onevalue
   context:onevalue
@@ -101,7 +101,12 @@
 
 
 if {$jsGraph} {
+  set nonce [::security::nonce_token]
 
+  template::add_body_script -src "//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"
+  template::add_body_script -src "//code.highcharts.com/highcharts.js"
+  template::add_body_script -src "//code.highcharts.com/modules/exporting.js"
+  
   proc js_time {clock} {
     set year [clock format $clock -format %Y]
     set month [expr {[string trimleft [clock format $clock -format %N]] - 1}]
@@ -158,8 +163,7 @@
                 }
     }}]
 
-    set diagram [subst {
-    <script>
+    template::add_body_script -script [subst {
     \$('#$graphID').highcharts({
         chart: {
             type: 'line'
@@ -192,13 +196,11 @@
         },
         series: \[$series\]
     });
-    </script>
     }]
 
     #ns_log notice diagram=$diagram
     return [subst {
       <div id="$graphID" style="min-width: 640px; max-width: 100%; height: 240px; margin: 0 auto"></div>
-      $diagram
     }]
   }