Merge pull request #821 from ministryofjustice/br-be-gone

Turn plain <br> that's escaped by template renderer to a full stop.
ministryofjustice · Jun 25, 2020 · cef30cb · cef30cb
2 parents c12272d + cac9156
commit cef30cb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/controlpanel/frontend/jinja2/datasource-create.html b/controlpanel/frontend/jinja2/datasource-create.html
@@ -39,7 +39,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
         "maxlength": "60",
       },
       "value": form.name.value(),
-      "errorMessage": { "html": form.name.errors|join("<br>") } if form.name.errors else {}
+      "errorMessage": { "html": form.name.errors|join(". ") } if form.name.errors else {}
     }) }}
     <button class="govuk-button">Create data source</button>
   </form>

diff --git a/controlpanel/frontend/jinja2/parameter-create.html b/controlpanel/frontend/jinja2/parameter-create.html
@@ -36,7 +36,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
           "attributes": {},
           "items": app_type_choices,
           "value": form.app_type.value(),
-          "errorMessage": { "html": form.app_type.errors|join("<br>") } if form.app_type.errors else {}
+          "errorMessage": { "html": form.app_type.errors|join(". ") } if form.app_type.errors else {}
         })
       }}
 
@@ -54,7 +54,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
           "maxlength": "60",
           "data-role-endpoint": url("parameters-list-roles"),
         },
-        "errorMessage": {"html": form.role_name.errors|join("<br>")} if form.role_name.errors else {},
+        "errorMessage": {"html": form.role_name.errors|join(". ")} if form.role_name.errors else {},
         "classes": "govuk-input--error govuk-!-width-two-thirds" if form.role_name.errors else "govuk-!-width-two-thirds",
         "value": form.role_name.value(),
         "items": []
@@ -80,7 +80,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
             "maxlength": "60",
           },
           "value": form.key.value(),
-          "errorMessage": { "html": form.key.errors|join("<br>") } if form.key.errors else {}
+          "errorMessage": { "html": form.key.errors|join(". ") } if form.key.errors else {}
         })
       }}
 
@@ -95,7 +95,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
           "attributes": {
           },
           "value": form.value.value(),
-          "errorMessage": { "html": form.value.errors|join("<br>") } if form.value.errors else {}
+          "errorMessage": { "html": form.value.errors|join(". ") } if form.value.errors else {}
         })
       }}
       <button class="govuk-button">Create parameter</button>

diff --git a/controlpanel/frontend/jinja2/policy-create.html b/controlpanel/frontend/jinja2/policy-create.html
@@ -36,7 +36,7 @@ <h1 class="govuk-heading-xl">{{ legend }}</h1>
             "maxlength": "60",
           },
           "value": form.name.value(),
-          "errorMessage": { "html": form.name.errors|join("<br>") } if form.name.errors else {}
+          "errorMessage": { "html": form.name.errors|join(". ") } if form.name.errors else {}
         })
       }}
 

diff --git a/controlpanel/frontend/jinja2/tool-list.html b/controlpanel/frontend/jinja2/tool-list.html
@@ -23,7 +23,7 @@ <h1 class="govuk-heading-xl">Your tools</h1>
     <tr class="govuk-table__row sse-listener tool-status" data-tool-name="{{ tool.chart_name }}">
       <td class="govuk-table__cell">
         {{ tool.name }}
-        <br>
+        <br/>
         <small class="tool-app-version">
           {% if deployment %}
             {{ deployment.get_installed_app_version(id_token) or "Unknown" }}

diff --git a/controlpanel/frontend/jinja2/webapp-create.html b/controlpanel/frontend/jinja2/webapp-create.html
@@ -20,7 +20,7 @@
     "hint": {
       "text": '60 chars max, only lowercase letters, numbers, periods and hyphens, auto-prefixed with "' + env + '"'
     },
-    "errorMessage": {"text": form.new_datasource_name.errors|join("<br>")} if form.new_datasource_name.errors else {},
+    "errorMessage": {"text": form.new_datasource_name.errors|join(". ")} if form.new_datasource_name.errors else {},
     "value": form.new_datasource_name.value()
   }) }}
   </div>
@@ -33,7 +33,7 @@
                 {%- if form.existing_datasource_id.errors %} govuk-form-group--error{% endif %}">
       {{ govukLabel({"text": "Select webapp data source"}) }}
       {% if form.existing_datasource_id.errors -%}
-      {{ govukErrorMessage({"text": form.existing_datasource_id.errors|join("<br>")}) }}
+      {{ govukErrorMessage({"text": form.existing_datasource_id.errors|join(". ")}) }}
       {%- endif %}
       {{ form.existing_datasource_id }}
     </div>
@@ -57,7 +57,7 @@ <h1 class="govuk-heading-xl">{{ page_title }}</h1>
       "text": "Github repository",
       "classes": "govuk-label--m"
     },
-    "errorMessage": {"html": form.repo_url.errors|join("<br>")} if form.repo_url.errors else {},
+    "errorMessage": {"html": form.repo_url.errors|join(". ")} if form.repo_url.errors else {},
     "classes": "govuk-input--error" if form.repo_url.errors else "",
     "value": form.repo_url.value(),
     "items": repos

diff --git a/controlpanel/frontend/jinja2/webapp-detail.html b/controlpanel/frontend/jinja2/webapp-detail.html
@@ -282,7 +282,7 @@ <h2 class="govuk-heading-m">App data sources</h2>
     <div class="govuk-form-group">
       {{ govukLabel({"text": "Connect an app data source"}) }}
       {% if grant_access_form.datasource.errors -%}
-      {{ govukErrorMessage({"text": grant_access_form.datasource.errors|join("<br>")}) }}
+      {{ govukErrorMessage({"text": grant_access_form.datasource.errors|join(". ")}) }}
       {%- endif %}
       {{ grant_access_form.datasource }}
     </div>