mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Improve display of editing sessions on smaller screens

pull/12185/head
Sage Abdullah 2024-07-18 18:11:33 +01:00 zatwierdzone przez Thibaud Colas
rodzic 52cf4de58c
commit 8845a8091e
6 zmienionych plików z 22 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
client/scss/components/_editing-sessions.scss
Wyświetl plik

@ -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 {

2
client/scss/components/_ping.scss
Wyświetl plik

@ -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),

2
wagtail/admin/templates/wagtailadmin/shared/editing_sessions/list.html
Wyświetl plik

@ -1,6 +1,6 @@
{% load wagtailadmin_tags i18n %}
<ol class="w-editing-sessions">
<ol class="w-editing-sessions__list">
{% for session in sessions|slice:":4" %}
<li>
{% fragment as avatar %}

1
wagtail/admin/templates/wagtailadmin/shared/editing_sessions/module.html
Wyświetl plik

@ -24,6 +24,7 @@
<form
method="post"
class="w-editing-sessions"
data-controller="w-swap w-action w-session"
data-w-swap-target-value="#w-editing-sessions"
data-w-swap-src-value="{{ ping_url }}"

12
wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html
Wyświetl plik

@ -114,13 +114,13 @@
{% endif %}
{% endblock %}
{% block editing_sessions %}
{% if editing_sessions %}
{% component editing_sessions %}
{% endif %}
{% endblock %}
<div class="w-w-full w-overflow-auto sm:w-w-min w-flex sm:w-flex-nowrap sm:w-flex-row w-items-center w-p-0 sm:w-py-0 w-px-2 sm:w-pr-4 sm:w-justify-end">
{% block editing_sessions %}
{% if editing_sessions %}
{% component editing_sessions %}
{% endif %}
{% endblock %}
<div class="w-w-full sm:w-w-min w-flex sm:w-flex-nowrap sm:w-flex-row w-items-center w-p-0 sm:w-py-0 sm:w-pr-4 sm:w-justify-end">
{% block toggles %}
{% if side_panels %}
{% include "wagtailadmin/shared/side_panel_toggles.html" %}

16
wagtail/admin/tests/test_editing_sessions.py
Wyświetl plik

@ -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)