Index: openacs-4/packages/acs-developer-support/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-developer-support/www/index.tcl	27 Oct 2014 16:39:34 -0000	1.21
+++ openacs-4/packages/acs-developer-support/www/index.tcl	15 Jun 2015 20:27:13 -0000	1.22
@@ -31,7 +31,7 @@
 
 <li>Developer support information is currently
 restricted to the following IP addresses:
-<ul type=disc>
+<ul>
 "
 
 set enabled_ips [nsv_get ds_properties enabled_ips]
@@ -51,18 +51,19 @@
     }
 }
 if { !$includes_this_ip_p } {
-    append body "<li><a href=\"add-ip?ip=[ad_conn peeraddr]\">add your IP, [ad_conn peeraddr]</a>\n"
+    append body "<li><a href='[ns_quotehtml add-ip?ip=[ad_conn peeraddr]'>add your IP, [ad_conn peeraddr]</a>\n"
 }
 
 set requests [nsv_array names ds_request]
 
+set parameterHref [export_vars -base /shared/parameters { package_id { return_url {[ad_return_url]} } }]
 append body "
 </ul>
 
 <li>Information is being swept every [parameter::get -parameter DataSweepInterval -default 900] sec
 and has a lifetime of [parameter::get -parameter DataLifetime -default 900] sec
 
-<li><a href=\"/shared/parameters?[export_vars { package_id { return_url {[ad_return_url]} } }]\">Set package parameters</a>
+<li><a href='[ns_quotehtml $parameterHref]'>Set package parameters</a>
 
 <p>
 
@@ -87,7 +88,7 @@
      "off (<a href=\"set?field=adp&amp;enabled_p=1\">turn it on</a>)"]
 
 <p>
-<li> Help on <a href=\"doc/editlocal\">edit and code links</a>.
+<li> Help on <a href='doc/editlocal'>edit and code links</a>.
 </ul>
 
 <h3>Available Request Information</h3>
@@ -97,15 +98,15 @@
 if { [llength $requests] == 0 } {
     append body "There is no request information available."
 } else {
-    append body "
-<table cellspacing=0 cellpadding=0>
-<tr bgcolor=#AAAAAA>
+    append body [subst {
+<table cellspacing="0" cellpadding="0">
+<tr style="background:#AAAAAA">
 <th>Time</th>
 <th>Duration</th>
 <th>IP</th>
 <th>Request</th>
 </tr>
-"
+    }]
 
     set colors {white #EEEEEE}
     set counter 0
@@ -167,23 +168,27 @@
 		set query ""
 	    }
             if {[ns_cache get ds_page_bits $id:error dummy]} {
-                set elink " <a href=\"send?output=$id:error\" style=\"color: red\">Errors</span></a>"
+                set elink [subst { <a href="send?output=$id:error" style="color: red">Errors</span></a>}]
             } else { 
                 set elink {}
             }
-	    append body "
-<tr bgcolor=[lindex $colors [expr { $counter % [llength $colors] }]]>
+	    append body [subst {
+<tr style="background:[lindex $colors [expr { $counter % [llength $colors] }]]">
 <td align=center>&nbsp;$start&nbsp;</td>
 <td align=right>&nbsp;$duration&nbsp;</td>
 <td>&nbsp;$peeraddr&nbsp;</td>
-<td><a href=\"request-info?request=$id\">[ns_quotehtml "$method $url$query"]</a>$elink</td>
+		<td><a href="request-info?request=[ns_quotehtml $id]">[ns_quotehtml "$method $url$query"]</a>$elink</td>
 </tr>
-"
+	    }]
             incr counter
         }
     }
     if { $show_more > 0 } {
-	append body "<tr><td colspan=4 align=right><a href=\"index?request_limit=0\"><i>show $show_more more requests</i></td></tr>\n"
+	append body [subst {
+	    <tr><td colspan="4" align="right"><a href="index?request_limit=0">
+	    <i>show $show_more more requests</i></td>
+	    </tr>
+	}]
     }
 
     append body "</table>\n"
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.6 -r1.7
--- openacs-4/packages/xotcl-request-monitor/www/index.adp	27 Oct 2014 16:42:02 -0000	1.6
+++ openacs-4/packages/xotcl-request-monitor/www/index.adp	15 Jun 2015 20:27:47 -0000	1.7
@@ -35,10 +35,11 @@
 @response_trend;noquote@
 
 <tr><td colspan='2'><h3 style="margin-top:10px;">Throttle Statistics</h3></td></tr>
-@throttle_stats;noquote@<br>
+<tr><td>@throttle_stats;noquote@</td></tr>
 
-Detailed <a href='throttle-statistics'>Throttle statistics</a>
 </table>
+<p>Detailed <a href='throttle-statistics'>Throttle statistics</a>
+
 </if>
 <else>
 <h3 style='text-align: center;'>Page View Statistics</h3>
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.23 -r1.24
--- openacs-4/packages/xotcl-request-monitor/www/index.tcl	27 Oct 2014 16:42:02 -0000	1.23
+++ openacs-4/packages/xotcl-request-monitor/www/index.tcl	15 Jun 2015 20:27:47 -0000	1.24
@@ -128,7 +128,7 @@
     regsub -all {,0} $end , end
     #ns_log Notice "begin: $begin, end: $end, $size $type"
 
-    set diagram [subst {<SCRIPT Language='JavaScript'>
+    set diagram [subst {<script type="text/javascript">
       document.open();
       var D=new Diagram();
       D.SetFrame(40, 20, 460, 120);
@@ -187,8 +187,8 @@
 	}
 	set cl [expr {$c%2==0?"list-even":"list-odd"}]
 	append text [subst {
-	  <tr class='$cl'><td><font size='-2'>[lindex $v 0]</font></td>
-	  <td align='right'><font size='-2'>[lindex $v 1] $rps</font></td></tr>
+	  <tr class='$cl'><td><small>[lindex $v 0]</small></td>
+	  <td align='right'><small>[lindex $v 1] $rps</small></td></tr>
 	}]
       }
       append text "</table>\n</td></tr>\n"