MDL-67968 form: not to put empty label when no label is available

2020-03-07 04:08:10 +11:00
parent d7bca2339a
commit bb24115b88
1 changed files with 8 additions and 3 deletions
@@ -1,9 +1,14 @@
 <div class="form-group {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}" {{#element.groupname}}data-groupname="{{.}}"{{/element.groupname}}>
-    <label class="col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
-        {{{label}}} {{{helpbutton}}}
+    {{#label}}
+        <label class="col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
+            {{{label}}}
+        </label>
+    {{/label}}
+    <span>
+        {{{helpbutton}}}
        {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}
        {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
-    </label>
+    </span>
    <span data-fieldtype="{{element.type}}">
        {{$ element }}
            <!-- Element goes here -->