Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -N -r1.32.2.5 -r1.32.2.6
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	27 Sep 2016 07:57:48 -0000	1.32.2.5
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	8 Nov 2016 11:29:07 -0000	1.32.2.6
@@ -378,27 +378,32 @@
     set return_string ""
     set counter 0
 
-    append return_string "<form name=submenu ACTION=/redir>
-<select name=\"url\" onchange=\"go_to_url(this.options\[this.selectedIndex\].value)\">"
+    set selectid id[clock clicks -microseconds]
+    append return_string [subst {<form name="submenu" action="/redir">
+        <select name="url" id="$selectid">}]
 
+    template::add_event_listener \
+        -id $selectid -event change \
+        -script {go_to_url(this.options[this.selectedIndex].value);}
+
     foreach item $items {
 	set url_stub [ad_conn url]
 
 	# if the url matches the url you would redirect to, as determined
 	# either by highlight_url, or if highlight_url is not set,
 	# the current url then select it
 	if {$highlight_url ne "" && $highlight_url == [lindex $urls $counter]} {
- 	    append return_string "<OPTION VALUE=\"[lindex $urls $counter]\" selected>$item"
+ 	    append return_string [subst {<option value="[lindex $urls $counter]" selected>$item}]
 	} elseif {$highlight_url eq "" && [string match "*$url_stub*" [lindex $urls $counter]]} {
-	    append return_string "<OPTION VALUE=\"[lindex $urls $counter]\" selected>$item"
+	    append return_string [subst {<option value="[lindex $urls $counter]" selected>$item}]
 	} else {
-	    append return_string "<OPTION VALUE=\"[lindex $urls $counter]\">$item"
+	    append return_string [subst {<option value="[lindex $urls $counter]">$item}]
 	}
 	incr counter
     }
     
     append return_string "</select><br>
-    <noscript><input type=\"Submit\" value=\"GO\">
+    <noscript><input type='submit' value='GO'>
     </noscript>
     </form>\n"
 }
Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl,v
diff -u -N -r1.18.2.4 -r1.18.2.5
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	1 Mar 2016 07:30:10 -0000	1.18.2.4
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	8 Nov 2016 11:29:07 -0000	1.18.2.5
@@ -383,9 +383,14 @@
 } {
     Returns a color selection widget, optionally using JavaScript. Default is a string of the form '0,192,255'.
 } {
-    set out "<table cellspacing=0 cellpadding=0><tr><td><select name=$name.list"
+    set out {<table cellspacing="0" cellpadding="0"><tr><td>}
+    append out [subst {<select name="$name.list"}]
     if { $use_js != 0 } {
-	append out " onChange=\"adUpdateColorText('$name')\""
+        set id [clock clicks -microseconds]
+	append out [subst { id="select-$id"}]
+        template::add_event_listener \
+            -id select-$id -event change \
+            -script [subst {adUpdateColorText('$name');}]
     }
     append out ">\n"
 
@@ -406,9 +411,12 @@
     }
 
     foreach component { c1 c2 c3 } {
-	append out " <input name=$name.$component size=3 value=\"[set $component]\""
+	append out [subst { <input name="$name.$component" size="3" value="[set $component]"}]
 	if { $use_js } {
-	    append out " onChange=\"adUpdateColorList('$name')\""
+            append out [subst { id="input-$component-$id"}]
+            template::add_event_listener \
+                -id input-$component-$id -event change \
+                -script [subst {adUpdateColorList('$name');}]
 	}
 	append out ">"
     }
@@ -419,7 +427,9 @@
 	    set c2 255
 	    set c3 255
 	}
-	append out "</td><td>&nbsp; <img name=\"color_$name\" src=\"/shared/1pixel.tcl?r=$c1&g=$c2&b=$c3\" width=\"26\" height=\"26\" style=\"border:1\">"
+	append out [subst {</td><td>&nbsp;
+            <img name="color_$name" src="/shared/1pixel.tcl?r=$c1&g=$c2&b=$c3" width="26" height="26" style="border:1">
+        }]
     }
     append out "</td></tr></table>\n"
     return $out