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 -r1.25.6.6 -r1.25.6.7
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl	6 Jun 2007 18:35:20 -0000	1.25.6.6
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl	7 Jun 2007 10:15:51 -0000	1.25.6.7
@@ -214,6 +214,9 @@
 
             array set fs_attributes $opts(fieldset)
             set fs_options ""
+            if {![info exists fs_attributes(class)]} {
+                append fs_options " class=\"form-fieldset\""
+            }
             foreach name [array names fs_attributes] {
                 if { [string equal $fs_attributes($name) {}] } {
                     append fs_options " $name"
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 -r1.32.6.6 -r1.32.6.7
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	6 Jun 2007 18:35:20 -0000	1.32.6.6
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	7 Jun 2007 10:15:51 -0000	1.32.6.7
@@ -418,6 +418,9 @@
 	# fieldset attributes
 	set properties(sec_fieldset) ""
 	array set fs_attributes $fieldset
+    if {![info exists fs_attributes(class)]} {
+        append properties(sec_fieldset) " class=\"form-fieldset\""
+    }
 	foreach name [array names fs_attributes] {
 		if { [string equal $fs_attributes($name) {}] } {
 			append properties(sec_fieldset) " $name"
@@ -575,15 +578,21 @@
   if { [info exists properties(fieldset)] } {
       # Fieldset
       append output " <fieldset"
-      set fieldset_list $properties(fieldset)
-
-      foreach {fa_name fa_value} [lindex $fieldset_list 0] {
-	  append output " $fa_name=\"$fa_value\""
+      array set fs_attributes [lindex $properties(fieldset) 0]
+      if {![info exists fs_attributes(class)]} {
+          append output " class=\"form-fieldset\""
       }
+      foreach name [array names fs_attributes] {
+          if { [string equal $fs_attributes($name) {}] } {
+              append output " $name"
+          } else {
+              append output " $name=\"$fs_attributes($name)\""
+          }
+      }
       append output ">"
 
       # Legend
-      set fieldset_legend [lindex $fieldset_list 1]
+      set fieldset_legend [lindex $properties(fieldset) 1]
 	  append output "<legend>$fieldset_legend</legend>"
   }
 
Index: openacs-4/packages/acs-templating/www/resources/forms.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/forms.css,v
diff -u -r1.6.6.3 -r1.6.6.4
--- openacs-4/packages/acs-templating/www/resources/forms.css	3 Mar 2007 20:26:56 -0000	1.6.6.3
+++ openacs-4/packages/acs-templating/www/resources/forms.css	7 Jun 2007 10:15:51 -0000	1.6.6.4
@@ -37,18 +37,14 @@
 
 /* form layout for forms with divs*/
 
-.margin-form fieldset, .vertical-form fieldset, fieldset {
-	border: 0px solid #000;
+.form-fieldset {
+	border: 0px solid #FFFFFF;
 }
 
 .margin-form .form-required-mark {
     display: inline;
 }
 
-.margin-form fieldset {
-	border: 0 solid #FFFFFF;
-}
-
 .margin-form .form-item-wrapper {
 	clear: both;
 	padding: 5px;