Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	20 Aug 2002 12:39:46 -0000	1.12
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	2 Sep 2002 13:20:39 -0000	1.13
@@ -632,11 +632,11 @@
 	    } else {
 		set auto_report 1
 		ns_returnerror 200 "</table></table></table></h1></b></i>
-               <form method=POST action='$report_url'>
+               <form method=\"post\" action=\"$report_url\">
 [export_form_vars error_url error_info]
 This file has generated an error.  
-<input type=submit value='Report this error'>
-</form><hr>
+<input type=\"submit\" value='Report this error' />
+</form><hr />
 	<blockquote><pre>[ns_quotehtml $error_info]</pre></blockquote>[ad_footer]"
 	    }
 	} else {
Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	19 Aug 2002 23:46:50 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	2 Sep 2002 13:20:39 -0000	1.6
@@ -57,7 +57,7 @@
         set url [ad_conn url]
     }
 
-    append html "<table border=0 cellspacing=0 cellpadding=3 width=\"100%\">\n<tr>\n"
+    append html "<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\" width=\"100%\">\n<tr>\n"
 
     foreach option $option_list { 
         append html " <th bgcolor=\"#ECECEC\">[lindex $option 1]</th>\n"
@@ -67,7 +67,7 @@
     append html "<tr>\n"
 
     foreach option $option_list { 
-        append html " <td align=center>\["
+        append html " <td align=\"center\">\["
 
         # find out what the current option value is.
         # check if a default is set otherwise the first value is used
@@ -194,7 +194,7 @@
         -Tmax_rows 0
         -Ttable_extra_html {}
         -Theader_row_extra {bgcolor="#f8f8f8"}
-        -Ttable_break_html "<p>"
+        -Ttable_break_html "<br /><br />"
         -Tpre_row_code {}
         -Trow_code {[subst $Trow_default]}
         -Tpost_data_ns_sets {}
@@ -434,7 +434,7 @@
 		if {[empty_string_p [lindex $Tband_colors $Tband_color]]} {
 		    set Trow_default "<tr>\n"
 		} else {
-		    set Trow_default "<tr bgcolor=[lindex $Tband_colors $Tband_color]>\n"
+		    set Trow_default "<tr bgcolor=\"[lindex $Tband_colors $Tband_color]\">\n"
 		}
 	    } else { 
 		set Trow_default "<tr>\n"
@@ -450,12 +450,12 @@
 		set Tcolumn [lindex $Tcol 0]
 		switch $Tformat {
 		    "" {set Tdisplay_field " <td>[set $Tcolumn]</td>\n"}
-		    r {set Tdisplay_field " <td align=right>[set $Tcolumn]</td>\n"}
-		    l {set Tdisplay_field " <td align=left>[set $Tcolumn]</td>\n"}
-		    c {set Tdisplay_field " <td align=center>[set $Tcolumn]</td>\n"}
-		    tf {set Tdisplay_field " <td align=center>[util_PrettyBoolean [set $Tcolumn]]</td>\n"}
-		    01 {set Tdisplay_field " <td align=center>[util_PrettyTclBoolean [set $Tcolumn]]</td>\n"}
-		    bz {set Tdisplay_field " <td align=right>&nbsp;[blank_zero [set $Tcolumn]]</td>\n"}
+		    r {set Tdisplay_field " <td align=\"right\">[set $Tcolumn]</td>\n"}
+		    l {set Tdisplay_field " <td align=\"left\">[set $Tcolumn]</td>\n"}
+		    c {set Tdisplay_field " <td align=\"center\">[set $Tcolumn]</td>\n"}
+		    tf {set Tdisplay_field " <td align=\"center\">[util_PrettyBoolean [set $Tcolumn]]</td>\n"}
+		    01 {set Tdisplay_field " <td align=\"center\">[util_PrettyTclBoolean [set $Tcolumn]]</td>\n"}
+		    bz {set Tdisplay_field " <td align=\"right\">&nbsp;[blank_zero [set $Tcolumn]]</td>\n"}
 		    default {set Tdisplay_field " [subst $Tformat]\n"}
 		}
 
@@ -561,11 +561,11 @@
     }
 }
         
