Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add more contextual information for screen readers in the explorer menu #5386

Merged
merged 7 commits into from
Jun 19, 2019
Merged

Add more contextual information for screen readers in the explorer menu #5386

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc408de
Add more contextual information for screen readers in the explorer menu
helenb Jun 14, 2019
46d58d0
Update list of string constants for translation in the tests file
helenb Jun 17, 2019
e7741af
Update the snapshot for the explorer item
helenb Jun 17, 2019
9be32d6
Ensure that translated strings including page titles are in the corre…
helenb Jun 19, 2019
1c1205b
Remove outdated translated strings
thibaudcolas Jun 19, 2019
e34ee2e
Use the same translatable label format as other parts of the UI
thibaudcolas Jun 19, 2019
58b59ce
Add release notes for #5386
thibaudcolas Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions client/src/components/Explorer/ExplorerItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ const childrenIcon = (
<Icon name="folder-inverse" />
);

const editIcon = (
<Icon name="edit" title={STRINGS.EDIT} />
);

const nextIcon = (
<Icon name="arrow-right" title={STRINGS.SEE_CHILDREN} />
);

/**
* One menu item in the page explorer, with different available actions
* and information depending on the metadata of the page.
Expand Down Expand Up @@ -47,15 +39,15 @@ const ExplorerItem = ({ item, onClick }) => {
href={`${ADMIN_URLS.PAGES}${id}/edit/`}
className="c-explorer__item__action c-explorer__item__action--small"
>
{editIcon}
<Icon name="edit" title={STRINGS.EDIT_PAGE.replace('{title}', title)} />
</Button>
{hasChildren ? (
<Button
className="c-explorer__item__action"
onClick={onClick}
href={`${ADMIN_URLS.PAGES}${id}/`}
>
{nextIcon}
<Icon name="arrow-right" title={STRINGS.VIEW_CHILD_PAGES_OF_PAGE.replace('{title}', title)} />
</Button>
) : null}
</div>
Expand Down
14 changes: 7 additions & 7 deletions client/src/components/Explorer/__snapshots__/ExplorerItem.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`ExplorerItem children 1`] = `
<Icon
className={null}
name="edit"
title="Edit"
title="Edit 'test'"
/>
</Button>
<Button
Expand All @@ -54,7 +54,7 @@ exports[`ExplorerItem children 1`] = `
<Icon
className={null}
name="arrow-right"
title="See children"
title="View child pages of 'test'"
/>
</Button>
</div>
Expand Down Expand Up @@ -93,7 +93,7 @@ exports[`ExplorerItem renders 1`] = `
<Icon
className={null}
name="edit"
title="Edit"
title="Edit 'test'"
/>
</Button>
</div>
Expand Down Expand Up @@ -150,7 +150,7 @@ exports[`ExplorerItem should show a publication status if not live 1`] = `
<Icon
className={null}
name="edit"
title="Edit"
title="Edit 'test'"
/>
</Button>
<Button
Expand All @@ -166,7 +166,7 @@ exports[`ExplorerItem should show a publication status if not live 1`] = `
<Icon
className={null}
name="arrow-right"
title="See children"
title="View child pages of 'test'"
/>
</Button>
</div>
Expand Down Expand Up @@ -223,7 +223,7 @@ exports[`ExplorerItem should show a publication status with unpublished changes
<Icon
className={null}
name="edit"
title="Edit"
title="Edit 'test'"
/>
</Button>
<Button
Expand All @@ -239,7 +239,7 @@ exports[`ExplorerItem should show a publication status with unpublished changes
<Icon
className={null}
name="arrow-right"
title="See children"
title="View child pages of 'test'"
/>
</Button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/tests/stubs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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}\'',
},
};

Expand Down
4 changes: 2 additions & 2 deletions wagtail/admin/templates/wagtailadmin/admin_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}",
Expand All @@ -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' %}",
Expand Down