Merge branch 'MDL-56858_master-alt-2' of git://github.com/markn86/moodle

lib/outputrenderers.php

@@ -4377,13 +4377,21 @@ EOD;
                     $helpbutton = $element->getHelpButton();
                 }
                 $label = $element->getLabel();
+                $text = '';
                 if (method_exists($element, 'getText')) {
-                    $label .= ' ' . $element->getText();
+                    // There currently exists code that adds a form element with an empty label.
+                    // If this is the case then set the label to the description.
+                    if (empty($label)) {
+                        $label = $element->getText();
+                    } else {
+                        $text = $element->getText();
+                    }
                 }
 
                 $context = array(
                     'element' => $elementcontext,
                     'label' => $label,
+                    'text' => $text,
                     'required' => $required,
                     'advanced' => $advanced,
                     'helpbutton' => $helpbutton,

theme/boost/templates/core_form/element-advcheckbox-inline.mustache

@@ -22,7 +22,11 @@
     {{/element.frozen}}
     {{{element.attributes}}} >
     {{{label}}}
-</label> {{{helpbutton}}}
+</label>
+{{#text}}
+    <em>{{{.}}}</em>
+{{/text}}
+{{{helpbutton}}}
 <span class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
     {{{error}}}
 </span>

theme/boost/templates/core_form/element-advcheckbox.mustache

@@ -1,5 +1,12 @@
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-    <div class="col-md-9 push-md-3 checkbox">
+    <div class="col-md-3">
+        {{#text}}
+            <label for="{{element.id}}">
+                {{{label}}}
+            </label>
+        {{/text}}
+    </div>
+    <div class="col-md-9 checkbox">
         <label>
         {{^element.hardfrozen}}
             {{^element.frozen}}
@@ -22,8 +29,17 @@
                 disabled
             {{/element.frozen}}
             {{{element.attributes}}} >
-            {{{label}}}
-        </label> {{{helpbutton}}}
+            {{#text}}
+                {{{.}}}
+            {{/text}}
+            {{^text}}
+                {{{label}}}
+            {{/text}}
+        </label>
+        <span class="text-nowrap">
+            {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">❗</abbr>{{/advanced}}
+            {{{helpbutton}}}
+        </span>
         <div class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
             {{{error}}}
         </div>

theme/boost/templates/core_form/element-checkbox-inline.mustache

@@ -22,7 +22,11 @@
     {{/element.frozen}}
     {{{element.attributes}}} >
     {{{label}}}
-</label> {{{helpbutton}}}
+</label>
+{{#text}}
+    <em>{{{.}}}</em>
+{{/text}}
+{{{helpbutton}}}
 <span class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
     {{{error}}}
 </span>

theme/boost/templates/core_form/element-checkbox.mustache

@@ -1,5 +1,12 @@
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-    <div class="col-md-9 push-md-3 checkbox">
+    <div class="col-md-3">
+        {{#text}}
+            <label for="{{element.id}}">
+                {{{label}}}
+            </label>
+        {{/text}}
+    </div>
+    <div class="col-md-9 checkbox">
         <label>
         {{^element.hardfrozen}}
             {{#element.frozen}}
@@ -22,8 +29,17 @@
                 disabled
             {{/element.frozen}}
             {{{element.attributes}}} >
-            {{{label}}}
-        </label> {{{helpbutton}}}
+            {{#text}}
+                {{{.}}}
+            {{/text}}
+            {{^text}}
+                {{{label}}}
+            {{/text}}
+        </label>
+        <span class="text-nowrap">
+            {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">❗</abbr>{{/advanced}}
+            {{{helpbutton}}}
+        </span>
         <div class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
             {{{error}}}
         </div>

theme/boost/templates/core_form/element-radio-inline.mustache

@@ -20,7 +20,11 @@
     {{/error}}
     {{{element.attributes}}} >
     {{{label}}}
-</label> {{{helpbutton}}}
+</label>
+{{#text}}
+    <em>{{{.}}}</em>
+{{/text}}
+{{{helpbutton}}}
 <span class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
     {{{error}}}
 </span>

theme/boost/templates/core_form/element-radio.mustache

@@ -11,7 +11,14 @@
 
 }}
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-    <div class="col-md-9 push-md-3 checkbox">
+    <div class="col-md-3">
+        {{#text}}
+            <label for="{{element.id}}">
+                {{{label}}}
+            </label>
+        {{/text}}
+    </div>
+    <div class="col-md-9 checkbox">
         <label>
         <input type="radio" name="{{element.name}}"
             id="{{element.id}}" value="{{element.value}}"
@@ -20,8 +27,19 @@
             {{#error}}
                 autofocus aria-describedby="id_error_{{element.name}}"
             {{/error}} {{{element.attributes}}} >
+        {{/element.frozen}}
+        {{#text}}
+            {{{.}}}
+        {{/text}}
+        {{^text}}
             {{{label}}}
-        </label> {{{helpbutton}}}
+        {{/text}}
+        </label>
+        <span class="text-nowrap">
+            {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">✲</abbr>{{/required}}
+            {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">❗</abbr>{{/advanced}}
+            {{{helpbutton}}}
+        </span>
         <div class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
             {{{error}}}
         </div>