Index: openacs-4/packages/acs-templating/resources/forms/standard-lars.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/Attic/standard-lars.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/resources/forms/standard-lars.adp	14 Sep 2002 18:35:31 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/forms/standard-lars.adp	14 Sep 2002 19:26:10 -0000	1.5
@@ -42,7 +42,7 @@
             <table cellpadding=4 cellspacing=0 border=0>
 	      <formgroup id=@elements.id@>
 		<tr><td>\@formgroup.widget@</td>
-                    <td>\@formgroup.label@</td></tr>
+                    <td><font face="tahoma,verdana,arial,helvetica,sans-serif" size="-1"><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></font></td></tr>
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
Index: openacs-4/packages/acs-templating/resources/forms/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/standard.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	14 Sep 2002 19:26:10 -0000	1.2
@@ -45,7 +45,7 @@
             <table cellpadding=4 cellspacing=0 border=0>
 	      <formgroup id=@elements.id@>
 		<tr><td>\@formgroup.widget@</td>
-                    <td>\@formgroup.label@</td></tr>
+                    <td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></td></tr>
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	13 Sep 2002 10:54:05 -0000	1.11
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	14 Sep 2002 19:26:11 -0000	1.12
@@ -87,6 +87,11 @@
 
   array set attributes $tag_attributes
 
+  if { ( [string equal $type "checkbox"] || [string equal $type "radio"] ) && [info exists element(value)] } {
+      # This can be used in the form template in a <label for="id">...</label> tag.
+      set attributes(id) "$element(form_id):elements:$element(name):$element(value)"
+  }
+
   set output "<input type=\"$type\" name=\"$element(name)\""
 
   if { [info exists element(value)] } {