diff --git a/src/openforms/js/components/errors/ErrorMessage.js b/src/openforms/js/components/errors/ErrorMessage.js
index d0bc4500d7..620a515115 100644
--- a/src/openforms/js/components/errors/ErrorMessage.js
+++ b/src/openforms/js/components/errors/ErrorMessage.js
@@ -1,14 +1,14 @@
import PropTypes from 'prop-types';
import React from 'react';
-import FAIcon from 'components/admin/FAIcon';
+import {ErrorIcon} from 'components/admin/icons';
const ErrorMessage = ({children}) => {
if (!children) return null;
return (
diff --git a/src/openforms/js/lang/en.json b/src/openforms/js/lang/en.json
index 31aaf261d1..87d19af3a4 100644
--- a/src/openforms/js/lang/en.json
+++ b/src/openforms/js/lang/en.json
@@ -314,11 +314,6 @@
"description": "Form ID field help text",
"originalDefault": "Unique identifier for the form"
},
- "7Vx5It": {
- "defaultMessage": "No compatible registration backend configured.",
- "description": "Registration summary no registration backend fallback message",
- "originalDefault": "No compatible registration backend configured."
- },
"7X6yT4": {
"defaultMessage": "You are modifying an existing form definition! This change affects
{count, plural, one {# form} other {# forms} }",
"description": "Warning when modifying existing form definitions",
@@ -399,6 +394,11 @@
"description": "Logic type selection label",
"originalDefault": "Please select the logic type:"
},
+ "9LdZVP": {
+ "defaultMessage": "Attribute",
+ "description": "Variable prefill attribute label",
+ "originalDefault": "Attribute"
+ },
"9LflJr": {
"defaultMessage": "Key",
"description": "Label for 'key' in MappingArrayInput table column",
@@ -599,6 +599,11 @@
"description": "Admin error for API error when configuring Camunda actions",
"originalDefault": "Could not retrieve the decision definitions IDs/versions. Is the selected DMN plugin running and properly configured?"
},
+ "DWhkNq": {
+ "defaultMessage": "Plugin",
+ "description": "Variable prefill plugin label",
+ "originalDefault": "Plugin"
+ },
"DaxIUG": {
"defaultMessage": "Variable key",
"description": "'Variable key' label",
@@ -1039,6 +1044,11 @@
"description": "Custom confirmation email template explanation",
"originalDefault": "Below you can specify a custom template for the configuration email. If not specified, the globally configured template will be used."
},
+ "Mdnl0l": {
+ "defaultMessage": "Prefill",
+ "description": "Variable table prefill title",
+ "originalDefault": "Prefill"
+ },
"MnfzL3": {
"defaultMessage": "Plugin ID",
"description": "Plugin ID label",
@@ -1049,11 +1059,6 @@
"description": "Form variables configuration editor fieldset title",
"originalDefault": "Form variables configuration"
},
- "MzMXRd": {
- "defaultMessage": "Prefill attribute",
- "description": "Variable table prefill attribute title",
- "originalDefault": "Prefill attribute"
- },
"NE5h2q": {
"defaultMessage": "Description",
"description": "Description column header",
@@ -1109,10 +1114,10 @@
"description": "Session expiry warning (in modal)",
"originalDefault": "Your session is about to expire {delta}. Extend your session if you wish to continue."
},
- "OibWN2": {
- "defaultMessage": "Prefill identifier role",
- "description": "Variable table identifier role attribute title",
- "originalDefault": "Prefill identifier role"
+ "Oi+DV0": {
+ "defaultMessage": "
{attr} from
{plugin} (of the {role})",
+ "description": "Prefill configuration summary",
+ "originalDefault": "
{attr} from
{plugin} (of the {role})"
},
"OmQdqG": {
"defaultMessage": "Cache timeout",
@@ -1209,6 +1214,11 @@
"description": "Payment backend options label",
"originalDefault": "Payment backend options"
},
+ "QsrtPz": {
+ "defaultMessage": "Prefill configuration",
+ "description": "Variable prefill configuration modal title",
+ "originalDefault": "Prefill configuration"
+ },
"R78GMf": {
"defaultMessage": "Confidentiality",
"description": "Indication of the level to which extend the dossier of the ZAAK is meant to be public",
@@ -1364,6 +1374,11 @@
"description": "Changing objecttype warning message",
"originalDefault": "Changing the objecttype will remove the existing variables mapping. Are you sure you want to continue?"
},
+ "Uq9Hbx": {
+ "defaultMessage": "-",
+ "description": "Registration summary no registration backend fallback message",
+ "originalDefault": "-"
+ },
"V21YkS": {
"defaultMessage": "Confirm",
"description": "Camunda process variables confirm button",
@@ -1424,11 +1439,6 @@
"description": "Form logic tab title",
"originalDefault": "Logic"
},
- "WjDh7l": {
- "defaultMessage": "Prefill plugin",
- "description": "Variable table prefill plugin title",
- "originalDefault": "Prefill plugin"
- },
"WnKF/i": {
"defaultMessage": "URL that points to the INFORMATIEOBJECTTYPE in the Catalogi API to be used for the submission attachments",
"description": "Objects API registration options \"Attachment informatieobjecttype\" description",
@@ -1619,6 +1629,11 @@
"description": "Variable registration configuration modal title",
"originalDefault": "{varName}: registration configuration for {backendName}"
},
+ "bmlODS": {
+ "defaultMessage": "Identifier role",
+ "description": "Variable prefill identifier role label",
+ "originalDefault": "Identifier role"
+ },
"bnxtnX": {
"defaultMessage": "Full request",
"description": "Service fetch configuration try it out tabpanel full request fieldset title",
@@ -1844,6 +1859,11 @@
"description": "Logic action warning icon text",
"originalDefault": "Detected some problems in this action: {problems}."
},
+ "gqVGbb": {
+ "defaultMessage": "Edit prefill configuration",
+ "description": "'Edit variable prefill' icon label",
+ "originalDefault": "Edit prefill configuration"
+ },
"gr7edY": {
"defaultMessage": "App version",
"description": "App version column header",
@@ -2354,6 +2374,11 @@
"description": "Last Name Component field help text",
"originalDefault": "Component where the last name should be entered"
},
+ "tJQoMq": {
+ "defaultMessage": "There are errors in the prefill configuration.",
+ "description": "Prefill configuration errors icon text",
+ "originalDefault": "There are errors in the prefill configuration."
+ },
"tLL2x4": {
"defaultMessage": "Change form",
"description": "Change form page title",
diff --git a/src/openforms/js/lang/nl.json b/src/openforms/js/lang/nl.json
index ceb6eaa134..a3b5e204e2 100644
--- a/src/openforms/js/lang/nl.json
+++ b/src/openforms/js/lang/nl.json
@@ -317,11 +317,6 @@
"description": "Form ID field help text",
"originalDefault": "Unique identifier for the form"
},
- "7Vx5It": {
- "defaultMessage": "Er is geen (relevante) registratiemethode ingesteld.",
- "description": "Registration summary no registration backend fallback message",
- "originalDefault": "No compatible registration backend configured."
- },
"7X6yT4": {
"defaultMessage": "U bewerkt een bestaande set van formuliervelden! Deze wijziging heeft effect op
{count, plural, one {# formulier} other {# formulieren} }.",
"description": "Warning when modifying existing form definitions",
@@ -403,6 +398,11 @@
"description": "Logic type selection label",
"originalDefault": "Please select the logic type:"
},
+ "9LdZVP": {
+ "defaultMessage": "Attribuut",
+ "description": "Variable prefill attribute label",
+ "originalDefault": "Attribute"
+ },
"9LflJr": {
"defaultMessage": "Sleutel",
"description": "Label for 'key' in MappingArrayInput table column",
@@ -604,6 +604,12 @@
"description": "Admin error for API error when configuring Camunda actions",
"originalDefault": "Could not retrieve the decision definitions IDs/versions. Is the selected DMN plugin running and properly configured?"
},
+ "DWhkNq": {
+ "defaultMessage": "Plugin",
+ "description": "Variable prefill plugin label",
+ "isTranslated": true,
+ "originalDefault": "Plugin"
+ },
"DaxIUG": {
"defaultMessage": "Sleutel variabele",
"description": "'Variable key' label",
@@ -1045,6 +1051,12 @@
"description": "Custom confirmation email template explanation",
"originalDefault": "Below you can specify a custom template for the configuration email. If not specified, the globally configured template will be used."
},
+ "Mdnl0l": {
+ "defaultMessage": "Prefill",
+ "description": "Variable table prefill title",
+ "isTranslated": true,
+ "originalDefault": "Prefill"
+ },
"MnfzL3": {
"defaultMessage": "Plugin",
"description": "Plugin ID label",
@@ -1055,11 +1067,6 @@
"description": "Form variables configuration editor fieldset title",
"originalDefault": "Form variables configuration"
},
- "MzMXRd": {
- "defaultMessage": "Prefill-attribuut",
- "description": "Variable table prefill attribute title",
- "originalDefault": "Prefill attribute"
- },
"NE5h2q": {
"defaultMessage": "Omschrijving",
"description": "Description column header",
@@ -1116,10 +1123,10 @@
"description": "Session expiry warning (in modal)",
"originalDefault": "Your session is about to expire {delta}. Extend your session if you wish to continue."
},
- "OibWN2": {
- "defaultMessage": "Prefill-bron",
- "description": "Variable table identifier role attribute title",
- "originalDefault": "Prefill identifier role"
+ "Oi+DV0": {
+ "defaultMessage": "
{attr} uit
{plugin} (van de {role})",
+ "description": "Prefill configuration summary",
+ "originalDefault": "
{attr} from
{plugin} (of the {role})"
},
"OmQdqG": {
"defaultMessage": "Cache timeout",
@@ -1219,13 +1226,18 @@
"description": "Payment backend options label",
"originalDefault": "Payment backend options"
},
+ "QsrtPz": {
+ "defaultMessage": "Prefill-instellingen",
+ "description": "Variable prefill configuration modal title",
+ "originalDefault": "Prefill configuration"
+ },
"R78GMf": {
"defaultMessage": "Vertrouwelijkheidaanduiding",
"description": "Indication of the level to which extend the dossier of the ZAAK is meant to be public",
"originalDefault": "Confidentiality"
},
"R7XVbR": {
- "defaultMessage": "Ingelogde/vertegenwoordigde",
+ "defaultMessage": "hoofdentiteit",
"description": "Identifier role (for mandate context) label for representee",
"originalDefault": "Main/representee"
},
@@ -1374,6 +1386,12 @@
"description": "Changing objecttype warning message",
"originalDefault": "Changing the objecttype will remove the existing variables mapping. Are you sure you want to continue?"
},
+ "Uq9Hbx": {
+ "defaultMessage": "-",
+ "description": "Registration summary no registration backend fallback message",
+ "isTranslated": true,
+ "originalDefault": "-"
+ },
"V21YkS": {
"defaultMessage": "Bevestigen",
"description": "Camunda process variables confirm button",
@@ -1436,11 +1454,6 @@
"description": "Form logic tab title",
"originalDefault": "Logic"
},
- "WjDh7l": {
- "defaultMessage": "Prefill-plugin",
- "description": "Variable table prefill plugin title",
- "originalDefault": "Prefill plugin"
- },
"WnKF/i": {
"defaultMessage": "URL naar het INFORMATIEOBJECTTYPE in een Catalogi API die wordt gebruikt voor de bijlagen.",
"description": "Objects API registration options \"Attachment informatieobjecttype\" description",
@@ -1631,6 +1644,11 @@
"description": "Variable registration configuration modal title",
"originalDefault": "{varName}: registration configuration for {backendName}"
},
+ "bmlODS": {
+ "defaultMessage": "Bronhouder",
+ "description": "Variable prefill identifier role label",
+ "originalDefault": "Identifier role"
+ },
"bnxtnX": {
"defaultMessage": "Volledige HTTP-request",
"description": "Service fetch configuration try it out tabpanel full request fieldset title",
@@ -1858,6 +1876,11 @@
"description": "Logic action warning icon text",
"originalDefault": "Detected some problems in this action: {problems}."
},
+ "gqVGbb": {
+ "defaultMessage": "Prefill instellen",
+ "description": "'Edit variable prefill' icon label",
+ "originalDefault": "Edit prefill configuration"
+ },
"gr7edY": {
"defaultMessage": "Applicatieversie",
"description": "App version column header",
@@ -2372,6 +2395,11 @@
"description": "Last Name Component field help text",
"originalDefault": "Component where the last name should be entered"
},
+ "tJQoMq": {
+ "defaultMessage": "De prefill-instellingen zijn niet geldig.",
+ "description": "Prefill configuration errors icon text",
+ "originalDefault": "There are errors in the prefill configuration."
+ },
"tLL2x4": {
"defaultMessage": "Formulier configureren",
"description": "Change form page title",
diff --git a/src/openforms/scss/components/admin/_ReactModal.scss b/src/openforms/scss/components/admin/_ReactModal.scss
index 987573ec94..da88f98aac 100644
--- a/src/openforms/scss/components/admin/_ReactModal.scss
+++ b/src/openforms/scss/components/admin/_ReactModal.scss
@@ -99,5 +99,17 @@
flex-shrink: 0;
bottom: 1px;
}
+
+ // bootstrap styles compete with django .form-row styles...
+ .form-row {
+ display: block;
+ margin-inline-start: 0;
+ margin-inline-end: 0;
+
+ &,
+ * {
+ box-sizing: initial;
+ }
+ }
}
}
diff --git a/src/openforms/scss/components/admin/_icon.scss b/src/openforms/scss/components/admin/_icon.scss
index 37c26712ef..b3f0ccb8d7 100644
--- a/src/openforms/scss/components/admin/_icon.scss
+++ b/src/openforms/scss/components/admin/_icon.scss
@@ -20,4 +20,8 @@
padding: 0;
padding-right: $grid-margin-1;
}
+
+ &--compact {
+ padding: 0;
+ }
}