L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-70288 core: Remove duplicate labels for checkbox elements

Browse Source 
* If there's a label, the text will serve as the description of  the
element.
This commit is contained in:
Jun Pataleta
2021-02-02 13:11:58 +08:00
parent da237792ec
commit e3457dc4aa
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/templates/element-advcheckbox.mustache
+14 -7
View File
@@ -8,7 +8,6 @@
</div>
<div class="col-md-9 checkbox">
<div class="form-check d-flex">
<label>
{{^element.hardfrozen}}
{{^element.frozen}}
<input type="hidden" name="{{element.name}}" value="{{element.deselectedvalue}}">
@@ -25,19 +24,27 @@
{{/element.selectedvalue}}
id="{{element.id}}" {{#element.checked}}checked{{/element.checked}}
{{#error}}
autofocus aria-describedby="{{element.iderror}}"
autofocus aria-describedby="{{#text}}{{element.id}}_description {{/text}}{{element.iderror}}"
{{/error}}
{{^error}}
{{#text}}
aria-describedby="{{element.id}}_description"
{{/text}}
{{/error}}
{{#element.frozen}}
disabled
{{/element.frozen}}
{{{element.attributes}}} >
{{#text}}
{{#text}}
<span id="{{element.id}}_description">
{{{.}}}
{{/text}}
{{^text}}
</span>
{{/text}}
{{^text}}
<label for="{{element.id}}">
{{{label}}}
{{/text}}
</label>
</label>
{{/text}}
<div class="ml-2 d-flex align-items-center align-self-start">
{{#required}}
<div class="text-danger" title="{{#str}}required{{/str}}">
lib/form/templates/element-checkbox.mustache
+14 -7
View File
@@ -8,7 +8,6 @@
</div>
<div class="col-md-9 checkbox">
<div class="form-check d-flex">
<label>
{{^element.hardfrozen}}
{{#element.frozen}}
<input type="hidden" name="{{element.name}}" value="{{element.frozenvalue}}">
@@ -25,19 +24,27 @@
{{/element.value}}
id="{{element.id}}" {{#element.checked}}checked{{/element.checked}}
{{#error}}
autofocus aria-describedby="{{element.iderror}}"
autofocus aria-describedby="{{#text}}{{element.id}}_description {{/text}}{{element.iderror}}"
{{/error}}
{{^error}}
{{#text}}
aria-describedby="{{element.id}}_description"
{{/text}}
{{/error}}
{{#element.frozen}}
disabled
{{/element.frozen}}
{{{element.attributes}}} >
{{#text}}
{{#text}}
<span id="{{element.id}}_description">
{{{.}}}
{{/text}}
{{^text}}
</span>
{{/text}}
{{^text}}
<label for="{{element.id}}">
{{{label}}}
{{/text}}
</label>
</label>
{{/text}}
<div class="ml-2 d-flex align-items-center align-self-start">
{{#required}}
<div class="text-danger" title="{{#str}}required{{/str}}">