diff --git a/client/scss/components/_bulk_actions.scss b/client/scss/components/_bulk_actions.scss index 84899291ed..d3bd699ae4 100644 --- a/client/scss/components/_bulk_actions.scss +++ b/client/scss/components/_bulk_actions.scss @@ -6,7 +6,6 @@ } .c-dropdown__button { - border: 0; padding-left: 0.3rem; } @@ -87,7 +86,6 @@ max-width: 160px; overflow-x: hidden; text-overflow: ellipsis; - border: 0; } } diff --git a/docs/reference/hooks.rst b/docs/reference/hooks.rst index 24af9fa7c1..d1f516e7cf 100644 --- a/docs/reference/hooks.rst +++ b/docs/reference/hooks.rst @@ -1411,7 +1411,7 @@ Hooks for registering and customising bulk actions. See :ref:`here +
{% trans "Select all" as aria_label %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html index 400e2e0ace..eb2229ec07 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html +++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_table_headers_explore.html @@ -18,7 +18,7 @@ ordering: the current sort parameter {% if show_ordering_column %} - + {% if orderable %} {% if ordering == "ord" %} @@ -32,10 +32,11 @@ ordering: the current sort parameter {% endif %} {% else %} - {% include 'wagtailadmin/bulk_actions/select_all_checkbox_cell.html' with parent=parent_page show_filters=True %} + {% include 'wagtailadmin/bulk_actions/select_all_checkbox_cell.html' with parent=parent_page show_filters=True %} {% endif %} - {% trans 'Page' %} + {% trans 'Title' as title_label %} + {% page_table_header_label label=title_label sortable=sortable sort_field='title' parent_page_title=parent_page.title %} {% if show_parent %} @@ -56,8 +57,9 @@ ordering: the current sort parameter {% page_table_header_label label=type_label sortable=0 parent_page_title=parent_page.title %} {% endif %} - + {% trans 'Status' as status_label %} {% page_table_header_label label=status_label sortable=sortable sort_field='live' parent_page_title=parent_page.title %} + diff --git a/wagtail/admin/views/pages/listing.py b/wagtail/admin/views/pages/listing.py index 4f0cfdc8e8..dad6610d04 100644 --- a/wagtail/admin/views/pages/listing.py +++ b/wagtail/admin/views/pages/listing.py @@ -103,7 +103,7 @@ def index(request, parent_page_id=None): 'do_paginate': do_paginate, 'locale': None, 'translations': [], - 'show_ordering_column': 'ordering' in request.GET.dict() + 'show_ordering_column': request.GET.get('ordering') == 'ord' } if getattr(settings, 'WAGTAIL_I18N_ENABLED', False) and not parent_page.is_root(): diff --git a/wagtail/admin/wagtail_hooks.py b/wagtail/admin/wagtail_hooks.py index 7ab867d8d8..888dcfb18f 100644 --- a/wagtail/admin/wagtail_hooks.py +++ b/wagtail/admin/wagtail_hooks.py @@ -167,7 +167,7 @@ def bulk_action_filters(): yield Button( _('All'), '?filters=', - attrs={'title': _("All pages"), 'data': {'bulk-action-filter': _("")}}, + attrs={'title': _("All pages"), 'data': {'bulk-action-filter': ""}}, priority=10 ) diff --git a/wagtail/images/templates/wagtailimages/images/results.html b/wagtail/images/templates/wagtailimages/images/results.html index b9835bfb37..50d81c6432 100644 --- a/wagtail/images/templates/wagtailimages/images/results.html +++ b/wagtail/images/templates/wagtailimages/images/results.html @@ -15,11 +15,14 @@

{% trans "Latest images" %}

{% endif %} + {# Used below for the checkbox aria_labelledby #} +

{% trans "Select image" %}

+