Consistentify <p> usage in error messages

An error message is now wrapped in <p> tags if there are multiple paragraphs, not otherwise. This was done inconsistently before. It does not impact the display of said messages.
OpenConext · Oct 16, 2023 · b444b40 · b444b40
1 parent 9681f38
commit b444b40
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 7 deletions.
diff --git a/...e/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig b/...e/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }}{% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}{% endblock %}
diff --git a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
@@ -6,6 +6,7 @@
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
 {% block errorMessage %}
+    <p>
     {% if withIdpName and withSpName %}
         {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']}) }}
     {% elseif withIdpName %}
@@ -15,6 +16,7 @@
     {% else %}
         {{ 'error_missing_required_fields_desc_no_name'|trans }}
     {% endif %}
+    </p>
 
     <p>
         <ul>

diff --git a/...mplates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig b/...mplates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }}{% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ message }}.</p>{% endblock %}
+{% block errorMessage %}{{ message }}{% endblock %}
diff --git a/...e/templates/modules/Authentication/View/IdentityProvider/perform-request-access.html.twig b/...e/templates/modules/Authentication/View/IdentityProvider/perform-request-access.html.twig
@@ -3,7 +3,7 @@
 {% block content %}
 <div class="mod-form">
   <h1>{{ 'send_confirm'|trans }}</h1>
-    {{ 'send_confirm_desc'|trans }}
+  <p>{{ 'send_confirm_desc'|trans }}</p>
 
   <div class="close-modal-container">
     <button type="button" class="c-button close-modal">{{ 'close'|trans }}</button>

diff --git a/...conext/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig b/...conext/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}{% endblock %}
diff --git a/...enconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/...enconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
@@ -6,6 +6,7 @@
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
 {% block errorMessage %}
+    <p>
     {% if withIdpName and withSpName %}
         {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']}) }}
     {% elseif withIdpName %}
@@ -15,6 +16,7 @@
     {% else %}
         {{ 'error_missing_required_fields_desc_no_name'|trans }}
     {% endif %}
+    </p>
 
     <p>
         <ul>

diff --git a/...mplates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig b/...mplates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ message }}.</p>{% endblock %}
+{% block errorMessage %}{{ message }}{% endblock %}
diff --git a/...onext/templates/modules/Authentication/View/Feedback/received-error-status-code.html.twig b/...onext/templates/modules/Authentication/View/Feedback/received-error-status-code.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_received_error_status_code_desc'|trans }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_received_error_status_code_desc'|trans }}{% endblock %}
diff --git a/...plates/modules/Authentication/View/Feedback/unknown-requesterid-in-authnrequest.html.twig b/...plates/modules/Authentication/View/Feedback/unknown-requesterid-in-authnrequest.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_unknown_requesterid_in_authnrequest'|trans }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_unknown_requesterid_in_authnrequest'|trans }}{% endblock %}