Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 09:36:09 +0000 (09:36 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 09:36:09 +0000 (09:36 +0000)
1  2 
theme/boost/templates/core_form/element-template.mustache

@@@ -1,6 -1,16 +1,16 @@@
  <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
      <div class="col-md-3">
 -        <span class="pull-xs-right">
+         {{^element.staticlabel}}
+         <label class="col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
+             {{{label}}}
+         </label>
+         {{/element.staticlabel}}
+         {{#element.staticlabel}}
+         <span class="col-form-label d-inline-block {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}">
+             {{{label}}}
+         </span>
+         {{/element.staticlabel}}
 +        <span class="pull-xs-right 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}}}