-proc_doc ad_table_span {str {td_html "align=left"}} {
+proc_doc ad_table_span {str {td_html "align=\"left\""}} {
     given string the function generates a row which spans the 
     whole table.
 } {
-    return "<tr><td colspan=[uplevel llength \$Tcolumn_list] $td_html>$str</td></tr>"
+    return "<tr><td colspan=\"[uplevel llength \$Tcolumn_list]\" $td_html>$str</td></tr>"
 }
 
 proc_doc ad_table_form {datadef {type select} {return_url {}} {item_group {}} {item {}} {columns {}} {allowed {}}} {
@@ -592,9 +592,9 @@
     # now spit out the form fragment.
     if {![empty_string_p $item]} {
         append html "<h2>Editing <strong>$item</strong></h2>"
-        append html "<form method=get action=\"/tools/table-custom\">"
-        append html "<input type=submit value=\"Delete this view\">"
-        append html "<input type=hidden name=delete_the_view value=\"1\">"
+        append html "<form method=\"get\" action=\"/tools/table-custom\">"
+        append html "<input type=\"submit\" value=\"Delete this view\" />"
+        append html "<input type=\"hidden\" name=\"delete_the_view\" value=\"1\" />"
         append html "[export_form_vars item_group item]"
         if {![empty_string_p $return_url]} {
             append html "[export_form_vars return_url]"
@@ -614,13 +614,13 @@
     if {![empty_string_p $item]} {
         set item_original $item
         append html "[export_form_vars item_original]"
-        append html "<input type=submit value=\"Save changes\">"
+        append html "<input type=\"submit\" value=\"Save changes\" />"
     } else {
-        append html "<input type=submit value=\"Save new view\">"
+        append html "<input type=\"submit\" value=\"Save new view\" />"
     }
 
     append html "<table>"
-    append html "<tr><th>Name:</th><td><input type=text size=60 name=item [export_form_value item]></td></tr>"
+    append html "<tr><th>Name:</th><td><input type=\"text\" size=\"60\" name=\"item\" [export_form_value item] /></td></tr>"
     if {![empty_string_p $item]} {
         set item_original item
         append html "[export_form_vars item_original]"
@@ -629,15 +629,15 @@
 
     if {[string compare $type select] == 0} {
         # select table
-        set options "<option value=\"\">---"
+        set options "<option value=\"\">---</option>"
         foreach opt $sel_list { 
-            append options " <option value=\"[lindex [lindex $datadef $opt] 0]\">[lindex [lindex $datadef $opt] 1]"
+            append options " <option value=\"[lindex [lindex $datadef $opt] 0]\">[lindex [lindex $datadef $opt] 1]</option>"
         }
     
         for {set i 0} { $i < $max_columns} {incr i} {
             if {$i < $n_sel_columns} {
                 set match [lindex [lindex $datadef [lindex $sel_columns $i]] 0]
-                regsub "(<option )(value=\"$match\">)" $options "\\1 selected \\2" out
+                regsub "(<option )(value=\"$match\">)" $options "\\1 selected=\"selected\" \\2" out
             } else { 
                 set out $options
             }
@@ -652,12 +652,12 @@
         append html "</tr>"
 
         foreach opt $sel_list { 
-            append options "<td><input name=\"col_@@\" type=radio value=\"[lindex [lindex $datadef $opt] 0]\"></td>"
+            append options "<td><input name=\"col_@@\" type=\"radio\" value=\"[lindex [lindex $datadef $opt] 0]\" /></td>"
         }
         for {set i 0} { $i < $max_columns} {incr i} {
             if {$i < $n_sel_columns} {
                 set match [lindex [lindex $datadef [lindex $sel_columns $i]] 0]
-                regsub "( type=radio )(value=\"$match\">)" $options "\\1 checked \\2" out
+                regsub "( type=\"radio\" )(value=\"$match\">)" $options "\\1 checked=\"checked\" \\2" out
             } else { 
                 set out $options
             }
@@ -717,9 +717,9 @@
     # now spit out the form fragment.
     if {![empty_string_p $item]} {
         append html "<h2>Editing <strong>$item</strong></h2>"
-        append html "<form method=get action=\"/tools/sort-custom\">"
-        append html "<input type=submit value=\"Delete this sort\">"
-        append html "<input type=hidden name=delete_the_sort value=\"1\">"
+        append html "<form method=\"get\" action=\"/tools/sort-custom\">"
+        append html "<input type=\"submit\" value=\"Delete this sort\" />"
+        append html "<input type=\"hidden\" name=\"delete_the_sort\" value=\"1\" />"
         append html "[export_form_vars item_group item]"
         if {![empty_string_p $return_url]} {
             append html "[export_form_vars return_url]"
@@ -739,38 +739,38 @@
     if {![empty_string_p $item]} {
         set item_original $item
         append html "[export_form_vars item_original]"
-        append html "<input type=submit value=\"Save changes\">"
+        append html "<input type=\"submit\" value=\"Save changes\">"
     } else {
-        append html "<input type=submit value=\"Save new sort\">"
+        append html "<input type=\"submit\" value=\"Save new sort\">"
     }
 
     append html "<table>"
-    append html "<tr><th>Name:</th><td><input type=text size=60 name=item [export_form_value item]></td></tr>"
+    append html "<tr><th>Name:</th><td><input type=\"text\" size=\"60\" name=\"item\" [export_form_value item]></td></tr>"
     if {![empty_string_p $item]} {
         set item_original item
         append html "[export_form_vars item_original]"
         append html "<tr><td>&nbsp;</td><td><em>Editing the name will rename the sort</em></td></tr>"
     }
 
-    set options "<option value=\"\">---"
+    set options "<option value=\"\">---</option>"
     foreach opt $sel_list { 
-        append options " <option value=\"[lindex [lindex $datadef $opt] 0]\">[lindex [lindex $datadef $opt] 1]"
+        append options " <option value=\"[lindex [lindex $datadef $opt] 0]\">[lindex [lindex $datadef $opt] 1]</option>"
     }
     
     for {set i 0} { $i < $max_columns} {incr i} {
         if {$i < $n_sel_columns} {
             set match [lindex $sel_columns $i]
-            regsub "(<option )(value=\"$match\">)" $options "\\1 selected \\2" out
+            regsub "(<option )(value=\"$match\">)" $options "\\1 selected=\"selected\" \\2" out
         } else { 
             set out $options
         }
         append html "<tr><th>[expr $i + 1]</th><td><select name=\"col\">$out</select>"
         switch [lindex $direction $i] {
             asc {
-                append html "<select name=\"dir\"><option value=\"asc\" selected>increasing<option value=\"desc\">decreasing</select>"
+                append html "<select name=\"dir\"><option value=\"asc\" selected=\"selected\">increasing</option><option value=\"desc\">decreasing</option></select>"
             }
             default {
-                append html "<select name=\"dir\"><option value=\"asc\">increasing<option value=\"desc\" selected>decreasing</select>"
+                append html "<select name=\"dir\"><option value=\"asc\">increasing</option><option value=\"desc\" selected=\"selected\">decreasing</option></select>"
          
             }
         }
@@ -949,7 +949,7 @@
 proc_doc ad_custom_form {return_url item_group item} { 
     sets up the head of a form to feed to /tools/form-custom.tcl
 } {
-    append html "<form method=get action=\"/tools/form-custom\">\n" 
+    append html "<form method=\"get\" action=\"/tools/form-custom\">\n" 
     if {![empty_string_p $return_url]} {
         append html "[export_form_vars return_url]\n"
     }
@@ -958,7 +958,7 @@
     }
     set item_original $item
     append html "[export_form_vars item_group item item_original]\n"
-    append html "<input type=submit value=\"Save settings\">"
+    append html "<input type=\"submit\" value=\"Save settings\" />"
 }
 
 proc_doc ad_dimensional_settings {define current} {
@@ -968,9 +968,9 @@
     NB...this does not close either the table or the form...
 } {
     foreach opt $define { 
-        append html "<tr><th align=left>[lindex $opt 1]</th><td>"
-        append html "<select name=[lindex $opt 0]>"
-        #append html "<option value=\"\">-- Unset --"
+        append html "<tr><th align=\"left\">[lindex $opt 1]</th><td>"
+        append html "<select name=\"[lindex $opt 0]\">"
+        #append html "<option value=\"\">-- Unset --</option>"
         if {![empty_string_p $current] 
             && [ns_set find $current [lindex $opt 0]] > -1} { 
             set picked [ns_set get $current [lindex $opt 0]]
@@ -979,9 +979,9 @@
 	}
         foreach val [lindex $opt 3] { 
             if {[string compare $picked [lindex $val 0]] == 0} { 
-                append html "<option SELECTED value=\"[philg_quote_double_quotes [lindex $val 0]]\">[lindex $val 1]\n"
+                append html "<option selected=\"selected\" value=\"[philg_quote_double_quotes [lindex $val 0]]\">[lindex $val 1]</option>\n"
             } else { 
-                append html "<option value=\"[philg_quote_double_quotes [lindex $val 0]]\">[lindex $val 1]\n"
+                append html "<option value=\"[philg_quote_double_quotes [lindex $val 0]]\">[lindex $val 1]</option>\n"
             }
         }
         append html "</select></td></tr>\n"
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	9 Feb 2002 02:33:35 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	2 Sep 2002 13:20:39 -0000	1.3
@@ -279,8 +279,8 @@
     An argspec takes one of two forms, depending on whether there's a default value or not:
 
     <ol>
-    <li><blockquote><code>{<i>name</i>[:<i>flag</i>,<i>flag</i>,<i>flag</i>] <i>default</i>}</code></blockquote>
-    <li><blockquote><code><i>name</i>[:<i>flag</i>,<i>flag</i>,<i>flag</i>]</code></blockquote>
+    <li><blockquote><code>{<i>name</i>[:<i>flag</i>,<i>flag</i>,<i>flag</i>] <i>default</i>}</code></blockquote></li>
+    <li><blockquote><code><i>name</i>[:<i>flag</i>,<i>flag</i>,<i>flag</i>]</code></blockquote></li>
     </ol>
 
     <p>
@@ -1082,7 +1082,7 @@
 	    upvar 1 $return_errors error_list
 	    set error_list [ad_complaints_get_list]
 	} else {
-	    ad_return_complaint [ad_complaints_count] "<li>[join [ad_complaints_get_list] "\n<li>"]"
+	    ad_return_complaint [ad_complaints_count] "<li>[join [ad_complaints_get_list] "</li>\n<li>"]</li>\n"
 	    ad_script_abort
 	}
     }
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	2 Sep 2002 08:17:26 -0000	1.12
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	2 Sep 2002 13:20:39 -0000	1.13
@@ -32,27 +32,27 @@
     ns_log Notice $message
 }
 
-# stuff to process the data that comes 
-# back from the users
-
-# if the form looked like
-# <input type=text name=yow> and <input type=text name=bar> 
-# then after you run this function you'll have Tcl vars 
-# $foo and $bar set to whatever the user typed in the form
-
-# this uses the initially nauseating but ultimately delicious
-# Tcl system function "uplevel" that lets a subroutine bash
-# the environment and local vars of its caller.  It ain't Common Lisp...
-
-# This is an ad-hoc check to make sure users aren't trying to pass in
-# "naughty" form variables in an effort to hack the database by passing
-# in SQL. It is called in all instances where a Tcl variable
-# is set from a form variable.
-
 proc_doc check_for_form_variable_naughtiness { 
     name 
     value 
 } {
+    stuff to process the data that comes 
+    back from the users
+
+    if the form looked like
+    <input type=text name=yow> and <input type=text name=bar> 
+    then after you run this function you'll have Tcl vars 
+    $foo and $bar set to whatever the user typed in the form
+
+    this uses the initially nauseating but ultimately delicious
+    tcl system function "uplevel" that lets a subroutine bash
+    the environment and local vars of its caller.  It ain't Common Lisp...
+
+    This is an ad-hoc check to make sure users aren't trying to pass in
+    "naughty" form variables in an effort to hack the database by passing
+    in SQL. It is called in all instances where a Tcl variable
+    is set from a form variable.
+
     Checks the given variable for against known form variable exploits.
     If it finds anything objectionable, it throws an error.
 } {
@@ -385,7 +385,8 @@
 	<pre>
 	$errmsg
 	</pre>
-	</blockquote>"
+	</blockquote>
+        </p>"
 	return
     }
 
@@ -672,9 +673,9 @@
 
     foreach option $options {
 	if { [string compare $option $select_option] == 0 } {
-	    append select_options "<option selected>$option\n"
+	    append select_options "<option selected=\"selected\">$option</option>\n"
 	} else {
-	    append select_options "<option>$option\n"
+	    append select_options "<option>$option</option>\n"
 	}
     }
     return $select_options
@@ -707,9 +708,9 @@
 
     foreach option $options {
 	if { [string compare $select_option [lindex $option $value_index]] == 0 } {
-	    append select_options "<option value=\"[util_quote_double_quotes [lindex $option $value_index]]\" selected>[lindex $option $option_index]\n"
+	    append select_options "<option value=\"[util_quote_double_quotes [lindex $option $value_index]]\" selected=\"selected\">[lindex $option $option_index]</option>\n"
 	} else {
-	    append select_options "<option value=\"[util_quote_double_quotes [lindex $option $value_index]]\">[lindex $option $option_index]\n"
+	    append select_options "<option value=\"[util_quote_double_quotes [lindex $option $value_index]]\">[lindex $option $option_index]</option>\n"
 	}
     }
     return $select_options
@@ -997,7 +998,7 @@
 	set export_string [join $export_list "&"]
     } else {
 	for { set i 0 } { $i < $export_size } { incr i } {
-	    append export_string "<input type=\"hidden\" name=\"[ad_quotehtml [ns_set key $export_set $i]]\" value=\"[ad_quotehtml "[ns_set value $export_set $i]"]\">\n"
+	    append export_string "<input type=\"hidden\" name=\"[ad_quotehtml [ns_set key $export_set $i]]\" value=\"[ad_quotehtml "[ns_set value $export_set $i]"]\" />\n"
 	}
     }
 
@@ -1148,8 +1149,8 @@
     } else {
 	set export_list [list]
 	foreach varname [array names export] {
-	    lappend export_list "<input type=hidden name=\"[ad_quotehtml $varname]\"\
-		    value=\"[ad_quotehtml $export($varname)]\">"
+	    lappend export_list "<input type=\"hidden\" name=\"[ad_quotehtml $varname]\"\
+		    value=\"[ad_quotehtml $export($varname)]\" />"
 	}
 	return [join $export_list \n]
     }
@@ -1193,15 +1194,15 @@
 	    switch $type {
 		multiple {
 		    foreach item $value {
-			append hidden "<input type=\"hidden\" name=\"[ad_quotehtml $var]\" value=\"[ad_quotehtml $item]\">\n"
+			append hidden "<input type=\"hidden\" name=\"[ad_quotehtml $var]\" value=\"[ad_quotehtml $item]\" />\n"
 		    }
 		}
 		default {
-		    append hidden "<input type=\"hidden\" name=\"[ad_quotehtml $var]\" value=\"[ad_quotehtml $value]\">\n"
+		    append hidden "<input type=\"hidden\" name=\"[ad_quotehtml $var]\" value=\"[ad_quotehtml $value]\" />\n"
 		}
 	    }
 	    if { $sign_p } {
-		append hidden "<input type=\"hidden\" name=\"[ad_quotehtml "$var:sig"]\" value=\"[ad_quotehtml [ad_sign $value]]\">\n"
+		append hidden "<input type=\"hidden\" name=\"[ad_quotehtml "$var:sig"]\" value=\"[ad_quotehtml [ad_sign $value]]\" />\n"
 	    }
 	}
     }
@@ -1219,7 +1220,7 @@
 	for {set i 0} {$i<[ns_set size $the_form]} {incr i} {
 	    set varname [ns_set key $the_form $i]
 	    set varvalue [ns_set value $the_form $i]
-	    append hidden "<input type=\"hidden\" name=\"[ad_quotehtml $varname]\" value=\"[ad_quotehtml $varvalue]\">\n"
+	    append hidden "<input type=\"hidden\" name=\"[ad_quotehtml $varname]\" value=\"[ad_quotehtml $varvalue]\" />\n"
 	}
     }
     return $hidden
@@ -1256,7 +1257,7 @@
     if {$format == "url"} {
         return [join $return_list "&"]
     } else {
-        return "<input type=\"hidden\" [join $return_list ">\n <input type=\"hidden\" "] >"
+        return "<input type=\"hidden\" [join $return_list " />\n <input type=\"hidden\" "] />"
     }
 }
 
@@ -1871,7 +1872,7 @@
 	ns_returnerror 500 [lindex $exception_list 0]
 	return -code return
     } elseif { $n_exceptions > 1 } {
-	ns_returnerror 500 "<li>[join $exception_list "\n<li>"]\n"
+	ns_returnerror 500 "<li>[join $exception_list "</li>\n<li>"]</li>\n"
 	return -code return
     }
 }
