From dba8fdf878f3e6fa1cfc547bdcbd12c18d0012c3 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Fri, 25 Sep 2020 23:11:32 +1000
Subject: [PATCH] MDL-69649 form: Fix labels for defaultcustom form elements

---
 .../templates/element-defaultcustom.mustache  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/form/templates/element-defaultcustom.mustache b/lib/form/templates/element-defaultcustom.mustache
index 3c6fbda28db..af33ffc27e4 100644
--- a/lib/form/templates/element-defaultcustom.mustache
+++ b/lib/form/templates/element-defaultcustom.mustache
@@ -31,13 +31,18 @@
         }
     }
 }}
-{{< core_form/element-template }}
+{{< core_form/element-group }}
     {{$element}}
-        <span class="fdefaultcustom">
-        {{#element.elements}}
-            {{{separator}}}
-            {{{html}}}
-        {{/element.elements}}
-        </span>
+        <fieldset class="w-100 m-0 p-0 border-0" id="{{element.id}}">
+            <legend class="sr-only">{{label}}</legend>
+            <div class="d-flex flex-wrap align-items-center">
+                <span class="fdefaultcustom">
+                    {{#element.elements}}
+                        {{{separator}}}
+                        {{{html}}}
+                    {{/element.elements}}
+                </span>
+            </div>
+        </fieldset>
     {{/element}}
-{{/ core_form/element-template }}
+{{/ core_form/element-group }}