@@ -62,7 +62,7 @@
After saving, you'll have the option to send 🚀
-
+
{% include "partials/templates/guidance-personalisation.html" %}
{% include "partials/templates/guidance-optional-content.html" %}
{% include "partials/templates/guidance-links.html" %}
diff --git a/app/templates/views/email-branding/manage-branding.html b/app/templates/views/email-branding/manage-branding.html
index ffdac28c5..51dd41b26 100644
--- a/app/templates/views/email-branding/manage-branding.html
+++ b/app/templates/views/email-branding/manage-branding.html
@@ -17,8 +17,8 @@
{% block platform_admin_content %}
{{ page_header('{} email branding'.format('Update' if email_branding else 'Add')) }}
-
-
+
+
{% if logo %}

diff --git a/app/templates/views/email-link-invalid.html b/app/templates/views/email-link-invalid.html
index 3ea405130..45c140c50 100644
--- a/app/templates/views/email-link-invalid.html
+++ b/app/templates/views/email-link-invalid.html
@@ -7,8 +7,8 @@
{% block maincolumn_content %}
-
-
+
+
This link has expired
diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html
index e5f8aa95e..f9ef33538 100644
--- a/app/templates/views/email-not-received.html
+++ b/app/templates/views/email-not-received.html
@@ -7,8 +7,8 @@
{% block maincolumn_content %}
-
-
+
+
Resend email link
Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.
diff --git a/app/templates/views/find-users/auth_type.html b/app/templates/views/find-users/auth_type.html
index 1d95fdbf5..0269dc733 100644
--- a/app/templates/views/find-users/auth_type.html
+++ b/app/templates/views/find-users/auth_type.html
@@ -14,8 +14,8 @@
{% block platform_admin_content %}
-
-
+
+
{{ page_header('Set auth type for ' + user.name) }}
{% call form_wrapper() %}
diff --git a/app/templates/views/find-users/user-information.html b/app/templates/views/find-users/user-information.html
index 03bfa9645..3a90b7bc6 100644
--- a/app/templates/views/find-users/user-information.html
+++ b/app/templates/views/find-users/user-information.html
@@ -6,8 +6,8 @@
{% endblock %}
{% block platform_admin_content %}
-
-
+
+
{{ user.name }}
diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html
index c7d2b02f1..61753041e 100644
--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-password.html
@@ -8,8 +8,8 @@
{% block maincolumn_content %}
-
-
+
+
Forgot your password?
We’ll send you an email to create a new password.
diff --git a/app/templates/views/integration-testing.html b/app/templates/views/integration-testing.html
index f36cfa7a4..209becda1 100644
--- a/app/templates/views/integration-testing.html
+++ b/app/templates/views/integration-testing.html
@@ -7,8 +7,8 @@
{% block maincolumn_content %}
-
-
+
+
Integration testing
This information has moved.
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 3b4c050f3..16f9d9813 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -22,8 +22,8 @@
{% for user in users %}
-
-
+
+
{%- if user.name -%}
{{ user.name }}
@@ -70,7 +70,7 @@
{% endif %}
-
+
{% if current_user.has_permissions('manage_service') %}
{% if user.status == 'pending' %}
Cancel invitation for {{ user.email_address }}
diff --git a/app/templates/views/manage-users/confirm-edit-user-email.html b/app/templates/views/manage-users/confirm-edit-user-email.html
index a62d28778..3df33f69f 100644
--- a/app/templates/views/manage-users/confirm-edit-user-email.html
+++ b/app/templates/views/manage-users/confirm-edit-user-email.html
@@ -17,8 +17,8 @@
{{ page_header('Confirm change of email address') }}
-
-
+
+
{% call form_wrapper() %}
New email address:
diff --git a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
index 23d3a50b1..44eed66d6 100644
--- a/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
+++ b/app/templates/views/manage-users/confirm-edit-user-mobile-number.html
@@ -16,8 +16,8 @@
{{ page_header('Confirm change of mobile number') }}
-
-
+
+
{% call form_wrapper() %}
New mobile number:
diff --git a/app/templates/views/manage-users/edit-user-mobile.html b/app/templates/views/manage-users/edit-user-mobile.html
index 4db6e65ff..c0ee647d2 100644
--- a/app/templates/views/manage-users/edit-user-mobile.html
+++ b/app/templates/views/manage-users/edit-user-mobile.html
@@ -17,8 +17,8 @@
{{ page_header('Change team member’s mobile number') }}
This will change the mobile number for {{ user.name }}.
-
-
+
+
{% call form_wrapper(class="extra-tracking") %}
{{ form.mobile_number }}
{{ page_footer('Save') }}
diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html
index 25d245ca7..d4ba9c996 100644
--- a/app/templates/views/new-password.html
+++ b/app/templates/views/new-password.html
@@ -8,8 +8,8 @@
{% block maincolumn_content %}
-
-
+
+
{% if user %}
Create a new password
diff --git a/app/templates/views/organizations/add-organization.html b/app/templates/views/organizations/add-organization.html
index 30bca55db..4cda4f636 100644
--- a/app/templates/views/organizations/add-organization.html
+++ b/app/templates/views/organizations/add-organization.html
@@ -14,11 +14,11 @@
Switch service
-
-
+
+
-
+
{% block beforeContent %}{% endblock %}
{% block content %}
diff --git a/app/templates/views/organizations/organization/index.html b/app/templates/views/organizations/organization/index.html
index c8f24bfc4..376c37162 100644
--- a/app/templates/views/organizations/organization/index.html
+++ b/app/templates/views/organizations/organization/index.html
@@ -16,8 +16,8 @@
{{ pill(years, selected_year, big_number_args={'smallest': True}) }}
-
-
+
+
Emails
{{ big_number(
@@ -27,7 +27,7 @@
) }}
-
+
Text messages
{{ big_number(
@@ -58,15 +58,15 @@
-
-
+
+
{{ big_number(
service.emails_sent,
label=service.emails_sent|message_count_label('email'),
smallest=True
) }}
-
+
{% if service.sms_cost %}
{{ big_number(
service.sms_cost,
diff --git a/app/templates/views/organizations/organization/settings/edit-domains.html b/app/templates/views/organizations/organization/settings/edit-domains.html
index c05aff56c..2c8234a03 100644
--- a/app/templates/views/organizations/organization/settings/edit-domains.html
+++ b/app/templates/views/organizations/organization/settings/edit-domains.html
@@ -15,8 +15,8 @@
{% block maincolumn_content %}
{{ page_header("Known email domains") }}
-
-
+
+
If a user’s email addresses ends with one of these domains then
any services they create will be associated with this organization.
diff --git a/app/templates/views/organizations/organization/settings/edit-go-live-notes.html b/app/templates/views/organizations/organization/settings/edit-go-live-notes.html
index 50652a71d..522abc19d 100644
--- a/app/templates/views/organizations/organization/settings/edit-go-live-notes.html
+++ b/app/templates/views/organizations/organization/settings/edit-go-live-notes.html
@@ -15,8 +15,8 @@
{% block maincolumn_content %}
{{ page_header("Edit request to go live notes") }}
-
-
+
+
Text entered here will be displayed in the Zendesk ticket when a service
belonging to this organization requests to go live.
diff --git a/app/templates/views/organizations/organization/settings/preview-email-branding.html b/app/templates/views/organizations/organization/settings/preview-email-branding.html
index 405405dd6..0760fcce5 100644
--- a/app/templates/views/organizations/organization/settings/preview-email-branding.html
+++ b/app/templates/views/organizations/organization/settings/preview-email-branding.html
@@ -10,8 +10,8 @@
{% block maincolumn_content %}
Preview email branding
-
-
+
+
{{ email_branding_preview(form.branding_style.data) }}
{% call form_wrapper(action=action) %}