diff --git a/admin/classes/table/plugin_management_table.php b/admin/classes/table/plugin_management_table.php index 6b143ae7d3512..bb339be0220df 100644 --- a/admin/classes/table/plugin_management_table.php +++ b/admin/classes/table/plugin_management_table.php @@ -322,7 +322,7 @@ protected function col_enabled(stdClass $row): string { ], 'title' => $labelstr, 'label' => $labelstr, - 'labelclasses' => 'sr-only', + 'labelclasses' => 'visually-hidden', ]; return $OUTPUT->render_from_template('core_admin/setting_configtoggle', $params); diff --git a/admin/templates/header_search_input.mustache b/admin/templates/header_search_input.mustache index eed7f6a2971fd..5a4372a73cf84 100644 --- a/admin/templates/header_search_input.mustache +++ b/admin/templates/header_search_input.mustache @@ -29,7 +29,7 @@
diff --git a/admin/templates/setting_configduration.mustache b/admin/templates/setting_configduration.mustache index 363830f60dcef..6b5d86180bb23 100644 --- a/admin/templates/setting_configduration.mustache +++ b/admin/templates/setting_configduration.mustache @@ -41,7 +41,7 @@
- + - + {{#hours}} {{/hours}} : - + {{/actionurl}} diff --git a/admin/tool/componentlibrary/content/bootstrap/components/badge.md b/admin/tool/componentlibrary/content/bootstrap/components/badge.md index 7d55cabcfd19c..32ed961b87ab6 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/badge.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/badge.md @@ -34,7 +34,7 @@ Unless the context is clear (as with the "Notifications" example, where it is un {{< example >}} {{< /example >}} diff --git a/admin/tool/componentlibrary/content/bootstrap/components/carousel.md b/admin/tool/componentlibrary/content/bootstrap/components/carousel.md index d23810cc61a45..235874a2c1843 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/carousel.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/carousel.md @@ -65,11 +65,11 @@ Adding in the previous and next controls. We recommend using `
{{< /example >}} @@ -98,11 +98,11 @@ You can also add the indicators to the carousel, alongside the controls, too. {{< /example >}} @@ -143,11 +143,11 @@ Add captions to your slides easily with the `.carousel-caption` element within a {{< /example >}} @@ -171,11 +171,11 @@ Add `.carousel-fade` to your carousel to animate slides with a fade transition i {{< /example >}} @@ -199,11 +199,11 @@ Add `data-interval=""` to a `.carousel-item` to change the amount of time to del {{< /example >}} @@ -227,11 +227,11 @@ Carousels support swiping left/right on touchscreen devices to move between slid {{< /example >}} diff --git a/admin/tool/componentlibrary/content/bootstrap/components/dropdowns.md b/admin/tool/componentlibrary/content/bootstrap/components/dropdowns.md index 315dc082e7c76..4219256eb6fd6 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/dropdowns.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/dropdowns.md @@ -150,7 +150,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -163,7 +163,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -176,7 +176,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -189,7 +189,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -202,7 +202,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -215,7 +215,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -232,7 +232,7 @@ We use this extra class to reduce the horizontal `padding` on either side of the
Action @@ -264,7 +264,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
Action @@ -291,7 +291,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro Large split button
... @@ -315,7 +315,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro
Action @@ -342,7 +342,7 @@ Button dropdowns work with buttons of all sizes, including default and split dro Small split button
... @@ -374,7 +374,7 @@ Trigger dropdown menus above elements by adding `.dropup` to the parent element. Split dropup
Action @@ -403,7 +403,7 @@ Trigger dropdown menus above elements by adding `.dropup` to the parent element. Split dropup
@@ -433,7 +433,7 @@ Trigger dropdown menus at the right of the elements by adding `.dropright` to th Split dropright
Action @@ -462,7 +462,7 @@ Trigger dropdown menus at the right of the elements by adding `.dropright` to th Split dropright
@@ -490,7 +490,7 @@ Trigger dropdown menus at the left of the elements by adding `.dropleft` to the
Action @@ -521,7 +521,7 @@ Trigger dropdown menus at the left of the elements by adding `.dropleft` to the
@@ -757,7 +757,7 @@ Use `data-offset` or `data-reference` to change the location of the dropdown.
Action diff --git a/admin/tool/componentlibrary/content/bootstrap/components/forms.md b/admin/tool/componentlibrary/content/bootstrap/components/forms.md index 40d1d47d2a422..1c97487f2c30e 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/forms.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/forms.md @@ -137,11 +137,11 @@ If you want to have `` elements in your form styled as plain tex {{< example >}}
- +
- +
@@ -478,11 +478,11 @@ The example below uses a flexbox utility to vertically center the contents and c
- +
- +
@
@@ -511,11 +511,11 @@ You can then remix that once again with size-specific column classes.
- +
- +
@
@@ -544,7 +544,7 @@ And of course [custom form controls](#custom-forms) are supported.
- + - +
@
@@ -622,7 +622,7 @@ Custom form controls and selects are also supported. {{< callout warning >}} ##### Alternatives to hidden labels -Assistive technologies such as screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the `.sr-only` class. There are further alternative methods of providing a label for assistive technologies, such as the `aria-label`, `aria-labelledby` or `title` attribute. If none of these are present, assistive technologies may resort to using the `placeholder` attribute, if present, but note that use of `placeholder` as a replacement for other labelling methods is not advised. +Assistive technologies such as screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the `.visually-hidden` class. There are further alternative methods of providing a label for assistive technologies, such as the `aria-label`, `aria-labelledby` or `title` attribute. If none of these are present, assistive technologies may resort to using the `placeholder` attribute, if present, but note that use of `placeholder` as a replacement for other labelling methods is not advised. {{< /callout >}} ## Help text diff --git a/admin/tool/componentlibrary/content/bootstrap/components/input-group.md b/admin/tool/componentlibrary/content/bootstrap/components/input-group.md index 7b745dc491230..b93500964ab6b 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/input-group.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/input-group.md @@ -226,7 +226,7 @@ Multiple add-ons are supported and can be mixed with checkbox and radio input ve
Action @@ -244,7 +244,7 @@ Multiple add-ons are supported and can be mixed with checkbox and radio input ve
Action @@ -367,11 +367,11 @@ Ensure that all form controls have an appropriate accessible name so that their For situations where it's not possible to include a visible `
diff --git a/admin/tool/moodlenet/templates/view-cards.mustache b/admin/tool/moodlenet/templates/view-cards.mustache index bf6d8e9af5a24..2c601ee66e12f 100644 --- a/admin/tool/moodlenet/templates/view-cards.mustache +++ b/admin/tool/moodlenet/templates/view-cards.mustache @@ -41,7 +41,7 @@ {{/coursename}} {{$coursecategory}} - + diff --git a/admin/tool/policy/templates/acceptances_filter.mustache b/admin/tool/policy/templates/acceptances_filter.mustache index 1aebf34b0dd3c..443267f641813 100644 --- a/admin/tool/policy/templates/acceptances_filter.mustache +++ b/admin/tool/policy/templates/acceptances_filter.mustache @@ -52,7 +52,7 @@ } }} - +
diff --git a/course/templates/completion_action_bar.mustache b/course/templates/completion_action_bar.mustache index 0cf4b868688b0..a9e9446a44e57 100644 --- a/course/templates/completion_action_bar.mustache +++ b/course/templates/completion_action_bar.mustache @@ -38,7 +38,7 @@ "labelattributes":[ { "name":"class", - "value":"sr-only" + "value":"visually-hidden" } ] } diff --git a/course/templates/coursecard.mustache b/course/templates/coursecard.mustache index 0258562974706..14df67d9cfc87 100644 --- a/course/templates/coursecard.mustache +++ b/course/templates/coursecard.mustache @@ -39,7 +39,7 @@ data-course-id="{{{id}}}">
- {{fullname}} +
@@ -47,7 +47,7 @@
{{#showshortname}}
- +
@@ -57,7 +57,7 @@ {{/showshortname}} {{> core_course/favouriteicon }} - + {{$coursename}}{{/coursename}} diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache index fcd45f7c30341..2c4f05110ed19 100644 --- a/course/templates/defaultactivitycompletion.mustache +++ b/course/templates/defaultactivitycompletion.mustache @@ -61,12 +61,12 @@ title="{{#str}} expandcategory, core, {{formattedname}} {{/str}}"> {{#pix}} t/collapsedchevron, core {{/pix}} {{#pix}} t/collapsedchevron_rtl, core {{/pix}} - {{#str}} expandcategory, core, {{formattedname}} {{/str}} + {{#pix}} t/expandedchevron, core {{/pix}} - {{#str}} collapsecategory, core, {{formatedname}} {{/str}} +

{{{formattedname}}}

diff --git a/course/templates/favouriteicon.mustache b/course/templates/favouriteicon.mustache index 5f2cc130f9ba4..96f7654fb4a1f 100644 --- a/course/templates/favouriteicon.mustache +++ b/course/templates/favouriteicon.mustache @@ -35,6 +35,6 @@ aria-hidden="{{^isfavourite}}true{{/isfavourite}}{{#isfavourite}}false{{/isfavourite}}" > {{#pix}} i/star, core, {{#str}} favourite, core_course {{/str}} {{/pix}} - {{#str}} aria:favourite, core_course {{/str}} + diff --git a/course/templates/local/activitychooser/item.mustache b/course/templates/local/activitychooser/item.mustache index 889fa492b8376..50fe507e3e0b8 100644 --- a/course/templates/local/activitychooser/item.mustache +++ b/course/templates/local/activitychooser/item.mustache @@ -67,7 +67,7 @@ {{/legacyitem}}
diff --git a/course/templates/participants_actionbar.mustache b/course/templates/participants_actionbar.mustache index 8a3ef8e0b2443..b433845ab003e 100644 --- a/course/templates/participants_actionbar.mustache +++ b/course/templates/participants_actionbar.mustache @@ -91,7 +91,7 @@ "labelattributes":[ { "name":"class", - "value":"sr-only" + "value":"visually-hidden" } ] }, diff --git a/course/templates/view-cards.mustache b/course/templates/view-cards.mustache index d0c85e03679be..b897e0d90518e 100644 --- a/course/templates/view-cards.mustache +++ b/course/templates/view-cards.mustache @@ -40,7 +40,7 @@ {{$coursename}} {{{fullname}}} {{/coursename}} {{$coursecategory}} {{#showcoursecategory}} - +
{{{coursecategory}}}
diff --git a/grade/classes/output/general_action_bar.php b/grade/classes/output/general_action_bar.php index 781eae9d89f53..421109973f905 100644 --- a/grade/classes/output/general_action_bar.php +++ b/grade/classes/output/general_action_bar.php @@ -188,7 +188,7 @@ private function get_action_selector(): ?select_menu { } $selectmenu = new select_menu('gradesactionselect', $menu, $this->activeurl->out(false)); - $selectmenu->set_label(get_string('gradebooknavigationmenu', 'grades'), ['class' => 'sr-only']); + $selectmenu->set_label(get_string('gradebooknavigationmenu', 'grades'), ['class' => 'visually-hidden']); return $selectmenu; } diff --git a/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache b/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache index a7b1dc1722220..8945262e8f5f5 100644 --- a/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache +++ b/grade/grading/form/guide/templates/grades/grader/gradingpanel.mustache @@ -73,7 +73,7 @@ type="button" > {{# pix }} info, gradingform_guide {{/ pix }} - {{#str}}informationforcriterion, gradingform_guide, {{name}}{{/str}} +
@@ -108,7 +108,7 @@ aria-describedby="gradingform_guide-{{uniqid}}-help-{{id}}-score" min="0" max="{{maxscore}}" aria-label="{{#str}}scoreforcriterion, gradingform_guide, {{name}}{{/str}}"> -
@@ -134,7 +134,7 @@ type="button" > {{#pix}}plus, gradingform_guide{{/pix}} - {{#str}}commentpickerforcriterion, gradingform_guide, {{name}}{{/str}} + {{/hascomments}}
@@ -150,7 +150,7 @@
{{/hascomments}} - +
diff --git a/grade/grading/form/rubric/renderer.php b/grade/grading/form/rubric/renderer.php index 6017a553ea660..7b3d71d59fe0d 100644 --- a/grade/grading/form/rubric/renderer.php +++ b/grade/grading/form/rubric/renderer.php @@ -404,7 +404,7 @@ protected function rubric_template($mode, $options, $elementname, $criteriastr) 'class' => 'criteria', 'id' => '{NAME}-criteria', ]; - $caption = html_writer::tag('caption', get_string('rubric', 'gradingform_rubric'), ['class' => 'sr-only']); + $caption = html_writer::tag('caption', get_string('rubric', 'gradingform_rubric'), ['class' => 'visually-hidden']); $rubrictable = html_writer::tag('table', $caption . $criteriastr, $rubrictableparams); $rubrictemplate .= $rubrictable; if ($mode == gradingform_rubric_controller::DISPLAY_EDIT_FULL) { diff --git a/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache b/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache index c52d1695b9588..60a72da438a61 100644 --- a/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache +++ b/grade/grading/form/rubric/templates/grades/grader/gradingpanel.mustache @@ -68,11 +68,11 @@ aria-controls="criteria-{{id}}"> {{#pix}} t/collapsed, core {{/pix}} - {{#str}} expandcriterion, core_grades {{/str}} + {{#pix}} t/expanded, core {{/pix}} - {{#str}} collapsecriterion, core_grades {{/str}} +
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index c0b1a5b7bd57f..de8e6ccb463f4 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1690,7 +1690,7 @@ protected function get_course_header($element) { 'class' => 'gradeitemheader', 'aria-describedby' => $describedbyid ]); - $courseheader .= html_writer::div($showing, 'sr-only', [ + $courseheader .= html_writer::div($showing, 'visually-hidden', [ 'id' => $describedbyid ]); diff --git a/grade/report/grader/templates/collapse/collapsebody.mustache b/grade/report/grader/templates/collapse/collapsebody.mustache index 08e1b0b76bd67..1f2742bd488a7 100644 --- a/grade/report/grader/templates/collapse/collapsebody.mustache +++ b/grade/report/grader/templates/collapse/collapsebody.mustache @@ -43,7 +43,7 @@ {{/ core/search_input_auto }}
- {{#str}} aria:dropdowncolumns, gradereport_grader {{/str}} +
    {{>gradereport_grader/collapse/collapseresults}}
diff --git a/grade/report/grader/templates/collapse/icon.mustache b/grade/report/grader/templates/collapse/icon.mustache index f4f6a4d7c77dc..83e26d472ca81 100644 --- a/grade/report/grader/templates/collapse/icon.mustache +++ b/grade/report/grader/templates/collapse/icon.mustache @@ -25,5 +25,5 @@ }} diff --git a/grade/report/singleview/templates/bulkinsert.mustache b/grade/report/singleview/templates/bulkinsert.mustache index 0ef12da75e239..b9ce2ca73797f 100644 --- a/grade/report/singleview/templates/bulkinsert.mustache +++ b/grade/report/singleview/templates/bulkinsert.mustache @@ -24,7 +24,7 @@
{{#str}}unsavedataalert, gradereport_singleview{{/str}} - {{#str}}unsaveddatawarning, gradereport_singleview{{/str}} +
diff --git a/grade/templates/cellmenu.mustache b/grade/templates/cellmenu.mustache index 078357bbd8f0e..8eb99343f112f 100644 --- a/grade/templates/cellmenu.mustache +++ b/grade/templates/cellmenu.mustache @@ -46,7 +46,7 @@ {{#datatype}}data-type="{{datatype}}"{{/datatype}} {{#dataid}}data-id="{{dataid}}"{{/dataid}}> - {{#str}} cellactions, gradereport_grader {{/str}} +