@@ -1916,7 +1917,7 @@
 	if { $n_exceptions == 1 } {
 	    $complain_proc $n_exceptions [lindex $exception_list 0]
 	} else {
-	    $complain_proc $n_exceptions "<li>[join $exception_list "\n<li>"]\n"
+	    $complain_proc $n_exceptions "<li>[join $exception_list "</li>\n<li>"]</li>\n"
 	}
 	return -code return
     }
@@ -2365,10 +2366,10 @@
     ReturnHeaders
     ns_write "
     <head>
-    <META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$seconds_delay;URL=$url\">
+    <meta http-equiv=\"refresh\" content=\"$seconds_delay;URL=$url\">
     </head>
     <body>
-    If your browser does not automatically redirect you, please go <a href=$url>here</a>.
+    If your browser does not automatically redirect you, please go <a href=\"$url\">here</a>.
     </body>"
 }
 
@@ -2909,16 +2910,14 @@
 proc ad_dateentrywidget {column {default_date "1940-11-03"}} {
     ns_share NS
 
-    set output "<SELECT name=$column.month>\n"
+    set output "<select name=\"$column.month\">\n"
     for {set i 0} {$i < 12} {incr i} {
-	append output "<OPTION> [lindex $NS(months) $i]\n"
+	append output "<option> [lindex $NS(months) $i]</option>\n"
     }
 
-    append output \
-"</SELECT>&nbsp;<INPUT NAME=$column.day\
-TYPE=text SIZE=3 MAXLENGTH=2>&nbsp;<INPUT NAME=$column.year\
-TYPE=text SIZE=5 MAXLENGTH=4>"
+    append output "</select>&nbsp;<input name=\"$column.day\" type=\"text\" size=\"3\" maxlength=\"2\">&nbsp;<input name=\"$column.year\" type=\"text\" size=\"5\" maxlength=\"4\">"
 
+
     return [ns_dbformvalueput $output $column date $default_date]
 }
 
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.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	23 Oct 2001 20:13:10 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	2 Sep 2002 13:20:39 -0000	1.3
@@ -1,4 +1,4 @@
-ad_library {
+1ad_library {
     UI widgets for use in forms, etc.
 
     @cvs-id $Id$
@@ -8,14 +8,14 @@
 
     set widget_value "<select name=\"$select_name\">\n"
     if { $default == "" } {
-        append widget_value "<option value=\"\" SELECTED>Choose a State</option>\n"
+        append widget_value "<option value=\"\" selected=\"selected\">Choose a State</option>\n"
     }
 
     db_foreach all_states {
 	select state_name, abbrev from us_states order by state_name
     } {
         if { $default == $abbrev } {
-            append widget_value "<option value=\"$abbrev\" SELECTED>$state_name</option>\n" 
+            append widget_value "<option value=\"$abbrev\" selected=\"selected\">$state_name</option>\n" 
         } else {            
             append widget_value "<option value=\"$abbrev\">$state_name</option>\n"
         }
@@ -30,16 +30,16 @@
     if { $default == "" } {
         if [ad_parameter SomeAmericanReadersP] {
 	    append widget_value "<option value=\"\">Choose a Country</option>
-<option value=\"us\" SELECTED>United States</option>\n"
+<option value=\"us\" selected=\"selected\">United States</option>\n"
 	} else {
-	    append widget_value "<option value=\"\" SELECTED>Choose a Country</option>\n"
+	    append widget_value "<option value=\"\" selected=\"selected\">Choose a Country</option>\n"
 	}
     }
     db_foreach all_countries {
 	select default_name, iso from countries order by default_name 
     } {
         if { $default == $iso } {
-            append widget_value "<option value=\"$iso\" SELECTED>$default_name</option>\n" 
+            append widget_value "<option value=\"$iso\" selected=\"selected\">$default_name</option>\n" 
         } else {            
             append widget_value "<option value=\"$iso\">$default_name</option>\n"
         }
@@ -60,9 +60,9 @@
     set return_string ""
     foreach value $values {
 	if {  [string compare $default $value] == 0 } {
-	    append return_string "<option SELECTED value=\"$value\">[lindex $items $count]\n"
+	    append return_string "<option selected=\"selected\" value=\"$value\">[lindex $items $count]</option>\n"
 	} else {
-	    append return_string "<option value=\"$value\">[lindex $items $count]\n"
+	    append return_string "<option value=\"$value\">[lindex $items $count]</option>\n"
 	}
 	incr count
    }
@@ -120,9 +120,9 @@
 	}
 
 	if { $default == $value } {
-	    append return_string "<option SELECTED value=\"$value\">$value\n"
+	    append return_string "<option selected=\"selected\" value=\"$value\">$value</option>\n"
 	} else {
-	    append return_string "<option value=\"$value\">$value\n"
+	    append return_string "<option value=\"$value\">$value</option>\n"
 	}
     }
     return $return_string
@@ -151,22 +151,19 @@
 	set day [lindex $date_parts 2]
     }
 
-    set output "<SELECT name=$column.month>\n"
-    append output "<OPTION>\n"
+    set output "<select name=\"$column.month\">\n"
+    append output "<option>\n"
     # take care of cases like 09 for month
     regsub "^0" $month "" month
     for {set i 0} {$i < 12} {incr i} {
 	if { $i == [expr $month - 1] } {
-	    append output "<OPTION selected> [lindex $NS(months) $i]\n"
+	    append output "<option selected=\"selected\"> [lindex $NS(months) $i]</option>\n"
 	} else {
-	    append output "<OPTION>[lindex $NS(months) $i]\n"
+	    append output "<option>[lindex $NS(months) $i]</option>\n"
 	}
     }
 
-    append output \
-"</SELECT><INPUT NAME=$column.day\
-TYPE=text SIZE=3 MAXLENGTH=2 value=\"$day\">&nbsp;<INPUT NAME=$column.year\
-TYPE=text SIZE=5 MAXLENGTH=4 value=\"$year\">"
+    append output "</select><input name=\"$column.day\" type=\"text\" size=\"3\" maxlength=\"2\" value=\"$day\">&nbsp;<input name=\"$column.year\" type=\"text\" size=\"5\" maxlength=\"4\" value=\"$year\">"
 
      return $output
 }
