diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 87033e081b..f6973a5c6d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -26,6 +26,7 @@ Changelog
* Improved heading structure for screen reader users navigating the CMS admin (Beth Menzies, Helen Chapman)
* Updated group edit view to expose the Permission object for each checkbox (George Hickman)
* Improve performance of Pages for Moderation panel (Fidel Ramos)
+ * Add more contextual information for screen readers in the explorer menu’s links (Helen Chapman)
* Fix: ModelAdmin no longer fails when filtering over a foreign key relation (Jason Dilworth, Matt Westcott)
* Fix: The Wagtail version number is now visible within the Settings menu (Kevin Howbrook)
* Fix: Scaling images now rounds values to an integer so that images render without errors (Adrian Brunyate)
diff --git a/client/src/components/Explorer/ExplorerItem.js b/client/src/components/Explorer/ExplorerItem.js
index 4501d5b9eb..2aa721ecc5 100644
--- a/client/src/components/Explorer/ExplorerItem.js
+++ b/client/src/components/Explorer/ExplorerItem.js
@@ -11,14 +11,6 @@ const childrenIcon = (
);
-const editIcon = (
-
-);
-
-const nextIcon = (
-
-);
-
/**
* One menu item in the page explorer, with different available actions
* and information depending on the metadata of the page.
@@ -47,7 +39,7 @@ const ExplorerItem = ({ item, onClick }) => {
href={`${ADMIN_URLS.PAGES}${id}/edit/`}
className="c-explorer__item__action c-explorer__item__action--small"
>
- {editIcon}
+
{hasChildren ? (
) : null}
diff --git a/client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap b/client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap
index fcd5756ddb..793ded5239 100644
--- a/client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap
+++ b/client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap
@@ -38,7 +38,7 @@ exports[`ExplorerItem children 1`] = `
@@ -93,7 +93,7 @@ exports[`ExplorerItem renders 1`] = `
@@ -150,7 +150,7 @@ exports[`ExplorerItem should show a publication status if not live 1`] = `
@@ -223,7 +223,7 @@ exports[`ExplorerItem should show a publication status with unpublished changes
diff --git a/client/tests/stubs.js b/client/tests/stubs.js
index 7a7a0a60a1..751bb101c9 100644
--- a/client/tests/stubs.js
+++ b/client/tests/stubs.js
@@ -20,14 +20,12 @@ global.wagtailConfig = {
SHORT_DATE_FORMAT: 'DD/MM/YYYY',
},
STRINGS: {
- EDIT: 'Edit',
DELETE: 'Delete',
PAGE: 'Page',
PAGES: 'Pages',
LOADING: 'Loading…',
NO_RESULTS: 'No results',
SERVER_ERROR: 'Server Error',
- SEE_CHILDREN: 'See children',
SEE_ALL: 'See all',
CLOSE_EXPLORER: 'Close explorer',
ALT_TEXT: 'Alt text',
@@ -44,6 +42,8 @@ global.wagtailConfig = {
BROKEN_LINK: 'Broken link',
MISSING_DOCUMENT: 'Missing document',
CLOSE: 'Close',
+ EDIT_PAGE: 'Edit \'{title}\'',
+ VIEW_CHILD_PAGES_OF_PAGE: 'View child pages of \'{title}\'',
},
};
diff --git a/docs/releases/2.6.rst b/docs/releases/2.6.rst
index fb24f10728..94f77d5031 100644
--- a/docs/releases/2.6.rst
+++ b/docs/releases/2.6.rst
@@ -35,6 +35,7 @@ Other features
* Improved heading structure for screen reader users navigating the CMS admin (Beth Menzies, Helen Chapman)
* Update group edit view to expose the ``Permission`` object for each checkbox (George Hickman)
* Improve performance of Pages for Moderation panel (Fidel Ramos)
+ * Add more contextual information for screen readers in the explorer menu’s links (Helen Chapman)
Bug fixes
diff --git a/wagtail/admin/templates/wagtailadmin/admin_base.html b/wagtail/admin/templates/wagtailadmin/admin_base.html
index 53ab50902e..52ac924850 100644
--- a/wagtail/admin/templates/wagtailadmin/admin_base.html
+++ b/wagtail/admin/templates/wagtailadmin/admin_base.html
@@ -28,14 +28,12 @@
};
wagtailConfig.STRINGS = {
- EDIT: "{% trans 'Edit' %}",
DELETE: "{% trans 'Delete' %}",
PAGE: "{% trans 'Page' %}",
PAGES: "{% trans 'Pages' %}",
LOADING: "{% trans 'Loading…' %}",
NO_RESULTS: "{% trans 'No results' %}",
SERVER_ERROR: "{% trans 'Server Error' %}",
- SEE_CHILDREN: "{% trans 'See children' %}",
SEE_ALL: "{% trans 'See all' %}",
CLOSE_EXPLORER: "{% trans 'Close explorer' %}",
ALT_TEXT: "{% trans 'Alt text' %}",
@@ -52,6 +50,8 @@
BROKEN_LINK: "{% trans 'Broken link' %}",
MISSING_DOCUMENT: "{% trans 'Missing document' %}",
CLOSE: "{% trans 'Close' %}",
+ EDIT_PAGE: "{% trans 'Edit \'{title}\'' %}",
+ VIEW_CHILD_PAGES_OF_PAGE: "{% trans 'View child pages of \'{title}\'' %}",
MONTHS: [
"{% trans 'January' %}",