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.17.6.2 -r1.17.6.3
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	16 Feb 2007 11:21:09 -0000	1.17.6.2
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	26 Feb 2007 18:22:05 -0000	1.17.6.3
@@ -20,6 +20,12 @@
         
 			<else> <!-- wrap the form item in the form-item-wrapper class -->
 				<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>
 							<if \@formerror.@elements.id@\@ not nil>
@@ -74,16 +80,12 @@
 	
 					<if @elements.widget@ in radio checkbox> <!-- radio button groups and checkbox groups get their own fieldsets -->
 						<noparse>
-						<fieldset class=@elements.widget@ title=".. more attributes">
-							<legend>optional legend (@elements.widget@)- Need to code for this</legend>
-							
 							<formgroup id="@elements.id@">			
 									\@formgroup.widget;noquote@
 								<label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
 										\@formgroup.label;noquote@
 								</label><br/>
 							</formgroup>
-						</fieldset>
 						</noparse>
 					</if>
 
@@ -110,6 +112,9 @@
 						</div> <!-- /form-help-text -->
 					</if>
 
+					<if @elements.widget@ in radio checkbox> <!-- radio button groups and checkbox groups get their own fieldsets -->
+						</fieldset>
+				    </if>
 				</div>
        		</else>
 	</else>