Merge pull request #641 from creative-commoners/pulls/4/fieldset-should-have-legend

FIX fieldset without a legend shouldn't be a fieldset

templates/Includes/UserForm.ss

@@ -9,13 +9,16 @@
 	<p id="{$FormName}_error" class="message $MessageType" aria-hidden="true" style="display: none;"></p>
 <% end_if %>
 
-<fieldset>
-	<% if $Legend %><legend>$Legend</legend><% end_if %>
-	<% loop $Fields %>
-		$FieldHolder
-	<% end_loop %>
-	<div class="clear"><!-- --></div>
-</fieldset>
+<% if $Legend %>
+    <fieldset>
+        <legend>$Legend</legend>
+        <% include UserFormFields %>
+    </fieldset>
+<% else %>
+    <div class="userform-fields">
+        <% include UserFormFields %>
+    </div>
+<% end_if %>
 
 <% if $Steps.Count > 1 %>
 	<% include UserFormStepNav %>

templates/Includes/UserFormFields.ss

@@ -0,0 +1,5 @@
+<% loop $Fields %>
+    $FieldHolder
+<% end_loop %>
+<div class="clear"><!-- --></div>
+

templates/Includes/UserFormStepErrors.ss

@@ -1,8 +1,6 @@
 <% if $Steps.Count > 1 %>
-	<fieldset class="error-container form-wide-errors" aria-hidden="true" style="display: none;">
-		<div>
+    <div class="error-container form-wide-errors" aria-hidden="true" style="display: none;">
         <h4></h4>
         <ul class="error-list"></ul>
     </div>
-	</fieldset>
 <% end_if %>

templates/forms/UserFormsStepField.ss

@@ -1,15 +1,15 @@
-<fieldset id="$Name" class="form-step $extraClass" data-title="$Title">
+<div id="$Name" class="form-step $extraClass" data-title="$Title">
 	<% if $Form.DisplayErrorMessagesAtTop %>
-		<fieldset class="error-container" aria-hidden="true" style="display: none;">
+		<div class="error-container" aria-hidden="true" style="display: none;">
 			<div>
 				<h4></h4>
 				<ul class="error-list"></ul>
 			</div>
-		</fieldset>
+		</div>
 	<% end_if %>
 
 	<% loop $Children %>
 		$FieldHolder
 	<% end_loop %>
 
-</fieldset>
+</div>