From 971ba30d51deaab2c9ef9c5186515cf40fa1d74a Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 27 Jan 2025 11:30:37 +1300
Subject: [PATCH] FIX Update HTML markup for bootstrap 5 (#1364)

---
 code/Model/EditableFormField.php                                | 2 +-
 .../UserForms/FormField/UserFormsCheckboxSetField.ss            | 2 +-
 .../SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss | 2 +-
 .../UserForms/Model/EditableFormField/EditableCheckbox.ss       | 2 +-
 .../SilverStripe/UserForms/Model/EditableFormField_holder.ss    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php
index 46aee2c7c..ce3cc7ed9 100755
--- a/code/Model/EditableFormField.php
+++ b/code/Model/EditableFormField.php
@@ -264,7 +264,7 @@ public function getCMSFields()
                 LiteralField::create(
                     'MergeField',
                     '<div class="form-group field readonly">' .
-                        '<label class="left form__field-label" for="Form_ItemEditForm_MergeField">'
+                        '<label class="left form__field-label form-label" for="Form_ItemEditForm_MergeField">'
                             . _t(__CLASS__.'.MERGEFIELDNAME', 'Merge field')
                         . '</label>'
                         . '<div class="form__field-holder">'
diff --git a/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
index 52e691e9f..d3296d2c4 100644
--- a/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
+++ b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
@@ -4,7 +4,7 @@
             <input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value.ATT"<% if $isChecked %>
                    checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %>
                    $Top.getValidationAttributesHTML().RAW />
-            <label for="$ID">$Title.XML</label>
+            <label for="$ID" class="form-label">$Title.XML</label>
         </div>
     <% end_loop %>
 <% else %>
diff --git a/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
index 85eb9f15e..38b0ab348 100644
--- a/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
+++ b/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
@@ -3,6 +3,6 @@
         <input id="$ID" class="radio" name="$Name" type="radio" value="$Value.ATT"<% if $isChecked %>
                checked<% end_if %><% if $isDisabled %> disabled<% end_if %> <% if $Up.Required %>required<% end_if %>
                $Top.getValidationAttributesHTML().RAW />
-        <label for="$ID">$Title</label>
+        <label class="form-label" for="$ID">$Title</label>
     </div>
 <% end_loop %>
diff --git a/templates/SilverStripe/UserForms/Model/EditableFormField/EditableCheckbox.ss b/templates/SilverStripe/UserForms/Model/EditableFormField/EditableCheckbox.ss
index f53455860..77670f7e9 100644
--- a/templates/SilverStripe/UserForms/Model/EditableFormField/EditableCheckbox.ss
+++ b/templates/SilverStripe/UserForms/Model/EditableFormField/EditableCheckbox.ss
@@ -1,2 +1,2 @@
 <input $AttributesHTML<% if $RightTitle %> aria-describedby="{$Name}_right_title"<% end_if %>/>
-<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
+<% if $Title %><label class="left form-label" for="$ID">$Title</label><% end_if %>
diff --git a/templates/SilverStripe/UserForms/Model/EditableFormField_holder.ss b/templates/SilverStripe/UserForms/Model/EditableFormField_holder.ss
index 9c0c6ff76..e5e3564aa 100644
--- a/templates/SilverStripe/UserForms/Model/EditableFormField_holder.ss
+++ b/templates/SilverStripe/UserForms/Model/EditableFormField_holder.ss
@@ -1,5 +1,5 @@
 <div id="$Name" class="field<% if $extraClass %> $extraClass<% end_if %>">
-	<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
+	<% if $Title %><label class="left form-label" for="$ID">$Title</label><% end_if %>
 	<div class="middleColumn">
 		$Field
 	</div>