From 81ea6d6266f72bc313bf4358cbc8f16eca8ed472 Mon Sep 17 00:00:00 2001
From: Sage Abdullah <sage.abdullah@torchbox.com>
Date: Fri, 15 Dec 2023 18:51:18 +0000
Subject: [PATCH] Remove nice-padding from documents, users, and generic
 listing views tables

The added CSS handles the case when nice padding is removed (to make the listing
go full-width) and no bulk actions are available (e.g. a ModelViewSet index view
or some other view that extends generic listing view).

This allows us to not rely on the full-width class (which should
eventually be removed) while correctly apply the spacing regardless
whether nice-padding is used or not, and whether bulk actions are
available or not.

If nice-padding is used, then the listing view will look as they
previously do.
---
 client/scss/components/_listing.scss          |  9 +++++++
 .../templates/wagtailadmin/generic/index.html |  2 +-
 .../wagtailadmin/generic/index_results.html   | 26 ++++++++++---------
 .../wagtailadmin/generic/listing.html         |  6 ++---
 .../wagtailadmin/generic/listing_results.html |  4 ++-
 .../wagtaildocs/documents/index.html          |  4 +--
 .../templates/wagtailusers/users/index.html   | 10 +++----
 7 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss
index 9340af2212..f0784dd5ab 100644
--- a/client/scss/components/_listing.scss
+++ b/client/scss/components/_listing.scss
@@ -620,6 +620,15 @@ table.listing {
       }
     }
 
+    // If no bulk actions are present, and nice padding is not applied,
+    // apply the same 80px padding via the first column's left padding.
+    &:not(.nice-padding &):not(:has(.bulk-action-checkbox)) {
+      th:first-child,
+      td:first-child {
+        padding-inline-start: theme('spacing.20');
+      }
+    }
+
     &.full-width .divider td {
       padding-inline-start: 50px;
     }
diff --git a/wagtail/admin/templates/wagtailadmin/generic/index.html b/wagtail/admin/templates/wagtailadmin/generic/index.html
index 8e4f5d3a87..d93fa2cd51 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/index.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/index.html
@@ -22,7 +22,7 @@
 {% endblock %}
 
 {% block listing %}
-    <div class="nice-padding{% if filters and not breadcrumbs_items %} filterable{% endif %}">
+    <div class="{% if filters and not breadcrumbs_items %} filterable{% endif %}">
         <div id="listing-results">
             {% if breadcrumbs_items and locale %}
                 {# TODO: temporarily put the locale selector here since we no longer use the legacy header #}
diff --git a/wagtail/admin/templates/wagtailadmin/generic/index_results.html b/wagtail/admin/templates/wagtailadmin/generic/index_results.html
index c9a57d62b2..36f21fd410 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/index_results.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/index_results.html
@@ -2,18 +2,20 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block before_results %}
-    {% if is_searching or is_filtering %}
-        <h2 role="alert">
-            {% blocktrans trimmed count counter=items_count %}
-                There is {{ counter }} match
-            {% plural %}
-                There are {{ counter }} matches
-            {% endblocktrans %}
-        </h2>
-    {% endif %}
-    {% if is_searching and view.show_other_searches %}
-        {% search_other %}
-    {% endif %}
+    <div class="nice-padding">
+        {% if is_searching or is_filtering %}
+            <h2 role="alert">
+                {% blocktrans trimmed count counter=items_count %}
+                    There is {{ counter }} match
+                {% plural %}
+                    There are {{ counter }} matches
+                {% endblocktrans %}
+            </h2>
+        {% endif %}
+        {% if is_searching and view.show_other_searches %}
+            {% search_other %}
+        {% endif %}
+    </div>
 {% endblock %}
 
 {% block no_results_message %}
diff --git a/wagtail/admin/templates/wagtailadmin/generic/listing.html b/wagtail/admin/templates/wagtailadmin/generic/listing.html
index 8626ba5459..5113ef3a07 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/listing.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/listing.html
@@ -13,10 +13,8 @@
     {% endblock %}
 
     {% block listing %}
-        <div class="nice-padding">
-            <div id="listing-results">
-                {% include view.results_template_name|default:"wagtailadmin/generic/listing_results.html" %}
-            </div>
+        <div id="listing-results">
+            {% include view.results_template_name|default:"wagtailadmin/generic/listing_results.html" %}
         </div>
     {% endblock %}
 
diff --git a/wagtail/admin/templates/wagtailadmin/generic/listing_results.html b/wagtail/admin/templates/wagtailadmin/generic/listing_results.html
index 78d38dda95..d7a706afc0 100644
--- a/wagtail/admin/templates/wagtailadmin/generic/listing_results.html
+++ b/wagtail/admin/templates/wagtailadmin/generic/listing_results.html
@@ -11,5 +11,7 @@
         {% endif %}
     {% endblock %}
 {% else %}
-    {% block no_results_message %}<p>{% trans "There are no results." %}</p>{% endblock %}
+    <div class="nice-padding w-mt-8">
+        {% block no_results_message %}<p>{% trans "There are no results." %}</p>{% endblock %}
+    </div>
 {% endif %}
diff --git a/wagtail/documents/templates/wagtaildocs/documents/index.html b/wagtail/documents/templates/wagtaildocs/documents/index.html
index c08dc00529..992e5349f5 100644
--- a/wagtail/documents/templates/wagtaildocs/documents/index.html
+++ b/wagtail/documents/templates/wagtaildocs/documents/index.html
@@ -10,9 +10,9 @@
 {% endblock %}
 
 {% block listing %}
-    <div class="nice-padding">
+    <div>
         {% if collections %}
-            <form action="{{ index_url }}" method="GET" novalidate>
+            <form class="nice-padding" action="{{ index_url }}" method="GET" novalidate>
                 <ul class="fields">
                     <li>{% include "wagtailadmin/shared/collection_chooser.html" %}</li>
                 </ul>
diff --git a/wagtail/users/templates/wagtailusers/users/index.html b/wagtail/users/templates/wagtailusers/users/index.html
index 7ea8693124..d466fa8225 100644
--- a/wagtail/users/templates/wagtailusers/users/index.html
+++ b/wagtail/users/templates/wagtailusers/users/index.html
@@ -9,11 +9,9 @@
 {% endblock %}
 
 {% block listing %}
-    <div class="nice-padding">
-        <div id="listing-results" class="users">
-            {% include "wagtailusers/users/results.html" %}
-        </div>
-        {% trans "Select all users in listing" as select_all_text %}
-        {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=select_all_text app_label=app_label model_name=model_name objects=page_obj %}
+    <div id="listing-results" class="users">
+        {% include "wagtailusers/users/results.html" %}
     </div>
+    {% trans "Select all users in listing" as select_all_text %}
+    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=select_all_text app_label=app_label model_name=model_name objects=page_obj %}
 {% endblock %}