Merge branch 'MDL-62376-master' of git://github.com/bmbrands/moodle

This commit is contained in:
David Monllao 2018-05-11 14:47:32 +02:00
commit 76fc9a4f5a
7 changed files with 27 additions and 25 deletions

View file

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

View file

@ -43,7 +43,7 @@
{{{helpbutton}}} {{{helpbutton}}}
</span> </span>
</div> </div>
<div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

View file

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

View file

@ -43,7 +43,7 @@
{{{helpbutton}}} {{{helpbutton}}}
</span> </span>
</div> </div>
<div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

View file

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

View file

@ -19,30 +19,32 @@
{{/text}} {{/text}}
</div> </div>
<div class="col-md-9 checkbox"> <div class="col-md-9 checkbox">
<label class="form-check-label"> <div class="form-check">
{{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}} <label class="form-check-label">
<input type="hidden" name="{{element.name}}" value="{{element.value}}"> {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
{{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}} <input type="hidden" name="{{element.name}}" value="{{element.value}}">
<input type="radio" class="form-check-input" {{^element.frozen}}name="{{element.name}}"{{/element.frozen}} {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}
id="{{element.id}}" value="{{element.value}}" <input type="radio" class="form-check-input" {{^element.frozen}}name="{{element.name}}"{{/element.frozen}}
{{#element.checked}}checked{{/element.checked}} id="{{element.id}}" value="{{element.value}}"
{{#element.frozen}}disabled{{/element.frozen}} {{#element.checked}}checked{{/element.checked}}
{{#error}} {{#element.frozen}}disabled{{/element.frozen}}
autofocus aria-describedby="id_error_{{element.name}}" {{#error}}
{{/error}} {{{element.attributes}}} > autofocus aria-describedby="id_error_{{element.name}}"
{{#text}} {{/error}} {{{element.attributes}}} >
{{{.}}} {{#text}}
{{/text}} {{{.}}}
{{^text}} {{/text}}
{{{label}}} {{^text}}
{{/text}} {{{label}}}
</label> {{/text}}
</label>
</div>
<span class="text-nowrap"> <span class="text-nowrap">
{{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}} {{#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}} {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
{{{helpbutton}}} {{{helpbutton}}}
</span> </span>
<div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

View file

@ -9,7 +9,7 @@
<!-- Element goes here --> <!-- Element goes here -->
{{/ element }} {{/ element }}
</span> </span>
<div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>