From f9abc562f56e3964cdf5ec56057137d6cec961cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mikel=20Mart=C3=ADn?= Date: Fri, 8 Nov 2024 10:35:21 +0100 Subject: [PATCH] MDL-81825 theme_boost: Refactor .sr-only usages for BS5 - Add .visually-hidden to the Boostratp 5 bridge SCSS file - Replace .sr-only occurrences with .visually-hidden - Replace .dropzone-sr-only-focusable with .dropzone-visually-hidden-focusable for consistency --- .../classes/table/plugin_management_table.php | 2 +- admin/templates/header_search_input.mustache | 4 +- .../templates/setting_configduration.mustache | 2 +- .../templates/setting_configfilesize.mustache | 2 +- admin/templates/setting_configtime.mustache | 4 +- admin/templates/setting_configtoggle.mustache | 4 +- .../themeselector/theme_card.mustache | 8 ++-- .../content/bootstrap/components/badge.md | 2 +- .../content/bootstrap/components/carousel.md | 24 ++++++------ .../content/bootstrap/components/dropdowns.md | 36 +++++++++--------- .../content/bootstrap/components/forms.md | 22 +++++------ .../bootstrap/components/input-group.md | 8 ++-- .../content/bootstrap/components/navbar.md | 24 ++++++------ .../content/bootstrap/components/spinners.md | 30 +++++++-------- .../content/moodle/components/toggle.md | 4 +- .../content/moodle/themes/text.md | 4 +- .../hugo/site/layouts/_default/docs.html | 2 +- ...ut-warning-color-assistive-technologies.md | 2 +- .../hugo/site/layouts/partials/skippy.html | 2 +- .../site/layouts/shortcodes/mustache.html | 2 +- .../examples/toggle/example.mustache | 2 +- .../customlang/templates/translator.mustache | 2 +- .../templates/request_filter.mustache | 2 +- .../moodlenet/templates/select_page.mustache | 4 +- .../moodlenet/templates/view-cards.mustache | 2 +- .../templates/acceptances_filter.mustache | 2 +- .../aiplacement_action_management_table.php | 2 +- .../aiprovider_action_management_table.php | 2 +- .../courseassist/templates/drawer.mustache | 2 +- backup/util/helper/backup_helper.class.php | 2 +- .../templates/course-action-menu.mustache | 10 ++--- .../templates/progress-bar.mustache | 2 +- .../myoverview/templates/view-cards.mustache | 4 +- .../myoverview/templates/view-list.mustache | 8 ++-- .../templates/view-summary.mustache | 10 ++--- .../templates/course-card.mustache | 2 +- calendar/renderer.php | 2 +- calendar/templates/header.mustache | 2 +- calendar/templates/month_detailed.mustache | 6 +-- calendar/templates/month_mini.mustache | 4 +- comment/lib.php | 2 +- contentbank/classes/output/bankcontent.php | 2 +- course/classes/management_renderer.php | 6 +-- course/classes/output/activity_navigation.php | 2 +- course/classes/output/category_action_bar.php | 2 +- .../classes/output/completion_action_bar.php | 2 +- .../output/manage_categories_action_bar.php | 4 +- .../local/content/cm/bulkselect.mustache | 2 +- .../content/cm/completion_dialog.mustache | 6 +-- .../local/content/movecmsection.mustache | 4 +- .../local/content/section/bulkselect.mustache | 2 +- .../local/content/section/content.mustache | 2 +- .../local/content/section/header.mustache | 4 +- .../local/courseindex/section.mustache | 4 +- course/templates/activity_list.mustache | 4 +- .../templates/completion_action_bar.mustache | 2 +- course/templates/coursecard.mustache | 6 +-- .../defaultactivitycompletion.mustache | 4 +- course/templates/favouriteicon.mustache | 2 +- .../local/activitychooser/item.mustache | 2 +- .../templates/participants_actionbar.mustache | 2 +- course/templates/view-cards.mustache | 2 +- grade/classes/output/general_action_bar.php | 2 +- .../grades/grader/gradingpanel.mustache | 12 +++--- grade/grading/form/rubric/renderer.php | 2 +- .../grades/grader/gradingpanel.mustache | 4 +- grade/report/grader/lib.php | 2 +- .../templates/collapse/collapsebody.mustache | 2 +- .../grader/templates/collapse/icon.mustache | 2 +- .../singleview/templates/bulkinsert.mustache | 4 +- grade/templates/cellmenu.mustache | 2 +- lib/amd/build/copy_to_clipboard.min.js | Bin 3484 -> 3492 bytes lib/amd/build/copy_to_clipboard.min.js.map | Bin 9499 -> 9516 bytes lib/amd/build/datafilter/filtertype.min.js | Bin 3722 -> 3730 bytes .../build/datafilter/filtertype.min.js.map | Bin 10488 -> 10497 bytes lib/amd/build/dropzone.min.js | Bin 2738 -> 2746 bytes lib/amd/build/dropzone.min.js.map | Bin 7625 -> 7633 bytes lib/amd/build/local/reactive/srlogger.min.js | Bin 1013 -> 1021 bytes .../build/local/reactive/srlogger.min.js.map | Bin 3527 -> 3560 bytes lib/amd/src/copy_to_clipboard.js | 4 +- lib/amd/src/datafilter/filtertype.js | 2 +- lib/amd/src/dropzone.js | 2 +- lib/amd/src/local/reactive/srlogger.js | 8 ++-- lib/classes/navigation/views/secondary.php | 4 +- lib/classes/output/core_renderer.php | 9 +++-- .../output/participants_action_bar.php | 2 +- lib/classes/report_helper.php | 2 +- .../moodle-atto_h5p-button-debug.js | Bin 22413 -> 22421 bytes .../moodle-atto_h5p-button-min.js | Bin 9040 -> 9048 bytes .../moodle-atto_h5p-button.js | Bin 22413 -> 22421 bytes .../plugins/h5p/yui/src/button/js/button.js | 2 +- .../moodle-atto_media-button-debug.js | Bin 52665 -> 52673 bytes .../moodle-atto_media-button-min.js | Bin 26567 -> 26575 bytes .../moodle-atto_media-button.js | Bin 52665 -> 52673 bytes .../plugins/media/yui/src/button/js/button.js | 2 +- .../moodle-editor_atto-editor-debug.js | Bin 108926 -> 108956 bytes .../moodle-editor_atto-editor-min.js | Bin 26270 -> 26278 bytes .../moodle-editor_atto-editor.js | Bin 106574 -> 106604 bytes lib/editor/atto/yui/src/editor/js/editor.js | 4 +- .../aiplacement/templates/loading.mustache | 2 +- .../tiny/plugins/h5p/templates/modal.mustache | 2 +- .../embed_media_modal_audio.mustache | 6 +-- .../embed_media_modal_video.mustache | 6 +-- lib/form/dndupload.js | 4 +- lib/form/templates/editor_textarea.mustache | 2 +- .../templates/element-date_selector.mustache | 2 +- .../element-date_time_selector.mustache | 2 +- .../templates/element-defaultcustom.mustache | 2 +- .../templates/element-filemanager.mustache | 2 +- .../templates/element-filepicker.mustache | 2 +- lib/form/templates/element-group.mustache | 2 +- lib/form/templates/element-header.mustache | 4 +- .../element-template-inline.mustache | 2 +- lib/form/templates/element-template.mustache | 4 +- lib/templates/activity_header.mustache | 2 +- lib/templates/block.mustache | 2 +- .../autocomplete_selection.mustache | 2 +- lib/templates/datafilter/filter_row.mustache | 4 +- .../filtertypes/binary_selector.mustache | 2 +- lib/templates/dropzone.mustache | 2 +- .../filemanager_default_searchform.mustache | 2 +- .../filemanager_page_generallayout.mustache | 8 ++-- .../filemanager_selectlayout.mustache | 2 +- .../form_autocomplete_selection.mustache | 2 +- lib/templates/loginform.mustache | 12 +++--- .../send_activity_modal_base.mustache | 2 +- lib/templates/notification_base.mustache | 2 +- lib/templates/paging_bar.mustache | 10 ++--- lib/templates/search_input.mustache | 4 +- lib/templates/search_input_auto.mustache | 4 +- lib/templates/search_input_navbar.mustache | 8 ++-- lib/templates/select_time.mustache | 2 +- lib/templates/skip_links.mustache | 2 +- lib/templates/toggle.mustache | 2 +- message/templates/message_drawer.mustache | 2 +- ...message_drawer_conversations_list.mustache | 2 +- ...message_drawer_view_contacts_body.mustache | 2 +- ...iew_conversation_footer_edit_mode.mustache | 2 +- ...ssage_drawer_view_overview_header.mustache | 2 +- ...sage_drawer_view_overview_section.mustache | 4 +- ...drawer_view_settings_body_content.mustache | 2 +- message/templates/message_jumpto.mustache | 2 +- message/templates/message_popover.mustache | 2 +- message/templates/send_bulk_message.mustache | 2 +- .../grading_navigation_user_selector.mustache | 2 +- .../search_input_recordings.mustache | 4 +- mod/data/classes/output/action_bar.php | 6 +-- mod/data/templates/presets.mustache | 6 +-- .../classes/local/renderers/discussion.php | 2 +- .../report/summary/classes/summary_table.php | 2 +- mod/forum/templates/discussion_list.mustache | 4 +- ...m_discussion_nested_v2_first_post.mustache | 2 +- ...m_discussion_nested_v2_post_reply.mustache | 2 +- .../templates/forum_discussion_post.mustache | 4 +- .../grades/local/grader/grading.mustache | 2 +- .../grades/local/grader/user_picker.mustache | 2 +- .../classes/output/standard_action_bar.php | 2 +- .../templates/standard_action_menu.mustache | 2 +- .../classes/output/edit_action_area.php | 2 +- .../classes/output/override_action_menu.php | 2 +- .../classes/output/report_action_menu.php | 2 +- .../course_external_tools_list.php | 2 +- .../amd/build/edit_multiple_grades.min.js | Bin 9173 -> 9181 bytes .../amd/build/edit_multiple_grades.min.js.map | Bin 23052 -> 23060 bytes mod/quiz/amd/src/edit_multiple_grades.js | 2 +- mod/quiz/classes/output/edit_nav_actions.php | 2 +- mod/quiz/classes/output/edit_renderer.php | 6 +-- mod/quiz/templates/edit_grading_page.mustache | 4 +- mod/quiz/templates/question_slot.mustache | 2 +- .../moodle-mod_quiz-toolboxes-debug.js | Bin 44112 -> 44160 bytes .../moodle-mod_quiz-toolboxes-min.js | Bin 14082 -> 14114 bytes .../moodle-mod_quiz-toolboxes.js | Bin 44112 -> 44160 bytes mod/quiz/yui/src/toolboxes/js/section.js | 12 +++--- .../templates/column_sort_ui.mustache | 2 +- question/engine/lib.php | 4 +- .../tests/question_display_options_test.php | 10 ++++- question/type/essay/renderer.php | 12 +++--- question/type/gapselect/renderer.php | 2 +- question/type/multianswer/renderer.php | 4 +- .../multichoice/amd/build/clearchoice.min.js | Bin 1683 -> 1699 bytes .../amd/build/clearchoice.min.js.map | Bin 5996 -> 6022 bytes .../type/multichoice/amd/src/clearchoice.js | 6 +-- question/type/multichoice/renderer.php | 8 ++-- .../multichoice/tests/walkthrough_test.php | 2 +- question/type/numerical/renderer.php | 2 +- .../formulation_and_controls.mustache | 2 +- question/type/shortanswer/renderer.php | 2 +- question/type/truefalse/renderer.php | 2 +- .../type/truefalse/tests/walkthrough_test.php | 2 +- report/insights/classes/output/insight.php | 2 +- .../insights/classes/output/insights_list.php | 2 +- .../local/systemreports/report_schedules.php | 2 +- .../classes/table/base_report_table.php | 2 +- .../classes/table/system_report_table.php | 2 +- .../local/dynamictabs/access.mustache | 2 +- .../local/dynamictabs/audience.mustache | 2 +- .../local/dynamictabs/editor.mustache | 2 +- .../local/settings/conditions.mustache | 2 +- .../templates/local/settings/filters.mustache | 2 +- .../templates/local/settings/sorting.mustache | 2 +- .../local/sidebar-menu/area.mustache | 2 +- repository/filepicker.js | 4 +- sms/classes/table/sms_gateway_table.php | 2 +- theme/boost/scss/moodle/bs5-bridge.scss | 17 +++++++++ theme/boost/scss/moodle/calendar.scss | 2 +- theme/boost/scss/moodle/core.scss | 14 +++---- theme/boost/scss/moodle/modules.scss | 4 +- .../boost/scss/moodle/primarynavigation.scss | 2 +- theme/boost/scss/moodle/question.scss | 2 +- theme/boost/scss/moodle/variables.scss | 2 +- theme/boost/style/moodle.css | 24 ++++++------ theme/boost/templates/drawers.mustache | 4 +- theme/boost/templates/navbar.mustache | 2 +- .../templates/primary-drawer-mobile.mustache | 4 +- theme/classic/style/moodle.css | 24 ++++++------ user/classes/table/participants.php | 2 +- user/profile.php | 2 +- user/templates/add_bulk_note.mustache | 2 +- .../comboboxsearch/resultitem.mustache | 2 +- user/templates/send_bulk_message.mustache | 2 +- 220 files changed, 424 insertions(+), 398 deletions(-) diff --git a/admin/classes/table/plugin_management_table.php b/admin/classes/table/plugin_management_table.php index 6b143ae7d35..bb339be0220 100644 --- a/admin/classes/table/plugin_management_table.php +++ b/admin/classes/table/plugin_management_table.php @@ -322,7 +322,7 @@ abstract class plugin_management_table extends flexible_table implements dynamic ], '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 eed7f6a2971..5a4372a73cf 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 363830f60dc..6b5d86180bb 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 7d55cabcfd1..32ed961b87a 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 d23810cc61a..235874a2c18 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 315dc082e7c..4219256eb6f 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 40d1d47d2a4..1c97487f2c3 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 7b745dc4912..b93500964ab 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 bf6d8e9af5a..2c601ee66e1 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 1aebf34b0dd..443267f6418 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 0cf4b868688..a9e9446a44e 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 02585629747..14df67d9cfc 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 fcd45f7c303..2c4f05110ed 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 5f2cc130f9b..96f7654fb4a 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 889fa492b83..50fe507e3e0 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 8a3ef8e0b24..b433845ab00 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 d0c85e03679..b897e0d9051 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 781eae9d89f..421109973f9 100644 --- a/grade/classes/output/general_action_bar.php +++ b/grade/classes/output/general_action_bar.php @@ -188,7 +188,7 @@ class general_action_bar extends action_bar { } $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 4859d172c16..02c108de80b 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 6017a553ea6..7b3d71d59fe 100644 --- a/grade/grading/form/rubric/renderer.php +++ b/grade/grading/form/rubric/renderer.php @@ -404,7 +404,7 @@ class gradingform_rubric_renderer extends plugin_renderer_base { '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 941afceedf0..dccf2b7231c 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 87be16c4684..3bf70616862 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1520,7 +1520,7 @@ class grade_report_grader extends grade_report { '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 08e1b0b76bd..1f2742bd488 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 f4f6a4d7c77..83e26d472ca 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 e187064818d..23397e90e74 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 078357bbd8f..8eb99343f11 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}} + -
{{#pix}}i/loading_small{{/pix}}{{#str}}loadinghelp{{/str}}
+
{{#pix}}i/loading_small{{/pix}}
diff --git a/lib/templates/filemanager_selectlayout.mustache b/lib/templates/filemanager_selectlayout.mustache index dd65c003f0e..c11b1ce9948 100644 --- a/lib/templates/filemanager_selectlayout.mustache +++ b/lib/templates/filemanager_selectlayout.mustache @@ -24,7 +24,7 @@ }}
- {{#str}}loadinghelp{{/str}} + {{#pix}}i/loading_small{{/pix}}
diff --git a/lib/templates/form_autocomplete_selection.mustache b/lib/templates/form_autocomplete_selection.mustache index 378ffa4e490..68b72345e8c 100644 --- a/lib/templates/form_autocomplete_selection.mustache +++ b/lib/templates/form_autocomplete_selection.mustache @@ -37,7 +37,7 @@ { "label": "Another item label with tags", "value": "4" } ], "noSelectionString": "No selection" } }} -{{#str}}selecteditems, form{{/str}} + {{sitename}} -

{{#str}} loginto, core, {{sitename}} {{/str}}

+

{{#str}} loginto, core, {{sitename}} {{/str}}

{{/logourl}} {{^logourl}} @@ -115,15 +115,15 @@
{{/maintenance}} {{#error}} - {{error}} + {{/error}} {{#info}} - {{info}} + {{/info}} {{#cansignup}} - {{#str}} tocreatenewaccount {{/str}} + {{/cansignup}} {{#showloginform}} @@ -131,7 +131,7 @@