diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 369bad45aa..845805d638 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -46,6 +46,7 @@ Changelog * Fix: Remove duplicate labels in image gallery and image choosers for screen reader users (Helen Chapman) * Fix: Restore custom "Date" icon for scheduled publishing panel in Edit page’s Settings tab (Helen Chapman) * Fix: Added missing form media to user edit form template (Matt Westcott) + * Fix: Add a label to the modals’ “close” button for screen reader users (Helen Chapman, Katie Locke) 2.5.1 (07.05.2019) diff --git a/client/tests/stubs.js b/client/tests/stubs.js index ad82e10d20..7a7a0a60a1 100644 --- a/client/tests/stubs.js +++ b/client/tests/stubs.js @@ -43,6 +43,7 @@ global.wagtailConfig = { EDITOR_CRASH: 'The editor just crashed. Content has been reset to the last saved version.', BROKEN_LINK: 'Broken link', MISSING_DOCUMENT: 'Missing document', + CLOSE: 'Close', }, }; diff --git a/docs/releases/2.6.rst b/docs/releases/2.6.rst index 44cd48aa9b..8601b1d669 100644 --- a/docs/releases/2.6.rst +++ b/docs/releases/2.6.rst @@ -60,6 +60,7 @@ Bug fixes * Remove duplicate labels in image gallery and image choosers for screen reader users (Helen Chapman) * Restore custom "Date" icon for scheduled publishing panel in Edit page’s Settings tab (Helen Chapman) * Added missing form media to user edit form template (Matt Westcott) + * Added a label to the modals’ “close” button for screen reader users (Helen Chapman, Katie Locke) Upgrade considerations diff --git a/wagtail/admin/static_src/wagtailadmin/js/modal-workflow.js b/wagtail/admin/static_src/wagtailadmin/js/modal-workflow.js index a470cf7565..4dddc71de8 100644 --- a/wagtail/admin/static_src/wagtailadmin/js/modal-workflow.js +++ b/wagtail/admin/static_src/wagtailadmin/js/modal-workflow.js @@ -21,7 +21,7 @@ function ModalWorkflow(opts) { $('body > .modal').remove(); // set default contents of container - var container = $('
'); + var container = $(' '); // add container to body and hide it, so content can be added to it before display $('body').append(container); diff --git a/wagtail/admin/templates/wagtailadmin/admin_base.html b/wagtail/admin/templates/wagtailadmin/admin_base.html index d9b62f0aa6..53ab50902e 100644 --- a/wagtail/admin/templates/wagtailadmin/admin_base.html +++ b/wagtail/admin/templates/wagtailadmin/admin_base.html @@ -51,6 +51,7 @@ EDITOR_CRASH: "{% trans 'The editor just crashed. Content has been reset to the last saved version.' %}", BROKEN_LINK: "{% trans 'Broken link' %}", MISSING_DOCUMENT: "{% trans 'Missing document' %}", + CLOSE: "{% trans 'Close' %}", MONTHS: [ "{% trans 'January' %}",