diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss index baa923093f..3e7462c5c9 100644 --- a/client/scss/components/_listing.scss +++ b/client/scss/components/_listing.scss @@ -491,6 +491,10 @@ ul.listing { @include transition(border-color 0.2s ease); border: 3px solid $color-white; } + + &.images .bulk-action-checkbox-container { + text-align: left; + } } .bulk-actions-choices { @@ -787,7 +791,8 @@ table.listing { } } - tr:hover { + tr:hover, + li:hover { .no-children a, .bulk-action-checkbox { opacity: 1; diff --git a/wagtail/admin/templatetags/wagtailadmin_tags.py b/wagtail/admin/templatetags/wagtailadmin_tags.py index e402bec357..f9b4fcfd7c 100644 --- a/wagtail/admin/templatetags/wagtailadmin_tags.py +++ b/wagtail/admin/templatetags/wagtailadmin_tags.py @@ -508,6 +508,7 @@ def bulk_action_choices(context, hook_name): corresponding_urls = { 'register_page_bulk_action': 'wagtailadmin_page_bulk_action', 'register_document_bulk_action': 'wagtaildocs:document_bulk_action', + 'register_image_bulk_action': 'wagtailimages:image_bulk_action', } if hook_name not in corresponding_urls: return {'buttons': []} diff --git a/wagtail/images/templates/wagtailimages/bulk_actions/list_objects_with_no_access.html b/wagtail/images/templates/wagtailimages/bulk_actions/list_objects_with_no_access.html new file mode 100644 index 0000000000..65075978fb --- /dev/null +++ b/wagtail/images/templates/wagtailimages/bulk_actions/list_objects_with_no_access.html @@ -0,0 +1,10 @@ +{% extends 'wagtailadmin/bulk_actions/confirmation/list_objects_with_no_access.html' %} +{% load i18n %} + +{% block per_object %} + {% if object.can_edit %} + {{ object.image.title }} + {% else %} + {{ object.image.title }} + {% endif %} +{% endblock per_object %} \ No newline at end of file diff --git a/wagtail/images/templates/wagtailimages/images/index.html b/wagtail/images/templates/wagtailimages/images/index.html index 8258963c0b..cce674f3bf 100644 --- a/wagtail/images/templates/wagtailimages/images/index.html +++ b/wagtail/images/templates/wagtailimages/images/index.html @@ -19,6 +19,7 @@ }) }); + {% endblock %} {% block content %} @@ -64,6 +65,8 @@