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 -N -r1.17.6.7 -r1.17.6.8
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	6 Mar 2007 20:31:12 -0000	1.17.6.7
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	16 Mar 2007 12:41:46 -0000	1.17.6.8
@@ -28,15 +28,23 @@
 						<noparse>
 							<if \@formerror.@elements.id@\@ not nil>
 								<div class="form-label form-label-error">
-									<label for="@elements.id@">
+                                  <if @elements.widget@ in radio checkbox date>
+									@elements.label;noquote@
+                                  </if>
+                                  <else>
+									<label for="@elements.id@">@elements.label;noquote@</label>
+                                  </else>
 							</if>
 							<else>
 								<div class="form-label">
-									<label for="@elements.id@">
+                                  <if @elements.widget@ in radio checkbox date>
+									@elements.label;noquote@
+                                  </if>
+                                  <else>
+									<label for="@elements.id@">@elements.label;noquote@</label>
+                                  </else>
 							</else>
 						</noparse>
-						@elements.label;noquote@
-								</label>
 
 						<if @form_properties.show_required_p@ true>
 							<if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform">