moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-65217 form: id for error area

Browse source
This commit is contained in:
Marina Glancy 2019-04-09 14:00:14 +02:00
parent 086aa543b9
commit 521989ec56
28 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/form/templatable_form_element.php
View file

@ -82,6 +82,7 @@ trait templatable_form_element {
$context['type'] = $this->getType(); $context['type'] = $this->getType();
$context['attributes'] = implode(' ', $otherattributes); $context['attributes'] = implode(' ', $otherattributes);
$context['emptylabel'] = ($this->getLabel() === ''); $context['emptylabel'] = ($this->getLabel() === '');
$context['iderror'] = preg_replace('/^id_/', 'id_error_', $context['id']);
// Elements with multiple values need array syntax. // Elements with multiple values need array syntax.
if ($this->getAttribute('multiple')) { if ($this->getAttribute('multiple')) {

4
lib/form/templates/element-advcheckbox-inline.mustache
View file

@ -15,7 +15,7 @@
{{#element.checked}}checked{{/element.checked}} {{#element.checked}}checked{{/element.checked}}
size="{{element.size}}" size="{{element.size}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{#element.frozen}} {{#element.frozen}}
disabled disabled
@ -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: block;"{{/error}}> <span class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</span> </span>
{{^element.frozen}} {{^element.frozen}}

4
lib/form/templates/element-advcheckbox.mustache
View file

@ -25,7 +25,7 @@
{{/element.selectedvalue}} {{/element.selectedvalue}}
id="{{element.id}}" {{#element.checked}}checked{{/element.checked}} id="{{element.id}}" {{#element.checked}}checked{{/element.checked}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{#element.frozen}} {{#element.frozen}}
disabled disabled
@ -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: block;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

2
lib/form/templates/element-autocomplete-inline.mustache
View file

@ -8,7 +8,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-autocomplete.mustache
View file

@ -8,7 +8,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-button-inline.mustache
View file

@ -7,7 +7,7 @@
id="{{element.id}}" id="{{element.id}}"
type="button" type="button"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} {{{element.attributes}}}
> >

2
lib/form/templates/element-button.mustache
View file

@ -7,7 +7,7 @@
id="{{element.id}}" id="{{element.id}}"
type="button" type="button"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}}> {{{element.attributes}}}>
{{{element.value}}} {{{element.value}}}

4
lib/form/templates/element-checkbox-inline.mustache
View file

@ -15,7 +15,7 @@
{{#element.checked}}checked{{/element.checked}} {{#element.checked}}checked{{/element.checked}}
size="{{element.size}}" size="{{element.size}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{#element.frozen}} {{#element.frozen}}
disabled disabled
@ -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: block;"{{/error}}> <span class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</span> </span>
{{^element.frozen}} {{^element.frozen}}

4
lib/form/templates/element-checkbox.mustache
View file

@ -25,7 +25,7 @@
{{/element.value}} {{/element.value}}
id="{{element.id}}" {{#element.checked}}checked{{/element.checked}} id="{{element.id}}" {{#element.checked}}checked{{/element.checked}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{#element.frozen}} {{#element.frozen}}
disabled disabled
@ -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: block;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

2
lib/form/templates/element-password.mustache
View file

@ -8,7 +8,7 @@
value="{{element.value}}" value="{{element.value}}"
size="{{element.size}}" size="{{element.size}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{{element.attributes}}}> {{/error}} {{{element.attributes}}}>
{{/element.frozen}} {{/element.frozen}}
{{/element}} {{/element}}

2
lib/form/templates/element-passwordunmask.mustache
View file

@ -57,7 +57,7 @@
class="form-control d-inline-block {{# error }}is-invalid{{/ error }}" class="form-control d-inline-block {{# error }}is-invalid{{/ error }}"
data-size="{{ element.size }}" data-size="{{ element.size }}"
{{# error }} {{# error }}
autofocus aria-describedby="id_error_{{ element.name }}" autofocus aria-describedby="{{ element.iderror }}"
{{/ error }} {{/ error }}
{{{ attributes }}} {{{ attributes }}}
> >

4
lib/form/templates/element-radio-inline.mustache
View file

@ -19,7 +19,7 @@
{{#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="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{{label}}} {{{label}}}
@ -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: block;"{{/error}}> <span class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</span> </span>
{{^element.frozen}} {{^element.frozen}}

4
lib/form/templates/element-radio.mustache
View file

@ -30,7 +30,7 @@
{{#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="{{element.iderror}}"
{{/error}} {{{element.attributes}}} > {{/error}} {{{element.attributes}}} >
{{#text}} {{#text}}
{{{.}}} {{{.}}}
@ -44,7 +44,7 @@
{{{helpbutton}}} {{{helpbutton}}}
</span> </span>
</div> </div>
<div class="form-control-feedback invalid-feedback" id="id_error_{{element.name}}" {{#error}} style="display: block;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

2
lib/form/templates/element-select-inline.mustache
View file

@ -11,7 +11,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}} {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-select.mustache
View file

@ -104,7 +104,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}} {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-selectgroups-inline.mustache
View file

@ -5,7 +5,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.optiongroups}} {{#element.optiongroups}}

2
lib/form/templates/element-selectgroups.mustache
View file

@ -5,7 +5,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.optiongroups}} {{#element.optiongroups}}

2
lib/form/templates/element-selectwithlink.mustache
View file

@ -5,7 +5,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-submit.mustache
View file

@ -13,7 +13,7 @@
name="{{element.name}}" name="{{element.name}}"
id="{{element.id}}" id="{{element.id}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
value="{{element.value}}" value="{{element.value}}"
{{{element.attributes}}} > {{{element.attributes}}} >

2
lib/form/templates/element-tags-inline.mustache
View file

@ -6,7 +6,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-tags.mustache
View file

@ -6,7 +6,7 @@
id="{{element.id}}" id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}} {{#element.multiple}}multiple{{/element.multiple}}
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{#element.options}} {{#element.options}}

2
lib/form/templates/element-template-inline.mustache
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: block;"{{/error}}> <div class="form-control-feedback invalid-feedback" id="{{element.iderror}}" {{#error}} style="display: block;"{{/error}}>
{{{error}}} {{{error}}}
</div> </div>
</div> </div>

2
lib/form/templates/element-template.mustache
View file

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

2
lib/form/templates/element-text-inline.mustache
View file

@ -10,7 +10,7 @@
value="{{element.value}}" value="{{element.value}}"
size="{{element.size}}" size="{{element.size}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}}> {{{element.attributes}}}>
{{/element}} {{/element}}

2
lib/form/templates/element-text.mustache
View file

@ -10,7 +10,7 @@
value="{{element.value}}" value="{{element.value}}"
size="{{element.size}}" size="{{element.size}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} > {{{element.attributes}}} >
{{/element}} {{/element}}

2
lib/form/templates/element-textarea.mustache
View file

@ -6,7 +6,7 @@
id="{{element.id}}" id="{{element.id}}"
class="form-control {{#error}}is-invalid{{/error}}" class="form-control {{#error}}is-invalid{{/error}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{{element.attributes}}} >{{element.value}}</textarea> {{{element.attributes}}} >{{element.value}}</textarea>
{{/element.frozen}} {{/element.frozen}}

2
lib/form/templates/element-url.mustache
View file

@ -10,7 +10,7 @@
value="{{element.value}}" value="{{element.value}}"
size="{{element.size}}" size="{{element.size}}"
{{#error}} {{#error}}
autofocus aria-describedby="id_error_{{element.name}}" autofocus aria-describedby="{{element.iderror}}"
{{/error}} {{/error}}
{{#element.frozen}} {{#element.frozen}}
readonly {{#element.hardfrozen}}disabled{{/element.hardfrozen}} readonly {{#element.hardfrozen}}disabled{{/element.hardfrozen}}

3
lib/outputrenderers.php
View file

@ -4593,8 +4593,7 @@ EOD;
// The id will be something like 'fgroup_id_NAME'. E.g. fgroup_id_mygroup. // The id will be something like 'fgroup_id_NAME'. E.g. fgroup_id_mygroup.
$elementcontext['wrapperid'] = $elementcontext['id']; $elementcontext['wrapperid'] = $elementcontext['id'];
// Ensure group elements pass through the group name as the element name so the id_error_{{element.name}} is // Ensure group elements pass through the group name as the element name.
// properly set in the template.
$elementcontext['name'] = $elementcontext['groupname']; $elementcontext['name'] = $elementcontext['groupname'];
} else { } else {
// Non grouped element. // Non grouped element.