tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

FIX fieldset without a legend shouldn't be a fieldset

Browse Source
This commit is contained in:
Franco Springveldt 2017-07-13 15:06:21 +12:00
parent 17fe85b774
commit c98fa0bab4
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
templates/Includes/UserForm.ss
View File

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

5
templates/Includes/UserFormFields.ss Normal file
View File

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

10
templates/Includes/UserFormStepErrors.ss
View File

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

8
templates/forms/UserFormsStepField.ss
View File

@ -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 %> <% if $Form.DisplayErrorMessagesAtTop %>
<fieldset class="error-container" aria-hidden="true" style="display: none;"> <div class="error-container" aria-hidden="true" style="display: none;">
<div> <div>
<h4></h4> <h4></h4>
<ul class="error-list"></ul> <ul class="error-list"></ul>
</div> </div>
</fieldset> </div>
<% end_if %> <% end_if %>
<% loop $Children %> <% loop $Children %>
$FieldHolder $FieldHolder
<% end_loop %> <% end_loop %>
</fieldset> </div>