Merge branch 'MDL-62886-35' of https://github.com/lucaboesch/moodle i…

…nto MOODLE_35_STABLE
moodle · Aug 13, 2018 · 105bfe1 · 105bfe1
2 parents e87bbfb + 4202a69
commit 105bfe1
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/theme/boost/templates/core_form/element-radio.mustache b/theme/boost/templates/core_form/element-radio.mustache
@@ -20,31 +20,31 @@
     </div>
     <div class="col-md-9 checkbox">
         <div class="form-check">
+        <span class="text-nowrap">
             <label class="form-check-label">
-            {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
+                {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
-                <input type="hidden" name="{{element.name}}" value="{{element.value}}">
+                    <input type="hidden" name="{{element.name}}" value="{{element.value}}">
-            {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}
+                {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}
-            <input type="radio" class="form-check-input" {{^element.frozen}}name="{{element.name}}"{{/element.frozen}}
+                <input type="radio" class="form-check-input" {{^element.frozen}}name="{{element.name}}"{{/element.frozen}}
-                id="{{element.id}}" value="{{element.value}}"
+                    id="{{element.id}}" value="{{element.value}}"
-                {{#element.checked}}checked{{/element.checked}}
+                    {{#element.checked}}checked{{/element.checked}}
-                {{#element.frozen}}disabled{{/element.frozen}}
+                    {{#element.frozen}}disabled{{/element.frozen}}
-                {{#error}}
+                    {{#error}}
-                    autofocus aria-describedby="id_error_{{element.name}}"
+                        autofocus aria-describedby="id_error_{{element.name}}"
-                {{/error}} {{{element.attributes}}} >
+                    {{/error}} {{{element.attributes}}} >
-            {{#text}}
+                {{#text}}
-                {{{.}}}
+                    {{{.}}}
-            {{/text}}
+                {{/text}}
-            {{^text}}
+                {{^text}}
-                {{{label}}}
+                    {{{label}}}
-            {{/text}}
+                {{/text}}
             </label>
-        </div>
-        <span class="text-nowrap">
             {{#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}}
             {{{helpbutton}}}
-        </span>
+            </span>
-         <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
+        </div>
+        <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
             {{{error}}}
         </div>
     </div>