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 -r1.18 -r1.19
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	27 Oct 2014 16:40:09 -0000	1.18
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	7 Aug 2017 23:48:00 -0000	1.19
@@ -17,7 +17,7 @@
     }
 
     db_foreach all_states {
-	select state_name, abbrev from us_states order by state_name
+        select state_name, abbrev from states order by state_name
     } {
         if { $default == $abbrev } {
             append widget_value "<option value=\"$abbrev\" selected=\"selected\">$state_name</option>\n" 
@@ -47,7 +47,7 @@
 	}
     }
     db_foreach all_countries {
-	select default_name, iso from countries order by default_name 
+        select default_name, iso from countries order by default_name
     } {
         if { $default == $iso } {
             append widget_value "<option value=\"$iso\" selected=\"selected\">$default_name</option>\n" 
@@ -168,12 +168,8 @@
 } {
     # if you would like the default to be null, call with value= ""
 
-    if {[ns_info name] ne "NaviServer"} {
-        ns_share NS
-    } else {
-        set NS(months) [list January February March April May June \
-                            July August September October November December]
-    }
+    set NS(months) [list January February March April May June \
+                        July August September October November December]
 
     if { $value == 0 } {
 	# no default, so use today
@@ -276,15 +272,15 @@
 	    }
 	} if_no_rows {
 	    if {$default ne ""} { 
-		return "<input type=\"hidden\" value=\"[ad_quotehtml $default]\" name=\"$name\">\n"
+		return "<input type=\"hidden\" value=\"[ns_quotehtml $default]\" name=\"$name\">\n"
 	    } else { 
 		return {}            
 	    }
 	}
     }
 
     if { $count == 1 || ($dbcount == 1 && $hidden_if_one_db) } {
-        return "$item<input type=\"hidden\" value=\"[ad_quotehtml $value]\" name=\"$name\">\n"
+        return "$item<input type=\"hidden\" value=\"[ns_quotehtml $value]\" name=\"$name\">\n"
     } elseif {!$count && !$dbcount && $blank_if_no_db} {
 	return {}
     } else { 
@@ -387,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"
 
@@ -410,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 ">"
     }
@@ -423,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
@@ -454,3 +460,9 @@
     }
 }
 
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: