diff --git a/client/scss/components/_editing-sessions.scss b/client/scss/components/_editing-sessions.scss index c5efc7cf68..6a8b354f48 100644 --- a/client/scss/components/_editing-sessions.scss +++ b/client/scss/components/_editing-sessions.scss @@ -1,5 +1,9 @@ .w-editing-sessions { - @apply w-flex w-p-0 w-m-0 w-pr-8 w-mr-5 w-border-r w-border-border-furniture; + @apply w-mr-auto sm:w-pr-8 sm:w-mr-5 sm:w-border-r w-border-border-furniture; +} + +.w-editing-sessions__list { + @apply w-flex w-p-0 w-m-0; } .w-editing-sessions__avatar { diff --git a/client/scss/components/_ping.scss b/client/scss/components/_ping.scss index aa99f03373..989df1a020 100644 --- a/client/scss/components/_ping.scss +++ b/client/scss/components/_ping.scss @@ -42,7 +42,7 @@ } 25% { - box-shadow: 0 0 0 10px + box-shadow: 0 0 0 8px hsla( var(--w-color-critical-100-hue), var(--w-color-critical-100-saturation), diff --git a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html index cd01bcab4d..dd3bf2aead 100644 --- a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html +++ b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html @@ -1,6 +1,6 @@ {% load wagtailadmin_tags i18n %} -
    +
      {% for session in sessions|slice:":4" %}
    1. {% fragment as avatar %} diff --git a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html index e552aac15c..290c8e31bc 100644 --- a/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html +++ b/wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html @@ -24,6 +24,7 @@
      + {% block editing_sessions %} + {% if editing_sessions %} + {% component editing_sessions %} + {% endif %} + {% endblock %} -
      {% block toggles %} {% if side_panels %} {% include "wagtailadmin/shared/side_panel_toggles.html" %} diff --git a/wagtail/admin/tests/test_editing_sessions.py b/wagtail/admin/tests/test_editing_sessions.py index 8412c41578..31a9b5a9d0 100644 --- a/wagtail/admin/tests/test_editing_sessions.py +++ b/wagtail/admin/tests/test_editing_sessions.py @@ -154,7 +154,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 1) session_text = rendered_sessions[0].text self.assertIn("Vic Otheruser", session_text) @@ -192,7 +192,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 1) session_text = rendered_sessions[0].text self.assertIn("Vic Otheruser", session_text) @@ -230,7 +230,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 1) session_text = rendered_sessions[0].text self.assertIn("Vic Otheruser", session_text) @@ -270,7 +270,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 1) session_text = rendered_sessions[0].text self.assertIn("Vic Otheruser saved a new version", session_text) @@ -326,7 +326,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 1) session_text = rendered_sessions[0].text self.assertIn("Vic Otheruser saved a new version", session_text) @@ -408,7 +408,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 2) session_text = rendered_sessions[0].text self.assertIn("Gordon Thirduser saved a new version", session_text) @@ -478,7 +478,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 2) session_text = rendered_sessions[0].text self.assertIn("System saved a new version", session_text) @@ -721,7 +721,7 @@ class TestPingView(WagtailTestUtils, TestCase): ) soup = self.get_soup(response_json["html"]) - rendered_sessions = soup.select("ol.w-editing-sessions li") + rendered_sessions = soup.select("ol.w-editing-sessions__list li") self.assertEqual(len(rendered_sessions), 2) session_text = rendered_sessions[0].text self.assertIn("You have unsaved changes in another session", session_text)