From 745eceb5fac81481c8b6942b112030238f5b6304 Mon Sep 17 00:00:00 2001 From: vasileios Date: Fri, 1 Sep 2023 15:27:02 +0200 Subject: [PATCH] [#3420] Fixed classes and CSS in cookie overview html pages This is still an in-between state while the SDK CSS is being reworked. Utimately, this should all just use NL Design System. Backport-of: #3440 --- .../cookie_consent/_cookie_group.html | 10 ++++--- .../cookie_consent/cookiegroup_list.html | 26 +++++++++++-------- src/openforms/tests/test_cookie_notice.py | 16 ++++++++---- src/openforms/ui/static/ui/scss/_nlds.scss | 1 + .../scss/components/cookie-group/_index.scss | 8 ++++++ src/openforms/ui/static/ui/scss/screen.scss | 2 ++ .../ui/templates/ui/views/abstract/list.html | 6 ++--- 7 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 src/openforms/ui/static/ui/scss/_nlds.scss diff --git a/src/openforms/templates/cookie_consent/_cookie_group.html b/src/openforms/templates/cookie_consent/_cookie_group.html index cff233ceb7..0610f61ef0 100644 --- a/src/openforms/templates/cookie_consent/_cookie_group.html +++ b/src/openforms/templates/cookie_consent/_cookie_group.html @@ -2,9 +2,11 @@ {% load cookie_consent_tags %}
-

{{ cookie_group.name }}

+

+ {{ cookie_group.name }} +

-

+

{{ cookie_group.description }}

@@ -17,7 +19,7 @@

{{ cookie_group.name }}

{% csrf_token %} - +
{% endif %} @@ -27,7 +29,7 @@

{{ cookie_group.name }}

{% csrf_token %} - +
{% endif %} diff --git a/src/openforms/templates/cookie_consent/cookiegroup_list.html b/src/openforms/templates/cookie_consent/cookiegroup_list.html index ec99d21d82..d861fab05c 100644 --- a/src/openforms/templates/cookie_consent/cookiegroup_list.html +++ b/src/openforms/templates/cookie_consent/cookiegroup_list.html @@ -1,17 +1,21 @@ {% extends 'ui/views/abstract/list.html' %} {% load i18n openforms %} +{% block extra_css %} + {% include "forms/sdk_css_snippet.html" %} + {{ block.super }} {# Called after SDK CSS for custom design overrides #} +{% endblock %} {% block card %} {% get_allowed_redirect_url request.GET.referer request.headers.referer as referer %} -
-

{% trans "Cookies" %}

+
+

{% trans "Cookies" %}

-
+
{% block card_body %} -

- {% trans "This is a list of the categories of cookies used in our website and why we use them." %} +

+ {% trans "This is a list of the categories of cookies used in our website and why we use them." %}

    {% for cookie_group in object_list %} @@ -20,12 +24,12 @@

    {% trans "Cookies" %}

    {% endfor %}
- {% endblock %} - {% if referer %} - - {% trans "Close" %} - - {% endif %} + {% if referer %} + + {% trans "Close" %} + + {% endif %} + {% endblock %}
{% endblock %} diff --git a/src/openforms/tests/test_cookie_notice.py b/src/openforms/tests/test_cookie_notice.py index dcbbaf7866..73c552c13f 100644 --- a/src/openforms/tests/test_cookie_notice.py +++ b/src/openforms/tests/test_cookie_notice.py @@ -149,10 +149,13 @@ def test_accept_reject_does_not_allow_open_redirect(self): self.renew_app() cookies_page = self.app.get(url, {"referer": allowed}) + parent = cookies_page.pyquery.find( + ".openforms-card__body a.utrecht-link--openforms" + ) + link = parent(".utrecht-link--openforms") - button = cookies_page.pyquery.find("a.button--primary") - self.assertEqual(button.attr["href"], allowed) - self.assertEqual(button.text(), _("Close")) + self.assertEqual(link.attr["href"], allowed) + self.assertEqual(link.text(), _("Close")) for blocked in blocked_redirects: with self.subTest(f"Blockedredirect to '{blocked}'"): @@ -160,8 +163,11 @@ def test_accept_reject_does_not_allow_open_redirect(self): cookies_page = self.app.get(url, {"referer": blocked}) - button = cookies_page.pyquery.find("a.button--primary") - self.assertFalse(button) + parent = cookies_page.pyquery.find( + ".openforms-card__body a.utrecht-link--openforms" + ) + + self.assertEqual(parent, []) for form in cookies_page.forms.values(): next_url = furl(form["next"].value) diff --git a/src/openforms/ui/static/ui/scss/_nlds.scss b/src/openforms/ui/static/ui/scss/_nlds.scss new file mode 100644 index 0000000000..6bba17a761 --- /dev/null +++ b/src/openforms/ui/static/ui/scss/_nlds.scss @@ -0,0 +1 @@ +@import '@utrecht/components/heading-2/css/index.scss'; diff --git a/src/openforms/ui/static/ui/scss/components/cookie-group/_index.scss b/src/openforms/ui/static/ui/scss/components/cookie-group/_index.scss index e564c64a69..d21d2c5189 100644 --- a/src/openforms/ui/static/ui/scss/components/cookie-group/_index.scss +++ b/src/openforms/ui/static/ui/scss/components/cookie-group/_index.scss @@ -15,3 +15,11 @@ } } } + +.openforms-theme { + .cookie-group { + &__title { + margin-block-end: 1rem !important; // SDK styles for :not(:last-child) override this otherwise + } + } +} diff --git a/src/openforms/ui/static/ui/scss/screen.scss b/src/openforms/ui/static/ui/scss/screen.scss index b1b6d95a0b..500d6dc701 100644 --- a/src/openforms/ui/static/ui/scss/screen.scss +++ b/src/openforms/ui/static/ui/scss/screen.scss @@ -1,4 +1,6 @@ @import 'settings'; +@import 'nlds'; + @import 'components'; @import 'views'; diff --git a/src/openforms/ui/templates/ui/views/abstract/list.html b/src/openforms/ui/templates/ui/views/abstract/list.html index 7eee7f08ed..aba182f1ac 100644 --- a/src/openforms/ui/templates/ui/views/abstract/list.html +++ b/src/openforms/ui/templates/ui/views/abstract/list.html @@ -4,13 +4,13 @@ {{ block.super }}
-
+
{% block card %} -
+

{{ title }}

-
+
{% block card_body %}
    {% for object in object_list %}