From 942b5ff32f65b423237a1f14d7a0a7324b15b443 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Tue, 31 Oct 2023 15:39:03 +0100 Subject: [PATCH 1/5] :pencil: [#3566] Document button design tokens migration --- CHANGELOG.rst | 12 ++- docs/installation/index.rst | 1 + docs/installation/upgrade-240.rst | 170 ++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 docs/installation/upgrade-240.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3e58d17465..dce93f7675 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -28,13 +28,23 @@ has been merged into a single service. Normally this configuration update should been performed correctly automatically, but we can't rule out possible mistakes with more exotic configurations via API gateways. -Please check and update your configuration if necessary - you can check this via: +⚠️ Please check and update your configuration if necessary - you can check this via: **Admin** > **Configuratie** > **Configuratie overzicht** and look for the KVK entries. If you run into any errors, then please check your certificate configuration, API key and validate that the API root does *not* include the ``v1/`` suffix. An example of a correct API root: ``https://api.kvk.nl/api/`` or ``https://api.kvk.nl/test/api/``. +**Button refactor to NL DS** + +We are committed to NL Design System and have overhauled our custom button +implementation and styles. While we have done our best to provide an automatic +migration of button styling configuration, there may be some changes that we cannot +detect or handle automatically. + +⚠️ Please review the instructions in the documentation under **Installation** > +**Upgrade details to Open Forms 2.4.0** > **Button styling**. + 2.3.3 (2023-10-30) ================== diff --git a/docs/installation/index.rst b/docs/installation/index.rst index 9752f8937b..db1a465af0 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -29,3 +29,4 @@ and expertise. form_hosting redis issues/index + upgrade-240 diff --git a/docs/installation/upgrade-240.rst b/docs/installation/upgrade-240.rst new file mode 100644 index 0000000000..75e647f33d --- /dev/null +++ b/docs/installation/upgrade-240.rst @@ -0,0 +1,170 @@ +.. _installation_upgrade_240: + +=================================== +Upgrade details to Open Forms 2.4.0 +=================================== + +We do our best to avoid breaking changes, but at times we cannot guarantee that your +configuration will keep working flawlessly. Open Forms 2.4.0 is such a release - and +the manual interventions with context are documented here. + +Button styling +============== + +Our buttons used custom design tokens since they were implemented before the `NL Design +System buttons`_ were much of a thing. *Most* of the tokens map cleanly, and if you +have configured any overrides in the admin environment they should have been +automatically migrated. However, we urge you to verify the configuration on a +test/acceptance environment and prepare the necessary changes. + +However, if you have made custom CSS changes, we cannot incorporate those and you will +have to check your customizations. You will have to manually check if those changes +are still relevant or not. Our advice is also to take a critical look - the transition +to community components should make it much easier to change the appearance and behaviour +using design tokens rather than CSS overrides. + +.. note:: We recommend setting up your own theme rather than trying to override the + ``.openforms-theme``, but with the CSS precedence order it should still be possible + to override token values via the admin interface. + +.. warning:: The automatic migration we ship cannot be reversed - we recommend creating + a database backup before upgrading in case you need to do a rollback. + +.. _NL Design System buttons: https://nl-design-system.github.io/utrecht/storybook/?path=/docs/css-button-tokens--docs + +Reference +--------- + +The CSS mapping below is the one we have taken into account for our automatic migration, +using the following logic: + +* if the Open Forms token (right hand side) exists, extract the value and assign it to + the matching NL DS token (left hand side) +* if the NL DS token is already specified, abort and keep the explicitly defined value + +The mapping below shows the NL Design System tokens populated from our custom tokens: + +.. code-block:: scss + + :root { + /* --utrecht-action-disabled-cursor: not-allowed;*/ + /* --utrecht-action-submit-cursor: pointer;*/ + + /* generic */ + --utrecht-button-background-color: var(--of-button-bg); + --utrecht-button-border-color: var(--of-button-color-border); + // --utrecht-button-border-width: 1px; + --utrecht-button-color: var(--of-button-fg); + --utrecht-button-font-family: var(--of-typography-sans-serif-font-family); + // --utrecht-button-font-size: 1.125rem; + // --utrecht-button-line-height: 1.333; + // --utrecht-button-padding-block-end: 10px; + // --utrecht-button-padding-block-start: 10px; + // --utrecht-button-padding-inline-end: 12px; + // --utrecht-button-padding-inline-start: 12px; + + --utrecht-button-hover-background-color: var(--of-button-hover-bg); + --utrecht-button-hover-border-color: var(--of-button-hover-color-border); + + --utrecht-button-active-background-color: var(--of-button-active-bg); + --utrecht-button-active-border-color: var(--of-button-active-color-border); + --utrecht-button-active-color: var(--of-button-active-fg); + + --utrecht-button-focus-border-color: var(--of-button-focus-color-border); + + /* primary */ + // non-modified + --utrecht-button-primary-action-background-color: var(--of-button-primary-bg); + --utrecht-button-primary-action-border-color: var(--of-button-primary-color-border); + /* --utrecht-button-primary-action-border-width: 2px;*/ + --utrecht-button-primary-action-color: var(--of-button-primary-fg); + + // hover + --utrecht-button-primary-action-hover-background-color: var(--of-button-primary-hover-bg); + --utrecht-button-primary-action-hover-border-color: var(--of-button-primary-hover-color-border); + + // active + --utrecht-button-primary-action-active-background-color: var(--of-button-primary-active-bg); + --utrecht-button-primary-action-active-border-color: var(--of-button-primary-active-color-border); + --utrecht-button-primary-action-active-color: var(--of-button-primary-active-fg); + + // focus, focus-visible + --utrecht-button-primary-action-focus-border-color: var(--of-button-primary-focus-color-border); + + /* primary+danger */ + --utrecht-button-primary-action-danger-background-color: var(--of-button-danger-bg); + --utrecht-button-primary-action-danger-border-color: var(--of-button-danger-color-border); + --utrecht-button-primary-action-danger-color: var(--of-button-danger-fg); + + // hover + --utrecht-button-primary-action-danger-hover-background-color: var(--of-button-danger-hover-bg); + --utrecht-button-primary-action-danger-hover-border-color: var( + --of-button-danger-hover-color-border + ); + + // active + --utrecht-button-primary-action-danger-active-background-color: var(--of-button-danger-active-bg); + --utrecht-button-primary-action-danger-active-border-color: var( + --of-button-danger-active-color-border + ); + --utrecht-button-primary-action-danger-active-color: var(--of-button-danger-active-fg); + + // focus, focus-visible + --utrecht-button-primary-action-danger-focus-border-color: var( + --of-button-danger-focus-color-border + ); + + /* secondary */ + --utrecht-button-secondary-action-background-color: var(--of-color-bg); + --utrecht-button-secondary-action-border-color: var(--of-color-border); + // --utrecht-button-secondary-action-border-width: 2px; + --utrecht-button-secondary-action-color: var(--of-color-fg); + + // hover + --utrecht-button-secondary-action-hover-background-color: var(--of-button-hover-bg); + --utrecht-button-secondary-action-hover-border-color: var(--of-button-hover-color-border); + + // active + --utrecht-button-secondary-action-active-background-color: var(--of-button-active-bg); + --utrecht-button-secondary-action-active-border-color: var(--of-button-active-color-border); + --utrecht-button-secondary-action-active-color: var(--of-button-active-fg); + + // focus, focus-visible + --utrecht-button-secondary-action-focus-border-color: var(--of-color-focus-border); + + /* secondary+danger */ + --utrecht-button-secondary-action-danger-background-color: var(--of-button-danger-bg); + --utrecht-button-secondary-action-danger-border-color: var(--of-button-danger-color-border); + --utrecht-button-secondary-action-danger-color: var(--of-button-danger-fg); + + // hover + --utrecht-button-secondary-action-danger-hover-background-color: var(--of-button-danger-hover-bg); + --utrecht-button-secondary-action-danger-hover-border-color: var( + --of-button-danger-hover-color-border + ); + + // active + --utrecht-button-secondary-action-danger-active-background-color: var( + --of-button-danger-active-bg + ); + --utrecht-button-secondary-action-danger-active-border-color: var( + --of-button-danger-active-color-border + ); + --utrecht-button-secondary-action-danger-active-color: var(--of-button-danger-active-fg); + + // focus, focus-visible + --utrecht-button-secondary-action-danger-focus-border-color: var( + --of-button-danger-focus-color-border + ); + + /* subtle */ + --utrecht-button-subtle-danger-background-color: var(--of-button-danger-bg); + --utrecht-button-subtle-danger-border-color: var(--of-button-danger-color-border); + --utrecht-button-subtle-danger-color: var(--of-color-danger); + + --utrecht-button-subtle-danger-active-background-color: var(--of-color-danger); + --utrecht-button-subtle-danger-active-color: var(--of-color-bg); + } + +The commented out tokens are values that used to be hardcoded in our CSS, but should now +be specified via design tokens and reflect the (default) values set in the Open Forms theme. From f2b453d588b80c46de600c13da69a0e794a9843c Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Tue, 31 Oct 2023 16:49:53 +0100 Subject: [PATCH 2/5] :alien: [#3566] Implement data migration to replace custom button tokens with NL DS utrecht-button tokens --- .../0059_convert_button_design_tokens.py | 142 +++++++++++++++ src/openforms/config/tests/test_migrations.py | 163 ++++++++++++++++++ 2 files changed, 305 insertions(+) create mode 100644 src/openforms/config/migrations/0059_convert_button_design_tokens.py create mode 100644 src/openforms/config/tests/test_migrations.py diff --git a/src/openforms/config/migrations/0059_convert_button_design_tokens.py b/src/openforms/config/migrations/0059_convert_button_design_tokens.py new file mode 100644 index 0000000000..e7aeb97ed6 --- /dev/null +++ b/src/openforms/config/migrations/0059_convert_button_design_tokens.py @@ -0,0 +1,142 @@ +# Generated by Django 3.2.21 on 2023-10-31 14:23 + +from copy import deepcopy +from typing import TypeAlias, TypedDict + +from django.db import migrations + +from glom import assign, delete, glom + +# mapping from new, NL DS token to the source (old custom token) +MAPPING = { + "utrecht.button.background-color": "of.button.bg", + "utrecht.button.border-color": "of.button.color-border", + "utrecht.button.color": "of.button.fg", + "utrecht.button.font-family": "of.typography.sans-serif.font-family", + "utrecht.button.hover.background-color": "of.button.hover.bg", + "utrecht.button.hover.border-color": "of.button.hover.color-border", + "utrecht.button.active.background-color": "of.button.active.bg", + "utrecht.button.active.border-color": "of.button.active.color-border", + "utrecht.button.active.color": "of.button.active.fg", + "utrecht.button.focus.border-color": "of.button.focus.color-border", + "utrecht.button.primary-action.background-color": "of.button.primary.bg", + "utrecht.button.primary-action.border-color": "of.button.primary.color-border", + "utrecht.button.primary-action.color": "of.button.primary.fg", + "utrecht.button.primary-action.hover.background-color": "of.button.primary.hover.bg", + "utrecht.button.primary-action.hover.border-color": "of.button.primary.hover.color-border", + "utrecht.button.primary-action.active.background-color": "of.button.primary.active.bg", + "utrecht.button.primary-action.active.border-color": "of.button.primary.active.color-border", + "utrecht.button.primary-action.active.color": "of.button.primary.active.fg", + "utrecht.button.primary-action.focus.border-color": "of.button.primary.focus.color-border", + "utrecht.button.primary-action.danger.background-color": "of.button.danger.bg", + "utrecht.button.primary-action.danger.border-color": "of.button.danger.color-border", + "utrecht.button.primary-action.danger.color": "of.button.danger.fg", + "utrecht.button.primary-action.danger.hover.background-color": "of.button.danger.hover.bg", + "utrecht.button.primary-action.danger.hover.border-color": "of.button.danger.hover.color-border ", + "utrecht.button.primary-action.danger.active.background-color": "of.button.danger.active.bg", + "utrecht.button.primary-action.danger.active.border-color": "of.button.danger.active.color-border ", + "utrecht.button.primary-action.danger.active.color": "of.button.danger.active.fg", + "utrecht.button.primary-action.danger.focus.border-color": "of.button.danger.focus.color-border ", + "utrecht.button.secondary-action.background-color": "of.color.bg", + "utrecht.button.secondary-action.border-color": "of.color.border", + "utrecht.button.secondary-action.color": "of.color.fg", + "utrecht.button.secondary-action.hover.background-color": "of.button.hover.bg", + "utrecht.button.secondary-action.hover.border-color": "of.button.hover.color-border", + "utrecht.button.secondary-action.active.background-color": "of.button.active.bg", + "utrecht.button.secondary-action.active.border-color": "of.button.active.color-border", + "utrecht.button.secondary-action.active.color": "of.button.active.fg", + "utrecht.button.secondary-action.focus.border-color": "of.color.focus-border", + "utrecht.button.secondary-action.danger.background-color": "of.button.danger.bg", + "utrecht.button.secondary-action.danger.border-color": "of.button.danger.color-border", + "utrecht.button.secondary-action.danger.color": "of.button.danger.fg", + "utrecht.button.secondary-action.danger.hover.background-color": "of.button.danger.hover.bg", + "utrecht.button.secondary-action.danger.hover.border-color": "of.button.danger.hover.color-border", + "utrecht.button.secondary-action.danger.active.background-color": "of.button.danger.active.bg ", + "utrecht.button.secondary-action.danger.active.border-color": "of.button.danger.active.color-border ", + "utrecht.button.secondary-action.danger.active.color": "of.button.danger.active.fg", + "utrecht.button.secondary-action.danger.focus.border-color": "of.button.danger.focus.color-border ", + "utrecht.button.subtle.danger.background-color": "of.button.danger.bg", + "utrecht.button.subtle.danger.border-color": "of.button.danger.color-border", + "utrecht.button.subtle.danger.color": "of.color.danger", + "utrecht.button.subtle.danger.active.background-color": "of.color.danger", + "utrecht.button.subtle.danger.active.color": "of.color.bg", +} + + +class TokenValue(TypedDict): + value: str + + +TokenContainer: TypeAlias = dict[str, "TokenValue | TokenContainer"] + + +unset = object() + + +def apply_mapping(design_tokens: TokenContainer) -> TokenContainer: + result = deepcopy(design_tokens) + + tokens_to_unset = set() + + for new, old in MAPPING.items(): + old_value = glom(design_tokens, old, default=unset) + if old_value is unset: + continue + + existing_value = glom(result, new, default=unset) + if existing_value is not unset: + tokens_to_unset.add(old) + continue + + assign(result, new, old_value, missing=dict) + tokens_to_unset.add(old) + + for token in tokens_to_unset: + # don't delete utility tokens! + if not token.startswith("of.button."): + continue + delete(result, token) + + return remove_empty_design_tokens(result) + + +def update_design_token_values(apps, _): + GlobalConfiguration = apps.get_model("config", "GlobalConfiguration") + config = GlobalConfiguration.objects.first() + if config is None: + return + + updated = apply_mapping(config.design_token_values) + if updated != config.design_token_values: + config.design_token_values = updated + config.save(update_fields=["design_token_values"]) + + +def remove_empty_design_tokens(obj: dict) -> dict: + if "value" in obj: + return obj + + result = {} + for key, value in obj.items(): + if not isinstance(value, dict): + continue + updated_value = remove_empty_design_tokens(value) + # empty object -> remove it by not including it anymore + if not updated_value: + continue + + result[key] = updated_value + + return result + + +class Migration(migrations.Migration): + + dependencies = [ + ("config", "0058_auto_20231026_1525"), + ] + + operations = [ + # reversing this is not possible - make sure you have backups! + migrations.RunPython(update_design_token_values, migrations.RunPython.noop), + ] diff --git a/src/openforms/config/tests/test_migrations.py b/src/openforms/config/tests/test_migrations.py new file mode 100644 index 0000000000..18e3a1d3c1 --- /dev/null +++ b/src/openforms/config/tests/test_migrations.py @@ -0,0 +1,163 @@ +from django.test import SimpleTestCase +from django.utils.module_loading import import_string + +from openforms.utils.tests.test_migrations import TestMigrations + +apply_mapping = import_string( + "openforms.config.migrations.0059_convert_button_design_tokens.apply_mapping" +) + + +class MapperTests(SimpleTestCase): + def test_empty_tokens(self): + updated = apply_mapping({}) + + self.assertEqual(updated, {}) + + def test_unrelated_tokens(self): + source = {"utrecht": {"form-field": {"font-size": {"value": "18px"}}}} + + updated = apply_mapping(source) + + self.assertIsNot(updated, source) + self.assertEqual(updated, source) + + def test_map_old_token_to_new(self): + source = {"of": {"button": {"bg": {"value": "blue"}}}} + + updated = apply_mapping(source) + + self.assertEqual( + updated, {"utrecht": {"button": {"background-color": {"value": "blue"}}}} + ) + + def test_map_and_merge_old_token_to_new(self): + source = { + "of": {"button": {"bg": {"value": "blue"}}}, + "utrecht": {"button": {"color": {"value": "pink"}}}, + } + + updated = apply_mapping(source) + + self.assertEqual( + updated, + { + "utrecht": { + "button": { + "background-color": {"value": "blue"}, + "color": {"value": "pink"}, + } + } + }, + ) + + def test_do_not_overwrite_existing_token(self): + source = { + "of": {"button": {"bg": {"value": "red"}}}, + "utrecht": {"button": {"background-color": {"value": "blue"}}}, + } + + updated = apply_mapping(source) + + self.assertEqual( + updated, {"utrecht": {"button": {"background-color": {"value": "blue"}}}} + ) + + +class ButtonDesignTokensMigrationTests(TestMigrations): + + app = "config" + migrate_from = "0058_auto_20231026_1525" + migrate_to = "0059_convert_button_design_tokens" + + def setUpBeforeMigration(self, apps): + GlobalConfiguration = apps.get_model("config", "GlobalConfiguration") + # (Partial) tokens configuration taken from a test instance + GlobalConfiguration.objects.create( + design_token_values={ + "of": { + "text": {"font-size": {"value": "1rem"}}, + "color": { + "bg": {"value": "#fff"}, + "fg": {"value": "#000000"}, + "info": {"value": "#007bc7"}, + "border": {"value": "#b3b3b3"}, + "danger": {"value": "#d52b1e"}, + "primary": {"value": "#07838f"}, + "success": {"value": "green"}, + "warning": {"value": "#e17000"}, + }, + "button": { + "bg": {"value": "#07838f"}, + "fg": {"value": "#FFFFFF"}, + "hover": {"bg": {"value": "rgba(0,116,126,255)"}}, + "primary": { + "active": { + "bg": { + "value": "green", + } + } + }, + }, + }, + "utrecht": { + "button": { + "primary-action": { + "active": { + "background-color": {"value": "#9d2f66"}, + }, + } + }, + }, + } + ) + + def test_design_tokens_updated_correctly(self): + self.maxDiff = None + + GlobalConfiguration = self.apps.get_model("config", "GlobalConfiguration") + config = GlobalConfiguration.objects.get() + + expected = { + "of": { + "text": {"font-size": {"value": "1rem"}}, + "color": { + "bg": {"value": "#fff"}, + "fg": {"value": "#000000"}, + "info": {"value": "#007bc7"}, + "border": {"value": "#b3b3b3"}, + "danger": {"value": "#d52b1e"}, + "primary": {"value": "#07838f"}, + "success": {"value": "green"}, + "warning": {"value": "#e17000"}, + }, + }, + "utrecht": { + "button": { + "background-color": {"value": "#07838f"}, + "color": {"value": "#FFFFFF"}, + "hover": {"background-color": {"value": "rgba(0,116,126,255)"}}, + "primary-action": { + "active": { + "background-color": {"value": "#9d2f66"}, + }, + }, + "secondary-action": { + "background-color": {"value": "#fff"}, + "border-color": {"value": "#b3b3b3"}, + "color": {"value": "#000000"}, + "hover": {"background-color": {"value": "rgba(0,116,126,255)"}}, + }, + "subtle": { + "danger": { + "color": {"value": "#d52b1e"}, + "active": { + "background-color": {"value": "#d52b1e"}, + "color": {"value": "#fff"}, + }, + }, + }, + }, + }, + } + self.assertEqual(config.design_token_values, expected) From 285121cabe88d5b1e642507c07993e37165d5398 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Tue, 31 Oct 2023 17:18:23 +0100 Subject: [PATCH 3/5] :arrow_up: [#3566] Upgrade design tokens package to latest version --- package-lock.json | 14 +++++++------- package.json | 2 +- .../e2e_tests/test_organization_configuration.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 59bca31a7e..c9a8624488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "UNLICENSED", "dependencies": { "@fortawesome/fontawesome-free": "^6.1.1", - "@open-formulieren/design-tokens": "^0.39.0", + "@open-formulieren/design-tokens": "^0.45.0", "@open-formulieren/formio-builder": "^0.8.0", "@rjsf/core": "^4.2.1", "@tinymce/tinymce-react": "^3.12.6", @@ -3951,9 +3951,9 @@ "dev": true }, "node_modules/@open-formulieren/design-tokens": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.39.0.tgz", - "integrity": "sha512-tj8OzDBGilvdbJJVrOCkfQhIWClCoijqxYup1W0Sm612ernPXctJMldjSRDgDjNRqXRlXVD9kP3+6PjZiWhy4w==" + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.45.0.tgz", + "integrity": "sha512-gSXIt3jqesXt3cbO5m7023DpurxhJMsH497wEmd6J8djtd5Srr0oCujP8riDRIJdOaLmKGmyJeQmyaRfciFwug==" }, "node_modules/@open-formulieren/formio-builder": { "version": "0.8.0", @@ -34477,9 +34477,9 @@ "dev": true }, "@open-formulieren/design-tokens": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.39.0.tgz", - "integrity": "sha512-tj8OzDBGilvdbJJVrOCkfQhIWClCoijqxYup1W0Sm612ernPXctJMldjSRDgDjNRqXRlXVD9kP3+6PjZiWhy4w==" + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.45.0.tgz", + "integrity": "sha512-gSXIt3jqesXt3cbO5m7023DpurxhJMsH497wEmd6J8djtd5Srr0oCujP8riDRIJdOaLmKGmyJeQmyaRfciFwug==" }, "@open-formulieren/formio-builder": { "version": "0.8.0", diff --git a/package.json b/package.json index b686517aeb..ae78c4f85d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "homepage": "https://maykinmedia.nl", "dependencies": { "@fortawesome/fontawesome-free": "^6.1.1", - "@open-formulieren/design-tokens": "^0.39.0", + "@open-formulieren/design-tokens": "^0.45.0", "@open-formulieren/formio-builder": "^0.8.0", "@rjsf/core": "^4.2.1", "@tinymce/tinymce-react": "^3.12.6", diff --git a/src/openforms/config/tests/e2e_tests/test_organization_configuration.py b/src/openforms/config/tests/e2e_tests/test_organization_configuration.py index e64ab4398b..fe5b2beb23 100644 --- a/src/openforms/config/tests/e2e_tests/test_organization_configuration.py +++ b/src/openforms/config/tests/e2e_tests/test_organization_configuration.py @@ -33,7 +33,7 @@ async def test_design_token_editor_integration(self): token_to_edit = page.get_by_text("of.utrecht-link.font-family") token_row = token_to_edit.locator("../..") await token_row.get_by_role("button").click() - await token_row.get_by_placeholder('"Fira Sans", Calibri, sans-serif').fill( + await token_row.get_by_placeholder("Fira Sans, Calibri, sans-serif").fill( "Roboto" ) From 5d6f7110a1961edbd12b8161e1e2a6dc8caf7fa0 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Tue, 31 Oct 2023 17:30:13 +0100 Subject: [PATCH 4/5] :alien: [#3566] Update classnames for button on cookies page --- src/openforms/templates/cookie_consent/_cookie_group.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openforms/templates/cookie_consent/_cookie_group.html b/src/openforms/templates/cookie_consent/_cookie_group.html index 0610f61ef0..eec0266eaa 100644 --- a/src/openforms/templates/cookie_consent/_cookie_group.html +++ b/src/openforms/templates/cookie_consent/_cookie_group.html @@ -19,7 +19,7 @@

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

{% csrf_token %} - + {% endif %} From fb0a02e218e7483d5d324f17f65f29732dec4851 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Tue, 31 Oct 2023 17:32:35 +0100 Subject: [PATCH 5/5] :alien: [#3566] Update remaining openforms-button -> utrecht-button --- .../of_authentication/registrator_subject_info.html | 12 ++++++------ .../submissions/find_submission_for_cosign.html | 8 ++++---- src/openforms/templates/includes/cookie-notice.html | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html b/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html index e0f3dca7a1..82af6632de 100644 --- a/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html +++ b/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html @@ -37,8 +37,8 @@

{% include "includes/forms/field_wrapper.html" with field=form.bsn type='bsn' only %}
-
@@ -47,16 +47,16 @@

{% include "includes/forms/field_wrapper.html" with field=form.kvk only %}
-
-
diff --git a/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html b/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html index ddb0b7f0a0..f3925c672b 100644 --- a/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html +++ b/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html @@ -23,15 +23,15 @@

{% include "includes/forms/field_wrapper.html" with field=form.code type='text' only %}
-
{% csrf_token %}
-
diff --git a/src/openforms/templates/includes/cookie-notice.html b/src/openforms/templates/includes/cookie-notice.html index 8b9b32d354..e07a12ce74 100644 --- a/src/openforms/templates/includes/cookie-notice.html +++ b/src/openforms/templates/includes/cookie-notice.html @@ -23,13 +23,13 @@