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.6 -r1.17.6.7
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	6 Mar 2007 16:48:40 -0000	1.17.6.6
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	6 Mar 2007 20:31:12 -0000	1.17.6.7
@@ -1,9 +1,7 @@
 <multiple name=elements>
 	<if @elements.section@ not nil>
 		<fieldset id="@elements.section@" @elements.sec_fieldset;noquote@><!-- section fieldset -->
-		<if @elements.sec_legendtext@ not nil>
-		  <legend @elements.sec_legend;noquote@>@elements.sec_legendtext@</legend>
-		</if>
+        <legend @elements.sec_legend;noquote@>@elements.sec_legendtext@</legend>
 	</if>
 	
 	<group column="section">
@@ -24,9 +22,7 @@
 				<div class="form-item-wrapper">
 					<if @elements.widget@ in radio checkbox> <!-- radio button groups and checkbox groups get their own fieldsets -->
 						<fieldset @elements.fieldset;noquote@>
-				        <if @elements.legendtext@ not nil>
 				          <legend @elements.legend;noquote@>@elements.legendtext@</legend>
-				        </if>
 				    </if>
 					<if @elements.label@ not nil>
 						<noparse>
Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v
diff -u -N -r1.25.6.4 -r1.25.6.5
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl	6 Mar 2007 16:48:40 -0000	1.25.6.4
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl	6 Mar 2007 20:31:13 -0000	1.25.6.5
@@ -205,20 +205,20 @@
 		  set opts(fieldset) [list class $opts(widget)]
 	  }
 
-	  array set attributes $opts(fieldset)
-	  if { ![info exists attributes(class)] } {
-		  set attributes(class) $opts(widget)
+	  array set fs_attributes $opts(fieldset)
+	  if { ![info exists fs_attributes(class)] } {
+		  set fs_attributes(class) $opts(widget)
 	  }
 
-	  set options ""
-	  foreach name [array names attributes] {
-		  if { [string equal $attributes($name) {}] } {
-			  append options " $name"
+	  set fs_options ""
+	  foreach name [array names fs_attributes] {
+		  if { [string equal $fs_attributes($name) {}] } {
+			  append fs_options " $name"
 		  } else {
-			  append options " $name=\"$attributes($name)\""
+			  append fs_options " $name=\"$fs_attributes($name)\""
 		  }
 	  }
-	  set opts(fieldset) $options
+	  set opts(fieldset) $fs_options
 
 	  # set legend attributes
 	  if { ![info exists opts(legendtext)] } {
@@ -227,16 +227,16 @@
 	  if { ![info exists opts(legend)] } {
 		  set opts(legend) {}
 	  }
-	  array set attributes $opts(legend)
-	  set options ""
-	  foreach name [array names attributes] {
-		  if { [string equal $attributes($name) {}] } {
-			  append options " $name"
+	  array set lg_attributes $opts(legend)
+	  set lg_options ""
+	  foreach name [array names lg_attributes] {
+		  if { [string equal $lg_attributes($name) {}] } {
+			  append lg_options " $name"
 		  } else {
-			  append options " $name=\"$attributes($name)\""
+			  append lg_options " $name=\"$lg_attributes($name)\""
 		  }
 	  }
-	  set opts(legend) $options
+	  set opts(legend) $lg_options
   }
 
   # Remember that the element has not been rendered yet
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -N -r1.32.6.4 -r1.32.6.5
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	6 Mar 2007 07:42:08 -0000	1.32.6.4
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	6 Mar 2007 20:31:13 -0000	1.32.6.5
@@ -578,12 +578,10 @@
 
       # Legend
       set fieldset_legend [lindex $fieldset_list 1]
-      if {![empty_string_p $fieldset_legend]} {
 	  append output "<legend>$fieldset_legend</legend>"
-      }
 
   } else {
-      append output "<fieldset>"
+      append output "<fieldset><legend></legend>"
   }
 
   # Export form ID and current form mode