@@ -211,9 +208,9 @@
             set value [lindex $opt 0]
             if { (!$multiple && [string compare $value $default] == 0) 
                  || ($multiple && [lsearch -exact $default $value] > -1)} {
-                append retval "<option SELECTED value=\"$value\">$item\n"
+                append retval "<option selected=\"selected\" value=\"$value\">$item</option>\n"
             } else {
-                append retval "<option value=\"$value\">$item\n"
+                append retval "<option value=\"$value\">$item</option>\n"
             }
         }
     }
@@ -232,25 +229,25 @@
 	    set value [ns_set value $selection 1]
 	    if { (!$multiple && [string compare $value $default] == 0) 
 		 || ($multiple && [lsearch -exact $default $value] > -1)} {
-		append retval "<option SELECTED value=\"$value\">$item\n"
+		append retval "<option selected=\"selected\" value=\"$value\">$item</option>\n"
 	    } else {
-		append retval "<option value=\"$value\">$item\n"
+		append retval "<option value=\"$value\">$item</option>\n"
 	    }
 	} if_no_rows {
 	    if {![empty_string_p $default]} { 
-		return "<input type=hidden value=\"[philg_quote_double_quotes $default]\" name=$name>\n"
+		return "<input type=\"hidden\" value=\"[philg_quote_double_quotes $default]\" name=\"$name\" />\n"
 	    } else { 
 		return {}            
 	    }
 	}
     }
 
     if { $count == 1 || ($dbcount == 1 && $hidden_if_one_db) } {
-        return "$item<input type=hidden value=\"[philg_quote_double_quotes $value]\" name=$name>\n"
+        return "$item<input type=\"hidden\" value=\"[philg_quote_double_quotes $value]\" name=\"$name\" />\n"
     } else { 
-        set select "<select name=$name"
+        set select "<select name=\"$name\""
         if {$size != 0} { 
-            append select " size=$size"
+            append select " size=\"$size\""
         } 
         if {$multiple} {
             append select " multiple"
@@ -259,15 +256,15 @@
     }
 }
 
-proc_doc currency_widget {{default ""} {select_name "currency_code"} {size_subtag "size=4"}} "Returns a currency selection box" {
+proc_doc currency_widget {{default ""} {select_name "currency_code"} {size_subtag "size=\"4\""}} "Returns a currency selection box" {
 
     set widget_value "<select name=\"$select_name\" $size_subtag>\n"
     if { $default == "" } {
         if [ad_parameter SomeAmericanReadersP] {
 	    append widget_value "<option value=\"\">Currency</option>
-<option value=\"USD\" SELECTED>United States Dollar</option>\n"
+<option value=\"USD\" selected=\"selected\">United States Dollar</option>\n"
 	} else {
-	    append widget_value "<option value=\"\" SELECTED>Currency</option>\n"
+	    append widget_value "<option value=\"\" selected=\"selected\">Currency</option>\n"
 	}
     }
     db_foreach currency_info {
@@ -277,7 +274,7 @@
 	order by currency_name 
     } {
 	if { $default == $iso } {
-	    append widget_value "<option value=\"$iso\" SELECTED>$currency_name</option>\n" 
+	    append widget_value "<option value=\"$iso\" selected=\"selected\">$currency_name</option>\n" 
         } else {            
             append widget_value "<option value=\"$iso\">$currency_name</option>\n"
         }
@@ -405,7 +402,7 @@
 	    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 border=1>"
+	append out "</td><td>&nbsp; <img name=\"color_$name\" src=\"/shared/1pixel.tcl?r=$c1&g=$c2&b=$c3\" width=\"26\" height=\"26\" border=\"1\">"
     }
     append out "</td></tr></table>\n"
     return $out