Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.
Emails sometimes take a few minutes to arrive. If you do not receive an email link, Notify can send you a new one.
{{ govukButton({
"element": "a",
"text": "Resend email link",
@@ -21,7 +21,7 @@
find a member of your team who has permission to manage settings, team and usage
ask them to change the email address for your account
diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 4c41e46cf..21dcd8ee6 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -9,40 +9,40 @@
{% block content_column_content %}
Features
-If you work for central government, a local authority or the NHS, you can use GOV.UK Notify to keep your users updated.
-Notify makes it easy to create, customise and send:
+If you work for central government, a local authority or the NHS, you can use GOV.UK Notify to keep your users updated.
+Notify makes it easy to create, customise and send:
-You do not need any technical knowledge to use Notify.
+You do not need any technical knowledge to use Notify.
{% if not current_user.is_authenticated %}
- Create an account for free and try it yourself.
+ Create an account for free and try it yourself.
{% endif %}
Reusable message templates
-To send an email, text or letter with Notify, you need to create a reusable message template first.
-Templates let you send the same thing to lots of people, as often as you need to, without writing a new message each time.
+To send an email, text or letter with Notify, you need to create a reusable message template first.
+Templates let you send the same thing to lots of people, as often as you need to, without writing a new message each time.
Personalised content
-Notify makes it easy to send personalised messages from a single template.
-See how to personalise your content .
+Notify makes it easy to send personalised messages from a single template.
+See how to personalise your content .
Bulk sending
-To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.
+To send a batch of messages at once, upload a list of contact details to Notify. If you’re sending emails and text messages, you can also schedule the date and time you want them to be sent.
API integration
-You can integrate the Notify API with your web application or back-office system to send messages automatically.
-Read our API documentation for more information.
+You can integrate the Notify API with your web application or back-office system to send messages automatically.
+Read our API documentation for more information.
Reporting
-Notify’s real-time dashboard lets you see the number of messages sent. You can also check the current status of any message to see when it was delivered.
-Read more about the delivery status of your messages.
+Notify’s real-time dashboard lets you see the number of messages sent. You can also check the current status of any message to see when it was delivered.
+Read more about the delivery status of your messages.
Permissions
-Control which members of your team can see, create, edit and send messages.
-Notify lets you:
+Control which members of your team can see, create, edit and send messages.
+Notify lets you:
set different permission levels for each team member
invite team members who do not have a government email address
@@ -50,28 +50,28 @@
-Notify commits to:
+Notify commits to:
sending 95% of emails and text messages within 10 seconds
printing and posting letters by 3pm the next working day (if you send them to us before 5:30pm)
-We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.
+We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.
-Visit GOV.UK Performance to see how Notify is performing .
+Visit GOV.UK Performance to see how Notify is performing .
Security
-Notify protects and manages data to meet the needs of government services.
+Notify protects and manages data to meet the needs of government services.
Hide sensitive information
-Notify lets you redact personal information from your messages after they have been sent. This means that only the recipient can see that information.
+Notify lets you redact personal information from your messages after they have been sent. This means that only the recipient can see that information.
Two-factor authentication
-Notify uses two-factor authentication (2FA) to keep your account secure. When you sign in, we’ll send a unique one-time code to your phone and ask you to enter it before we let you use your account.
-Read more about security .
+
Notify uses two-factor authentication (2FA) to keep your account secure. When you sign in, we’ll send a unique one-time code to your phone and ask you to enter it before we let you use your account.
+Read more about security .
Support
-Notify provides 24-hour online support. If you have an emergency outside office hours, we’ll reply within 30 minutes.
-Find out more about support .
+Notify provides 24-hour online support. If you have an emergency outside office hours, we’ll reply within 30 minutes.
+Find out more about support .
{% endblock %}
diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html
index d5165844a..3bf9fc9bf 100644
--- a/app/templates/views/features/emails.html
+++ b/app/templates/views/features/emails.html
@@ -8,43 +8,43 @@
{% block content_column_content %}
Emails
- Send an unlimited number of emails for free with GOV.UK Notify.
+ Send an unlimited number of emails for free with GOV.UK Notify.
{% if not current_user.is_authenticated %}
- Create an account and try Notify for yourself.
+ Create an account and try Notify for yourself.
{% endif %}
Features
- Notify makes it easy to:
+ Notify makes it easy to:
create reusable email templates
personalise the content of your emails
send and schedule bulk messages
- You can also integrate with our API to send emails automatically.
+ You can also integrate with our API to send emails automatically.
Email branding
- Add your organisation’s logo and brand colour to email templates.
- See how to change your email branding .
+ Add your organisation’s logo and brand colour to email templates.
+ See how to change your email branding .
Send files by email
- Notify offers a safe and reliable way to send files by email.
- Upload a file using our API, then send your users an email with a link to download it.
- Notify uses encrypted links instead of email attachments because:
+ Notify offers a safe and reliable way to send files by email.
+ Upload a file using our API, then send your users an email with a link to download it.
+ Notify uses encrypted links instead of email attachments because:
they’re more secure
email attachments are often marked as spam
- Contact us if you want to send files by email.
- Read our API documentation for more information.
+ Contact us if you want to send files by email.
+ Read our API documentation for more information.
Add a reply-to address
- Notify lets you choose the email address that users reply to.
- Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.
- See how to add a reply-to address .
+ Notify lets you choose the email address that users reply to.
+ Emails with a reply-to address seem more trustworthy and are less likely to be labelled as spam.
+ See how to add a reply-to address .
Pricing
- It’s free to send emails through Notify.
- See pricing for more details.
+ It’s free to send emails through Notify.
+ See pricing for more details.
{% endblock %}
diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 675bf9b7c..0cbd704c4 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -8,42 +8,42 @@
{% block content_column_content %}
Letters
- GOV.UK Notify will print, pack and post your letters for you.
+ GOV.UK Notify will print, pack and post your letters for you.
{% if not current_user.is_authenticated %}
- Create an account and try Notify for yourself.
+ Create an account and try Notify for yourself.
{% endif %}
Features
- Notify makes it easy to:
+ Notify makes it easy to:
create reusable letter templates
personalise the content of your letter
send bulk mail
- You can also integrate with our API to send letters automatically.
+ You can also integrate with our API to send letters automatically.
Choose your postage
- Notify can send letters by first or second class post.
- First class letters are delivered one day after they’re dispatched. Second class letters are delivered 2 days after they’re dispatched.
- Letters are printed at 5:30pm and dispatched the next working day (Monday to Friday). Royal Mail delivers from Monday to Saturday, excluding bank holidays.
+ Notify can send letters by first or second class post.
+ First class letters are delivered one day after they’re dispatched. Second class letters are delivered 2 days after they’re dispatched.
+ Letters are printed at 5:30pm and dispatched the next working day (Monday to Friday). Royal Mail delivers from Monday to Saturday, excluding bank holidays.
Branding
- Add your organisation’s logo to your letter templates.
- See how to change your letter branding .
+ Add your organisation’s logo to your letter templates.
+ See how to change your letter branding .
Upload your own letters
- You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.
- Read our documentation .
+ You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.
+ Read our documentation .
Pricing
- It costs between 35p and 81p (plus VAT) to send a letter. Prices include:
+ It costs between 35p and 81p (plus VAT) to send a letter. Prices include:
paper
double-sided colour printing
C5 size envelopes with an address window
first or second class postage
- Letters can be up to 10 pages long (5 double-sided sheets of paper).
- See pricing for more details.
+ Letters can be up to 10 pages long (5 double-sided sheets of paper).
+ See pricing for more details.
{% endblock %}
diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 11c731dec..88b9bb78a 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -8,34 +8,34 @@
{% block content_column_content %}
Text messages
- Send thousands of free text messages to UK and international numbers with GOV.UK Notify.
+ Send thousands of free text messages to UK and international numbers with GOV.UK Notify.
{% if not current_user.is_authenticated %}
- Create an account and try Notify for yourself.
+ Create an account and try Notify for yourself.
{% endif %}
Features
- Notify makes it easy to:
+ Notify makes it easy to:
create reusable text message templates
personalise the content of your texts
send and schedule bulk messages
- You can also integrate with our API to send text messages automatically.
+
You can also integrate with our API to send text messages automatically.
Receive text messages
- Let people send messages to your service or reply to your texts.
- You can see and reply to the messages you receive when you sign in to Notify. If you’re using our API, you can set up your own automated processes to manage replies.
- Contact us to request a unique number for text message replies.
+ Let people send messages to your service or reply to your texts.
+ You can see and reply to the messages you receive when you sign in to Notify. If you’re using our API, you can set up your own automated processes to manage replies.
+ Contact us to request a unique number for text message replies.
Show people who your texts are from
- When you send a text message with Notify, the sender name tells people who it's from.
- See how to change the text message sender .
+ When you send a text message with Notify, the sender name tells people who it's from.
+ See how to change the text message sender .
Pricing
- Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.
- The free allowance is:
+ Each service you add has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.
+ The free allowance is:
250,000 free text messages for central government services
25,000 free text messages for other public sector services
- See pricing for more details.
+ See pricing for more details.
{% endblock %}
diff --git a/app/templates/views/find-users/user-information.html b/app/templates/views/find-users/user-information.html
index de1cabbf6..0b93d7e9f 100644
--- a/app/templates/views/find-users/user-information.html
+++ b/app/templates/views/find-users/user-information.html
@@ -11,7 +11,7 @@
{{ user.name }}
- {{ user.email_address }}
+ {{ user.email_address }}
{{ user.mobile_number or 'No mobile number'}}
Live services
@@ -49,7 +49,7 @@
{% if not user.logged_in_at %}
This person has never logged in
{% else %}
- Last logged in
+
Last logged in
{{ user.logged_in_at|format_delta }}
diff --git a/app/templates/views/forgot-password.html b/app/templates/views/forgot-password.html
index 219542730..16c90e5c1 100644
--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-password.html
@@ -13,7 +13,7 @@ Create a new password
Forgotten your password?
-
We’ll send you an email to create a new password.
+
We’ll send you an email to create a new password.
{% call form_wrapper() %}
{{ textbox(form.email_address, safe_error_message=True) }}
diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index e1ca8a6d0..e1e1dfca2 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -14,7 +14,7 @@
Check if GOV.UK Notify is right for you
- Read about our features , pricing and roadmap .
+ Read about our features , pricing and roadmap .
Check whether your organisation can use Notify .
@@ -23,42 +23,42 @@
Create an account
{% if not current_user.is_authenticated %}
- Create an account for free and add your first Notify service. When you add a new service it will start in trial mode .
+ Create an account for free and add your first Notify service. When you add a new service it will start in trial mode .
{% else %}
- Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode .
+ Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode .
{% endif %}
Write some messages
- Add message templates with examples of the content you plan to send. You can use our guidance to help you.
+ Add message templates with examples of the content you plan to send. You can use our guidance to help you.
Set up your service
{% if not current_user.is_authenticated or not current_service %}
- Review your settings to add message branding, reply-to addresses and sender information.
- Add team members and check their permissions.
+ Review your settings to add message branding, reply-to addresses and sender information.
+ Add team members and check their permissions.
{% else %}
- Review your settings to add message branding, reply-to addresses and sender information.
- Add team members and check their permissions.
+ Review your settings to add message branding, reply-to addresses and sender information.
+ Add team members and check their permissions.
{% endif %}
Set up an API integration (optional)
- You can use the Notify API to send messages automatically.
- Our documentation explains how to integrate the API with a web application or back office system.
+ You can use the Notify API to send messages automatically.
+ Our documentation explains how to integrate the API with a web application or back office system.
Start sending messages
{% if not current_user.is_authenticated or not current_service %}
- When you’re ready to send messages to people outside your team, go to the Settings page and select Request to go live . We’ll approve your request within one working day.
+ When you’re ready to send messages to people outside your team, go to the Settings page and select Request to go live . We’ll approve your request within one working day.
{% else %}
- You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.
+ You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.
{% endif %}
- Check how to pay if you’re planning to send letters or exceed the free text message allowance .
+ Check how to pay if you’re planning to send letters or exceed the free text message allowance .
diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 0d017d65d..637b72a63 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -9,7 +9,7 @@
Branding and customisation
-
This page explains how to:
+
This page explains how to:
change your email branding Change your email branding
- The default branding for email templates is the GOV.UK logo.
+ The default branding for email templates is the GOV.UK logo.
- To change your email branding:
+ To change your email branding:
Go to the Email settings section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.
@@ -31,9 +31,9 @@
Add a reply-to email address
- You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can request to go live .
+ You can choose the email address that your users reply to. You must add at least one reply-to address for your service before you can request to go live .
- To add a reply-to email address:
+ To add a reply-to email address:
Go to the Email settings section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.
@@ -43,9 +43,9 @@
Change the text message sender
- The text message sender tells your users who the message is from.
+ The text message sender tells your users who the message is from.
- To change the text message sender from the default of ‘GOVUK’:
+ To change the text message sender from the default of ‘GOVUK’:
Go to the Text message settings section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.
@@ -55,9 +55,9 @@
Change your letter branding
- Letter templates do not have default branding.
+ Letter templates do not have default branding.
- To add a logo to your letters:
+ To add a logo to your letters:
Go to the Letter settings section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.
diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
index a72f8eb64..f9f1a4b58 100644
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -9,11 +9,11 @@
Send messages
- Create an account to see a short tutorial explaining how to create and send messages.
+ Create an account to see a short tutorial explaining how to create and send messages.
Bulk sending
- To send a batch of messages at once:
+ To send a batch of messages at once:
Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page and choose an existing template.
Select Send .
diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index a97d57484..44c8d0f3d 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -9,7 +9,7 @@
Edit and format messages
- This page explains how to:
+ This page explains how to:
format your content add links You can see a list of formatting instructions on the edit template page:
+ You can see a list of formatting instructions on the edit template page:
Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.
Add a new template or choose an existing template and select Edit .
- Email templates can include:
+ Email templates can include:
headings
bullets
@@ -34,17 +34,17 @@
horizontal rules
- Letter templates can include headings and bullets.
+ Letter templates can include headings and bullets.
- Notify does not allow bold, italics, subheadings, underlined text or different fonts. This is because they can make it harder for users to read what you’ve written.
+ Notify does not allow bold, italics, subheadings, underlined text or different fonts. This is because they can make it harder for users to read what you’ve written.
Add links
- When composing an email or text message, write URLs in full and Notify will convert them into links for you.
+ When composing an email or text message, write URLs in full and Notify will convert them into links for you.
- You cannot convert text into a link. Research shows that people like to check a URL looks genuine before clicking the link in an email. This is hard to do if the URL is hidden behind clickable link text.
+ You cannot convert text into a link. Research shows that people like to check a URL looks genuine before clicking the link in an email. This is hard to do if the URL is hidden behind clickable link text.
- We do not recommend using a third-party link shortening service because:
+ We do not recommend using a third-party link shortening service because:
your users cannot see where the link will take them
@@ -54,11 +54,11 @@
Personalise your content
- To personalise the content of your messages, add a placeholder to the template.
+ To personalise the content of your messages, add a placeholder to the template.
- Placeholders are filled in with details, like a name or reference number, each time you send a message.
+ Placeholders are filled in with details, like a name or reference number, each time you send a message.
- To add a placeholder to the template:
+ To add a placeholder to the template:
Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.
@@ -67,18 +67,18 @@
Select Save .
- When you send a message you can either:
+ When you send a message you can either:
manually fill in the placeholders yourself
upload a list of personal details and let Notify do it for you
- If you upload a list, the column names need to match the placeholders in your template.
+ If you upload a list, the column names need to match the placeholders in your template.
Add optional content
- To add optional content to your emails and text messages:
+ To add optional content to your emails and text messages:
Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.
@@ -87,15 +87,15 @@
Select Save .
- For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:
+ For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:
do this yourself
upload a list of personal details and let Notify do it for you
- If you upload a list, the column names need to match the optional content in your template.
+ If you upload a list, the column names need to match the optional content in your template.
- You cannot add optional content to a letter.
+ You cannot add optional content to a letter.
{% endblock %}
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 874ccb5a7..1f3d53c3e 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -10,9 +10,9 @@
Guidance
- This guidance is for teams using GOV.UK Notify to send emails, text messages and letters.
+ This guidance is for teams using GOV.UK Notify to send emails, text messages and letters.
- It explains how to:
+ It explains how to:
edit and format messages More information
- The GOV.UK Service Manual has advice on:
+ The GOV.UK Service Manual has advice on:
planning and writing text messages and emails Send files by email
- To send a file by email, follow the instructions in our API documentation .
+ To send a file by email, follow the instructions in our API documentation .
- This is an API-only feature.
+ This is an API-only feature.
{% endblock %}
diff --git a/app/templates/views/guidance/upload-a-letter.html b/app/templates/views/guidance/upload-a-letter.html
index a451a5fa2..c68a8842b 100644
--- a/app/templates/views/guidance/upload-a-letter.html
+++ b/app/templates/views/guidance/upload-a-letter.html
@@ -9,10 +9,10 @@
Upload a letter
- Upload a one-off letter as a PDF and we’ll print, pack and post it for you.
- You can use this feature if you send a lot of one-off letters or if our reusable letter templates do not meet your needs.
+ Upload a one-off letter as a PDF and we’ll print, pack and post it for you.
+ You can use this feature if you send a lot of one-off letters or if our reusable letter templates do not meet your needs.
- To upload and send a letter from a PDF file:
+ To upload and send a letter from a PDF file:
Go to the {{ service_link(current_service, 'main.uploads', 'uploads') }} page.
@@ -22,9 +22,9 @@
Your file must meet our letter specification
- The content of your letter must appear inside the printable area.
+ The content of your letter must appear inside the printable area.
- Your file must be:
+ Your file must be:
a PDF
@@ -33,6 +33,6 @@
smaller than 2MB
- To help you set up your letter, you can download our letter specification document (PDF) .
+ To help you set up your letter, you can download our letter specification document (PDF) .
{% endblock %}
diff --git a/app/templates/views/integration-testing.html b/app/templates/views/integration-testing.html
index 950644b41..e6f4ee8aa 100644
--- a/app/templates/views/integration-testing.html
+++ b/app/templates/views/integration-testing.html
@@ -11,9 +11,9 @@
Integration testing
-
This information has moved.
+
This information has moved.
-
+
Refer to the documentation
for the client library you are using.
diff --git a/app/templates/views/letter-branding/manage-letter-branding.html b/app/templates/views/letter-branding/manage-letter-branding.html
index 918e2dc2f..98104192b 100644
--- a/app/templates/views/letter-branding/manage-letter-branding.html
+++ b/app/templates/views/letter-branding/manage-letter-branding.html
@@ -22,7 +22,7 @@
{% endif %}
-
+
Logos should be SVG files, cropped to artwork bounds and with all fonts outlined.
{{ file_upload(file_upload_form.file, button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
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 5d2c39967..3233c5d09 100644
--- a/app/templates/views/manage-users/confirm-edit-user-email.html
+++ b/app/templates/views/manage-users/confirm-edit-user-email.html
@@ -17,11 +17,11 @@
{% call form_wrapper() %}
-
New email address:
+
New email address:
-
{{ new_email }}
+
{{ new_email }}
-
We will send {{ user.name }} an email to tell them about the change.
+
We will send {{ user.name }} an email to tell them about the change.
{{ page_footer('Confirm') }}
{% endcall %}
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 e28323acd..daa9d6f10 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
@@ -17,11 +17,11 @@
{% call form_wrapper() %}
-
New mobile number:
+
New mobile number:
-
{{ new_mobile_number }}
+
{{ new_mobile_number }}
-
We will send {{ user.name }} a text message to tell them about the change.
+
We will send {{ user.name }} a text message to tell them about the change.
{{ page_footer('Confirm') }}
{% endcall %}
diff --git a/app/templates/views/manage-users/edit-user-email.html b/app/templates/views/manage-users/edit-user-email.html
index fa3c2ef53..ca2823485 100644
--- a/app/templates/views/manage-users/edit-user-email.html
+++ b/app/templates/views/manage-users/edit-user-email.html
@@ -15,7 +15,7 @@
back_link=url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id)
) }}
-
This will change the email address for {{ user.name }}.
+
This will change the email address for {{ user.name }}.
{% call form_wrapper() %}
{{ textbox(form.email_address, width='1-1', safe_error_message=True) }}
{{ page_footer('Save') }}
diff --git a/app/templates/views/manage-users/edit-user-mobile.html b/app/templates/views/manage-users/edit-user-mobile.html
index 0be5ff179..ecf661ea8 100644
--- a/app/templates/views/manage-users/edit-user-mobile.html
+++ b/app/templates/views/manage-users/edit-user-mobile.html
@@ -15,7 +15,7 @@
back_link=url_for('main.edit_user_permissions', service_id=current_service.id, user_id=user.id)
) }}
-
This will change the mobile number for {{ user.name }}.
+
This will change the mobile number for {{ user.name }}.
{% call form_wrapper(class="extra-tracking") %}
diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index b590085ba..613bcc2b1 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -9,10 +9,10 @@
Delivery status
-
Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.
-
For security , this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.
-
This page describes the statuses you’ll see when you’re signed in to Notify.
-
If you’re using the Notify API, read our documentation for a list of API statuses.
+
Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.
+
For security , this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.
+
This page describes the statuses you’ll see when you’re signed in to Notify.
+
If you’re using the Notify API, read our documentation for a list of API statuses.
Emails
@@ -38,10 +38,10 @@
Spam
-
If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.
+
If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.
Open rates and click-throughs
-
Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).
+
Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).
Text messages
@@ -91,8 +91,8 @@
Undelivered letters and returned mail
-
Every letter we send includes our printer’s address on the back of the envelope. It’s not possible to customise the return address.
-
Returned mail is destroyed by our printer.
-
Each letter has a unique ID. Our printer sends us the ID of every letter they destroy. We’ll contact you if the IDs match any of your letters. This is a partly manual process, so it can take a few weeks.
+
Every letter we send includes our printer’s address on the back of the envelope. It’s not possible to customise the return address.
+
Returned mail is destroyed by our printer.
+
Each letter has a unique ID. Our printer sends us the ID of every letter they destroy. We’ll contact you if the IDs match any of your letters. This is a partly manual process, so it can take a few weeks.
{% endblock %}
diff --git a/app/templates/views/new-password.html b/app/templates/views/new-password.html
index 2748b6e90..3733e71e5 100644
--- a/app/templates/views/new-password.html
+++ b/app/templates/views/new-password.html
@@ -15,7 +15,7 @@
Create a new password
-
+
You can now create a new password for your account.
{% call form_wrapper() %}
@@ -23,7 +23,7 @@
{{ page_footer("Continue") }}
{% endcall %}
{% else %}
-
+
Message about email address does not exist. Some one needs to figure out the words here.
{% endif %}
diff --git a/app/templates/views/notifications/invalid_precompiled_letter.html b/app/templates/views/notifications/invalid_precompiled_letter.html
index 1c2f9af63..141ccef73 100644
--- a/app/templates/views/notifications/invalid_precompiled_letter.html
+++ b/app/templates/views/notifications/invalid_precompiled_letter.html
@@ -8,7 +8,7 @@
Letter
-
+
Provided as PDF on {{ created_at|format_datetime_short }}
diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html
index 288cb7ee4..c0be0e209 100644
--- a/app/templates/views/notifications/notification.html
+++ b/app/templates/views/notifications/notification.html
@@ -15,7 +15,7 @@
message_count_label(1, template.template_type, suffix='') | capitalize,
back_link=back_link
) }}
-
+
{% if is_precompiled_letter %}
{% if created_by %}
Uploaded
@@ -58,19 +58,19 @@
{% else %}
{% if sent_with_test_key %}
{% if is_precompiled_letter %}
-
+
This letter passed our checks, but we will not print it because you used a test key.
{% else %}
-
+
We will not print this letter because you used a test key.
{% endif %}
{% else %}
-
+
{{ letter_print_day }}
-
+
Estimated delivery date: {{ estimated_letter_delivery_date|format_day_of_week }} {{ estimated_letter_delivery_date|format_date_short }}
{% endif %}
@@ -103,7 +103,7 @@
{% endif %}
{% if current_user.has_permissions('send_messages') and current_user.has_permissions('view_activity') and template.template_type == 'sms' and can_receive_inbound %}
-
+
See all text messages sent to this phone number
{% endif %}
diff --git a/app/templates/views/organisations/add-nhs-local-organisation.html b/app/templates/views/organisations/add-nhs-local-organisation.html
index 82e42fcdd..7047a4660 100644
--- a/app/templates/views/organisations/add-nhs-local-organisation.html
+++ b/app/templates/views/organisations/add-nhs-local-organisation.html
@@ -16,7 +16,7 @@
back_link=url_for('main.request_to_go_live', service_id=current_service.id)
) }}
{% call form_wrapper() %}
-
+
{{ form.organisations.label.text }}
{{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }}
diff --git a/app/templates/views/organisations/organisation/settings/edit-domains.html b/app/templates/views/organisations/organisation/settings/edit-domains.html
index bc6f54b12..dc2633258 100644
--- a/app/templates/views/organisations/organisation/settings/edit-domains.html
+++ b/app/templates/views/organisations/organisation/settings/edit-domains.html
@@ -17,7 +17,7 @@
) }}
-
+
If a user’s email addresses ends with one of these domains then
any services they create will be associated with this organisation.
diff --git a/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html b/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
index 22c915a67..c1f68567b 100644
--- a/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
+++ b/app/templates/views/organisations/organisation/settings/edit-go-live-notes.html
@@ -16,7 +16,7 @@
) }}
-
+
Text entered here will be displayed in the Zendesk ticket when a service
belonging to this organisation requests to go live.
diff --git a/app/templates/views/organisations/organisation/settings/edit-name/confirm.html b/app/templates/views/organisations/organisation/settings/edit-name/confirm.html
index bb4b4630d..45321126a 100644
--- a/app/templates/views/organisations/organisation/settings/edit-name/confirm.html
+++ b/app/templates/views/organisations/organisation/settings/edit-name/confirm.html
@@ -20,7 +20,7 @@
{% call form_wrapper() %}
{{ textbox(form.password, autocomplete='current-password') }}
-
Your organisation name will be changed from {{ current_org.name }} to {{ new_name }}
+
Your organisation name will be changed from {{ current_org.name }} to {{ new_name }}
{{ page_footer('Confirm') }}
{% endcall %}
diff --git a/app/templates/views/organisations/organisation/users/user/index.html b/app/templates/views/organisations/organisation/users/user/index.html
index a2f4a3c42..cdbf913e0 100644
--- a/app/templates/views/organisations/organisation/users/user/index.html
+++ b/app/templates/views/organisations/organisation/users/user/index.html
@@ -15,7 +15,7 @@
back_link=url_for('.manage_org_users', org_id=current_org.id)
) }}
-
+
{{ user.email_address }}
diff --git a/app/templates/views/password-reset-sent.html b/app/templates/views/password-reset-sent.html
index 15ab5b5d5..e1c8f7f2c 100644
--- a/app/templates/views/password-reset-sent.html
+++ b/app/templates/views/password-reset-sent.html
@@ -10,7 +10,7 @@ Check your email
Check your email
-
Click the link in the email to reset your password.
+
Click the link in the email to reset your password.
diff --git a/app/templates/views/platform-admin/reports.html b/app/templates/views/platform-admin/reports.html
index 000ed1580..999f418b8 100644
--- a/app/templates/views/platform-admin/reports.html
+++ b/app/templates/views/platform-admin/reports.html
@@ -10,18 +10,18 @@
Reports
-
+
Download live services csv report
-
+
Download performance platform report (.xlsx)
-
+
-
+
Monthly notification statuses for live services
-
-
+
+
Usage for all services
{% endblock %}
diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html
index a3bf6bd19..f0569670a 100644
--- a/app/templates/views/pricing/how-to-pay.html
+++ b/app/templates/views/pricing/how-to-pay.html
@@ -13,7 +13,7 @@
Invoices
-
+
We’ll send your organisation an invoice each quarter if you:
@@ -22,15 +22,15 @@
send letters
-
+
If your organisation has more than one service, you'll see a breakdown of each service on your invoice.
-
+
If the value of an invoice is less than £250 (before VAT ), we’ll add it to the total for the next quarter to save time and effort.
-
+
You can pay by BACS, debit card, or credit card.
@@ -38,19 +38,19 @@
Purchase orders
-
+
If your organisation’s estimated spend is more than £500 per quarter (before VAT ), you need to send us a purchase order (PO).
-
+
Your organisation should raise a single PO for the estimated cost of all its services. You can update the PO anytime if your usage increases.
-
+
You may need to set up the Cabinet Office as a supplier before you can raise a PO .
-
+
Contact us if you need help raising a purchase order.
diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index 1eecf08c1..5db0cc6ab 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -11,14 +11,14 @@
{% block content_column_content %}
Pricing
-
To use GOV.UK Notify, there’s:
+
To use GOV.UK Notify, there’s:
no monthly charge
no setup fee
no procurement cost
-
+
{% if not current_user.is_authenticated %}
Create an account then add as many different services as you need to.
{% else %}
@@ -26,24 +26,24 @@
{% endif %}
-
When you add a new service it will start in trial mode .
+
When you add a new service it will start in trial mode .
Emails
-
It’s free to send emails through Notify.
+
It’s free to send emails through Notify.
Text messages
-
Every service you add has an annual allowance of free text messages.
-
If your organisation has more than one service on Notify, they each have a separate allowance.
-
The allowance is:
+
Every service you add has an annual allowance of free text messages.
+
If your organisation has more than one service on Notify, they each have a separate allowance.
+
The allowance is:
250,000 free text messages for central government services
25,000 free text messages for other public sector services
-
It costs 1.58 pence (plus VAT) for each text message you send after you've used your free allowance.
-
See how to pay .
+
It costs 1.58 pence (plus VAT) for each text message you send after you've used your free allowance.
+
See how to pay .
Long text messages
-
If a text message is longer than 160 characters (including spaces), it’ll be charged as more than one message:
+
If a text message is longer than 160 characters (including spaces), it’ll be charged as more than one message:
{% call mapping_table(
caption='Text message pricing',
@@ -67,9 +67,9 @@
{% endcall %}
Accents and accented characters
-
Some languages, such as Welsh, use accented characters.
-
Text messages containing the following accented characters are charged at the normal rate: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö, ù, ü.
-
Using other accented characters can increase the cost of sending text messages.
+
Some languages, such as Welsh, use accented characters.
+
Text messages containing the following accented characters are charged at the normal rate: Ä, É, Ö, Ü, à, ä, é, è, ì, ò, ö, ù, ü.
+
Using other accented characters can increase the cost of sending text messages.
{% set accentedChars %}
{% call mapping_table(
@@ -159,7 +159,7 @@
Sending text messages to international numbers
-
It might cost more to send text messages to international numbers than UK ones, depending on the country.
+
It might cost more to send text messages to international numbers than UK ones, depending on the country.
{% set smsIntRates %}
{{ live_search(target_selector='#international-pricing .table-row', show=True, form=search_form, label='Search by country name or code') }}
@@ -191,7 +191,7 @@
}) }}
Letters
-
The cost of sending a letter depends on the postage you choose and how many sheets of paper you need.
+
The cost of sending a letter depends on the postage you choose and how many sheets of paper you need.
{% call mapping_table(
@@ -216,9 +216,9 @@
{% endcall %}
-
These prices were updated on 1 October 2019.
+
These prices were updated on 1 October 2019.
-
Prices include:
+
Prices include:
paper
double-sided colour printing
diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html
index c7d2337c6..86c5581f9 100644
--- a/app/templates/views/privacy.html
+++ b/app/templates/views/privacy.html
@@ -10,25 +10,25 @@
Privacy notice: how we use your data
-
Last update: 5 March 2019
+
Last update: 5 March 2019
Who we are
-
GOV.UK Notify is a service that lets public service teams in the UK send emails, text messages, and letters
+
GOV.UK Notify is a service that lets public service teams in the UK send emails, text messages, and letters
to users of their service.
-
GOV.UK Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.
+
GOV.UK Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.
-
Organisations sending notifications using GOV.UK Notify are the data controller and Cabinet Office is the data processor. The data controller must tell you about what they are doing with your personal data.
+
Organisations sending notifications using GOV.UK Notify are the data controller and Cabinet Office is the data processor. The data controller must tell you about what they are doing with your personal data.
-
For the credentials used to access GOV.UK Notify, Cabinet Office is the data controller.
+
For the credentials used to access GOV.UK Notify, Cabinet Office is the data controller.
-
For more information see the Information Commissioner’s Office (ICO) Data Protection Public Register .
+
For more information see the Information Commissioner’s Office (ICO) Data Protection Public Register .
The Cabinet Office registration number is: Z7414053
What data we collect from you
-
The personal data we collect from public sector employees that create a GOV.UK Notify account will include:
+
The personal data we collect from public sector employees that create a GOV.UK Notify account will include:
Your name
@@ -37,54 +37,54 @@
The IP address you use to access GOV.UK Notify
-
The legal basis for processing this data is public task – allowing you to access GOV.UK Notify to send notifications
+
The legal basis for processing this data is public task – allowing you to access GOV.UK Notify to send notifications
to users of your public service.
Why we need your data
-
We require your personal data to ensure only legitimate users of GOV.UK Notify can use it to send notifications.
+
We require your personal data to ensure only legitimate users of GOV.UK Notify can use it to send notifications.
What we do with your data
-
We use your data to check that you are allowed to access GOV.UK Notify and to record your activity when using it.
+
We use your data to check that you are allowed to access GOV.UK Notify and to record your activity when using it.
-
We will not:
+
We will not:
sell or rent your data to third parties
share your data with third parties for marketing purposes
-
We will share your data if we are required to do so by law – for example, by court order, or to prevent fraud or other crime.
+
We will share your data if we are required to do so by law – for example, by court order, or to prevent fraud or other crime.
How long we keep your data
-
We will retain your personal data for as long as you have a GOV.UK Notify account.
+
We will retain your personal data for as long as you have a GOV.UK Notify account.
Where your data is processed and stored
-
We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s
+
We design, build and run our systems to make sure that your data is as safe as possible at any stage, both while it’s
processed and when it’s stored.
-
Your personal data will not be transferred outside of the European Economic Area (EEA) throughout the course of its
+
Your personal data will not be transferred outside of the European Economic Area (EEA) throughout the course of its
processing at GDS or any third party suppliers.
How we protect your data and keep it secure
-
We are committed to doing all that we can to keep your data secure. To prevent unauthorised access or disclosure we have
+
We are committed to doing all that we can to keep your data secure. To prevent unauthorised access or disclosure we have
put in place technical and organisational procedures to secure the data we collect about you – for example, we protect your
data using varying levels of encryption. We also make sure that any third parties that we deal with have an obligation to
keep all personal data they process on our behalf secure.
Children’s privacy protection
-
We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally
+
We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally
targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone
under the age of 13.
What are your rights
-
You have the right to request:
+
You have the right to request:
information about how your personal data is processed
@@ -92,7 +92,7 @@
that anything inaccurate in your personal data is corrected immediately
-
You can also:
+
You can also:
raise an objection about how your personal data is processed
@@ -100,34 +100,34 @@
ask that the processing of your personal data is restricted in certain circumstances
-
If you have any of these requests, get in contact with our Data Protection Officer - you can find their contact details below.
+
If you have any of these requests, get in contact with our Data Protection Officer - you can find their contact details below.
Changes to this notice
-
We may modify or amend this privacy notice at our discretion at any time. When we make changes to this notice, we will
+
We may modify or amend this privacy notice at our discretion at any time. When we make changes to this notice, we will
amend the last modified date at the top of this page. Any modification or amendment to this privacy notice will be applied
to you and your data as of that revision date. We encourage you to periodically review this privacy notice to be informed
about how we are protecting your data.
Questions and complaints
-
Contact the GDS Privacy Team if you either:
+
Contact the GDS Privacy Team if you either:
have any questions about anything in this document
think that your personal data has been misused or mishandled
-
+
GDS Privacy Teamgds-privacy-office@digital.cabinet-office.gov.uk
-
+
You can also contact the Cabinet Office Data Protection Officer.
-
+
Data Protection OfficerDPO@cabinetoffice.gov.uk
-
If you have a complaint, you can also contact the Information Commissioner's Office (ICO). The ICO is an independent regulator set up to uphold information rights.
+
If you have a complaint, you can also contact the Information Commissioner's Office (ICO). The ICO is an independent regulator set up to uphold information rights.
-
+
Information Commissioner’s Officecasework@ico.org.uk
Update provider:
+
Update provider:
We only send from the highest priority provider
diff --git a/app/templates/views/re-validate-email-sent.html b/app/templates/views/re-validate-email-sent.html
index 89d70e33b..af74486d0 100644
--- a/app/templates/views/re-validate-email-sent.html
+++ b/app/templates/views/re-validate-email-sent.html
@@ -10,8 +10,8 @@
{{ title }}
-
For security, we need to check if you still have access to your email address.
-
We’ve sent you a link to sign in to Notify. The link will open in a new browser window, so you can close this one.
+
For security, we need to check if you still have access to your email address.
+
We’ve sent you a link to sign in to Notify. The link will open in a new browser window, so you can close this one.
{{ page_footer(
secondary_link=url_for('main.email_not_received'),
diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html
index deadda544..65afb6edd 100644
--- a/app/templates/views/register-from-invite.html
+++ b/app/templates/views/register-from-invite.html
@@ -12,7 +12,7 @@ Create an account
Create an account
-
+
Your account will be created with this email address:
{{invited_user.email_address}}
diff --git a/app/templates/views/register-from-org-invite.html b/app/templates/views/register-from-org-invite.html
index a7c9bce8d..b05fcbc2f 100644
--- a/app/templates/views/register-from-org-invite.html
+++ b/app/templates/views/register-from-org-invite.html
@@ -12,7 +12,7 @@ Create an account
Create an account
-
Your account will be created with this email: {{invited_org_user.email_address}}
+
Your account will be created with this email: {{invited_org_user.email_address}}
{% call form_wrapper() %}
{{ textbox(form.name, width='3-4') }}
-
+
Upload a list of {{ recipient_count_label(999, template.template_type) }}
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index e6db812db..26ea1c80d 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -43,7 +43,7 @@
{% endif %}
{% if link_to_upload %}
-
+
{% endif %}
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index d2cebc449..3b6a6cc7e 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -249,7 +249,7 @@
{% if current_service.trial_mode %}
Your service is in trial mode
-
You can only:
+
You can only:
send {{ current_service.message_limit }} text messages and emails per day
@@ -257,24 +257,24 @@
create letter templates, but not send them
-
+
{% if current_user.has_permissions('manage_service') %}
To remove these restrictions, you can send us a
request to go live .
{% else %}
Your service manager can ask to have these restrictions removed.
{% endif %}
-
+
{% else %}
Your service is live
-
+
You can send up to
{{ "{:,}".format(current_service.message_limit) }} messages
per day.
-
+
Problems or comments?
Give feedback .
@@ -386,7 +386,7 @@
{% endif %}
{% if (not current_service.active) and current_user.platform_admin %}
-
+
Service suspended
diff --git a/app/templates/views/service-settings/branding/branding-options.html b/app/templates/views/service-settings/branding/branding-options.html
index d7b3cb68f..32654195f 100644
--- a/app/templates/views/service-settings/branding/branding-options.html
+++ b/app/templates/views/service-settings/branding/branding-options.html
@@ -17,12 +17,12 @@
back_link=url_for('.view_template', service_id=current_service.id, template_id=from_template) if from_template else url_for('.service_settings', service_id=current_service.id)
) }}
-
+
Your {{ branding_type }}s currently have {{ branding_name }} branding.
{% if current_service.needs_to_change_email_branding and branding_type == "email" %}
-
+
You should be using your own branding instead. We can help you to set this up.
{% endif %}
diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html
index 04122b683..016e6cc4d 100644
--- a/app/templates/views/service-settings/delete.html
+++ b/app/templates/views/service-settings/delete.html
@@ -15,7 +15,7 @@
Delete this service from GOV.UK Notify
-
+
This cannot be undone. You will lose:
diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html
index a6cc0d476..b86f1bf6f 100644
--- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html
+++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html
@@ -7,14 +7,14 @@
{% if verification_status == "pending" %}
-
+
We’re checking that ‘{{ reply_to_email_address }}’ is a real email address.
-
- This can take a minute
+
+ This can take a minute
-
+
Refresh
{% elif verification_status == "success" %}
@@ -32,10 +32,10 @@
There’s a problem with your reply-to address
-
+
We sent an email to ‘{{ reply_to_email_address }}’ but it could not be delivered.
-
+
You can try again, or use a different address.
{% endcall %}
diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index 6bd83a11f..67a929840 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -52,10 +52,10 @@
{% endif %}
-
+
You need to add at least one reply-to address so recipients can reply to your messages.
-
+
Emails with a reply-to address:
diff --git a/app/templates/views/service-settings/letter-contact-details.html b/app/templates/views/service-settings/letter-contact-details.html
index be5831ba5..08f32436b 100644
--- a/app/templates/views/service-settings/letter-contact-details.html
+++ b/app/templates/views/service-settings/letter-contact-details.html
@@ -31,7 +31,7 @@
{% for item in letter_contact_details %}
-
+
{{ item.contact_block | nl2br }}
diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html
index a10f3deff..bec0c936a 100644
--- a/app/templates/views/service-settings/name.html
+++ b/app/templates/views/service-settings/name.html
@@ -18,13 +18,13 @@
diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html
index 3b28fb680..ee0aab71b 100644
--- a/app/templates/views/service-settings/request-to-go-live.html
+++ b/app/templates/views/service-settings/request-to-go-live.html
@@ -57,15 +57,15 @@
{% endif %}
{% endcall %}
{% if not current_user.is_gov_user %}
-
+
Only team members with a government email address can request to go live.
{% elif (not current_service.go_live_checklist_completed) or (current_service.able_to_accept_agreement and not current_service.organisation.agreement_signed) %}
-
+
You must complete these steps before you can request to go live.
{% else %}
-
+
When we receive your request we’ll get back to you within one working day.
diff --git a/app/templates/views/service-settings/send-files-by-email.html b/app/templates/views/service-settings/send-files-by-email.html
index ca90dc03d..34b6c9cea 100644
--- a/app/templates/views/service-settings/send-files-by-email.html
+++ b/app/templates/views/service-settings/send-files-by-email.html
@@ -17,14 +17,14 @@
'Send files by email',
back_link=url_for('main.service_settings', service_id=current_service.id)
) }}
-
+
This is an API-only feature.
-
-
+
+
To send a file by email, follow the instructions in our API documentation .
{% if contact_details %}Change contact details for{% else %}Add contact details to{% endif %} the file download page
-
+
You need to include contact details for your service so your users can get in touch if there’s a problem. For example, if the link to download the file you sent them has expired.
{% call form_wrapper() %}
diff --git a/app/templates/views/service-settings/set-auth-type.html b/app/templates/views/service-settings/set-auth-type.html
index de532137d..d3824e1c3 100644
--- a/app/templates/views/service-settings/set-auth-type.html
+++ b/app/templates/views/service-settings/set-auth-type.html
@@ -19,21 +19,21 @@
Email link or text message code
-
+
Your team members can sign in with either a text message code
or an email link.
-
+
You can set the sign-in method for individual team members .
{% else %}
Text message code
-
+
Your team members sign in with a text message code.
-
+
Contact us if signing in with a text message is a problem for your team.
{% endif %}
diff --git a/app/templates/views/service-settings/set-email.html b/app/templates/views/service-settings/set-email.html
index 988c417a9..636e616f1 100644
--- a/app/templates/views/service-settings/set-email.html
+++ b/app/templates/views/service-settings/set-email.html
@@ -16,7 +16,7 @@
'Send emails',
back_link=url_for('main.service_settings', service_id=current_service.id)
) }}
-
+
It’s free to send emails through GOV.UK Notify.
{% call form_wrapper() %}
diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html
index 12c98bbcd..7a30ab0f3 100644
--- a/app/templates/views/service-settings/set-inbound-number.html
+++ b/app/templates/views/service-settings/set-inbound-number.html
@@ -15,9 +15,9 @@
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
{% if current_service.has_inbound_number %}
-
This service already has an inbound number
+
This service already has an inbound number
{% elif no_available_numbers %}
-
No available inbound numbers
+
No available inbound numbers
{% else %}
{% call form_wrapper() %}
{{ radios(form.inbound_number) }}
diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html
index 112c8f683..d11ad9b1b 100644
--- a/app/templates/views/service-settings/set-inbound-sms.html
+++ b/app/templates/views/service-settings/set-inbound-sms.html
@@ -16,38 +16,38 @@
back_link=url_for('main.service_settings', service_id=current_service.id)
) }}
{% if 'inbound_sms' in current_service.permissions %}
-
+
Your service can receive text messages sent to {{ current_service.inbound_number }}.
-
+
You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages.
-
+
Contact us if you want to switch this feature off.
{% if current_user.has_permissions('manage_api_keys') %}
-
+
You can set up callbacks for received text messages on the
API integration page .
{% endif %}
{% else %}
-
+
Contact us if you want to be able to receive text messages from your users.
-
+
We’ll create a unique phone number for your service that they can reply to.
-
+
Text messages you send will come from this phone number instead of your sender name (currently {{ current_service.default_sms_sender }}).
-
+
You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages.
-
+
You can see and reply to the messages you receive when you sign in to Notify, or get them using the API.
-
+
It does not cost you anything to receive text messages. Users will pay their standard text message rate.
{% endif %}
diff --git a/app/templates/views/service-settings/set-international-sms.html b/app/templates/views/service-settings/set-international-sms.html
index 460bb97b7..e60a1e91e 100644
--- a/app/templates/views/service-settings/set-international-sms.html
+++ b/app/templates/views/service-settings/set-international-sms.html
@@ -16,10 +16,10 @@
'Send international text messages',
back_link=url_for('main.service_settings', service_id=current_service.id)
) }}
-
+
Messages to international mobile numbers are charged at 1, 2, or
3 times the cost of messages to UK mobile numbers.
-
+
See pricing for the list
of rates.
diff --git a/app/templates/views/service-settings/set-letter.html b/app/templates/views/service-settings/set-letter.html
index d5beffc9b..704e3c7a6 100644
--- a/app/templates/views/service-settings/set-letter.html
+++ b/app/templates/views/service-settings/set-letter.html
@@ -16,10 +16,10 @@
'Send letters',
back_link=url_for('main.service_settings', service_id=current_service.id)
) }}
-
+
It costs between 35p and 81p to send a letter using Notify.
-
+
See pricing for the list
of rates.
diff --git a/app/templates/views/service-settings/set-reply-to-email.html b/app/templates/views/service-settings/set-reply-to-email.html
index 1719be7b6..b845daa82 100644
--- a/app/templates/views/service-settings/set-reply-to-email.html
+++ b/app/templates/views/service-settings/set-reply-to-email.html
@@ -15,18 +15,18 @@
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
-
+
Your emails will be sent from
{{ current_service.email_from }}@notifications.service.gov.uk.
This is so they have the best chance of being delivered.
This email address cannot receive replies.
-
+
Set up a separate email address to receive replies from
your users, then enter it here.
{% if current_service.trial_mode %}
-
+
Your service cannot go live until you’ve done this.
{% endif %}
diff --git a/app/templates/views/service-settings/set-sms.html b/app/templates/views/service-settings/set-sms.html
index 00606c6bd..1c9a82e66 100644
--- a/app/templates/views/service-settings/set-sms.html
+++ b/app/templates/views/service-settings/set-sms.html
@@ -16,16 +16,16 @@
'Send text messages',
back_link=url_for('main.service_settings', service_id=current_service.id)
) }}
-
+
You have a free allowance of
{{ '{:,}'.format(current_service.free_sms_fragment_limit) }} text messages each
financial year.
-
+
It costs 1.58 pence (plus VAT) for each text message you send
after your free allowance.
-
+
See pricing for more details.
{% call form_wrapper() %}
diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html
index 3e3d543de..fa98466c7 100644
--- a/app/templates/views/service-settings/sms-sender/edit.html
+++ b/app/templates/views/service-settings/sms-sender/edit.html
@@ -18,7 +18,7 @@
) }}
{% call form_wrapper() %}
{% if inbound_number %}
-
+
{{ sms_sender.sms_sender }}
This phone number receives replies and cannot be changed
diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html
index 5c71309cd..759311d93 100644
--- a/app/templates/views/service-settings/sms-senders.html
+++ b/app/templates/views/service-settings/sms-senders.html
@@ -53,7 +53,7 @@
{% endif %}
-
+
The text message sender tells your users who the message is from.
{% endblock %}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 2af85bbd9..56794cef6 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -28,7 +28,7 @@
Send emails, text messages and letters to your users
-
+
Try GOV.UK Notify now if you work in central government, a local authority, or the NHS.
@@ -175,11 +175,11 @@
The team
-
+
GOV.UK Notify is built by the Government Digital Service
and is supported 24 hours a day, 7 days a week.
-
+
Contact us if you have a question or want
to give feedback.
diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index bfeeadcea..6745823f9 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -15,17 +15,17 @@
{% if again %}
You need to sign in again
{% if other_device %}
-
+
We signed you out because you logged in to Notify on another device.
{% else %}
-
+
We signed you out because you have not used Notify for a while.
{% endif %}
{% else %}
Sign in
-
+
If you do not have an account, you can
create one now .
diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html
index b037610b7..9b19d8b22 100644
--- a/app/templates/views/styleguide.html
+++ b/app/templates/views/styleguide.html
@@ -19,14 +19,14 @@
www.notify.works/_styleguide
-
+
View source
Banner
-
Used to show the status of a thing or action.
+
Used to show the status of a thing or action.
{{ banner("You sent 1,234 text messages", with_tick=True) }}
@@ -40,7 +40,7 @@
Big number
-
Used to show some important statistics.
+
Used to show some important statistics.
@@ -53,7 +53,7 @@
Browse list
-
Used to navigate to child pages.
+
Used to navigate to child pages.
{{ browse_list([
{
@@ -75,14 +75,14 @@
Page footer
-
+
Used to submit forms and optionally provide a link to go back to the
previous page.
-
+
Must be used inside a form.
-
+
Adds a hidden CSRF token to the page.
@@ -111,7 +111,7 @@
Tables
-
+
Used for comparing rows of data.
{% call mapping_table(
@@ -194,19 +194,19 @@
Formatted list
-
+
{{ 'A' | formatted_list(prefix="one item called") }}
-
+
{{ 'AB' | formatted_list(prefix_plural="two items called") }}
-
+
{{ 'ABC' | formatted_list }}
-
+
{{ 'ABCD' | formatted_list(before_each='', after_each=' ', conjunction='or') }}
diff --git a/app/templates/views/support/bat-phone.html b/app/templates/views/support/bat-phone.html
index 41408a6d6..73be70eaf 100644
--- a/app/templates/views/support/bat-phone.html
+++ b/app/templates/views/support/bat-phone.html
@@ -15,21 +15,21 @@
)}}
-
+
First, check the
system status page .
You do not need to contact us if
the problem you’re having is listed on that page.
-
+
Otherwise, contact us using the emergency email address we
gave you or your service manager when we made your service live.
-
+
We’ll reply within 30 minutes and give you hourly updates
until the problem’s fixed.
-
+
We do not offer out of hours support if your service is in
trial mode.
diff --git a/app/templates/views/support/form.html b/app/templates/views/support/form.html
index bf5e2c36a..4c4098d6b 100644
--- a/app/templates/views/support/form.html
+++ b/app/templates/views/support/form.html
@@ -19,7 +19,7 @@
{% if show_status_page_banner %}
-
+
Check our system status
page to see if there are any known issues with GOV.UK Notify.
@@ -31,7 +31,7 @@
{{ textbox(form.name, width='1-1') }}
{{ textbox(form.email_address, width='1-1') }}
{% else %}
-
We’ll reply to {{ current_user.email_address }}
+
We’ll reply to {{ current_user.email_address }}
{% endif %}
{{ sticky_page_footer('Send') }}
{% endcall %}
diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html
index 09dd8caba..25400bc52 100644
--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -10,7 +10,7 @@
{% block maincolumn_content %}
Support
-
We provide 24-hour online support for teams with a live service on GOV.UK Notify.
+
We provide 24-hour online support for teams with a live service on GOV.UK Notify.
{% call form_wrapper() %}
{% if current_user.is_authenticated %}
@@ -24,19 +24,19 @@
{{ page_footer('Continue') }}
{% endcall %}
-
You can also contact us on Slack .
+
You can also contact us on Slack .
Office hours
-
Our office hours are 9:30am to 5:30pm, Monday to Friday.
-
When you report a problem in office hours, we’ll aim to read it within 30 minutes and reply within one working day.
+
Our office hours are 9:30am to 5:30pm, Monday to Friday.
+
When you report a problem in office hours, we’ll aim to read it within 30 minutes and reply within one working day.
Out-of-hours
-
Outside office hours, response times depend on whether you’re reporting an emergency.
-
If it’s an emergency, we’ll reply within 30 minutes and update you every hour until the problem’s fixed.
-
If your problem is not an emergency, we’ll reply within one working day.
-
A problem is only classed as an emergency if:
+
Outside office hours, response times depend on whether you’re reporting an emergency.
+
If it’s an emergency, we’ll reply within 30 minutes and update you every hour until the problem’s fixed.
+
If your problem is not an emergency, we’ll reply within one working day.
+
A problem is only classed as an emergency if:
nobody on your team can sign in
a ‘technical difficulties’ error appears when you try to upload a file
diff --git a/app/templates/views/support/thanks.html b/app/templates/views/support/thanks.html
index 09b30a920..aa3b31258 100644
--- a/app/templates/views/support/thanks.html
+++ b/app/templates/views/support/thanks.html
@@ -13,7 +13,7 @@
'Thanks for contacting us',
back_link=url_for('.support')
) }}
-
+
{% if out_of_hours_emergency %}
We’ll reply in the next 30 minutes.
{% else %}
diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html
index 2496f204e..711d41154 100644
--- a/app/templates/views/templates/action_blocked.html
+++ b/app/templates/views/templates/action_blocked.html
@@ -16,10 +16,10 @@
'{} are disabled'.format(notification_type.capitalize()),
back_link=back_link,
) }}
-
+
Sending {{ message_count_label(999, notification_type, suffix='') -}} has been disabled for your service.
-
+
If you need to send {{ message_count_label(999, notification_type, suffix='') }}
get in touch with the GOV.UK Notify team .
diff --git a/app/templates/views/templates/breaking-change.html b/app/templates/views/templates/breaking-change.html
index c954ae1aa..fa7b53bc5 100644
--- a/app/templates/views/templates/breaking-change.html
+++ b/app/templates/views/templates/breaking-change.html
@@ -18,14 +18,14 @@
{% if template_change.placeholders_removed %}
-
+
You removed {{ list_of_placeholders(template_change.placeholders_removed) }}
{% endif %}
-
+
You added {{ list_of_placeholders(template_change.placeholders_added) }}
-
+
Before you send any messages, make sure your API calls include {{ list_of_code_snippets(template_change.placeholders_added) }}.
diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html
index df64e9b98..e89f74729 100644
--- a/app/templates/views/templates/choose-reply.html
+++ b/app/templates/views/templates/choose-reply.html
@@ -27,7 +27,7 @@
"href": url_for('.choose_template', service_id=current_service.id, initial_state='add-new-template')
}) }}
{% else %}
-
+
You need to ask your service manager to add templates before you
can send text messages.
diff --git a/app/templates/views/templates/choose_history.html b/app/templates/views/templates/choose_history.html
index 7ef3e5b26..cceabca99 100644
--- a/app/templates/views/templates/choose_history.html
+++ b/app/templates/views/templates/choose_history.html
@@ -13,7 +13,7 @@
{% endwith %}
{% endfor %}
-
+
Back to current templates
{% endblock %}
diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html
index b345143e9..bbd6447fc 100644
--- a/app/templates/views/terms-of-use.html
+++ b/app/templates/views/terms-of-use.html
@@ -9,12 +9,12 @@
Terms of use
-
+
These terms apply to your service’s use of GOV.UK Notify. You must be the service manager to accept them.
When using Notify
- You must:
+ You must:
complete your organisation’s information assurance process (you do not need to include Notify or our delivery partners, we’ve already done that)
tell us immediately if you have any security breaches
@@ -26,9 +26,9 @@
not send messages containing any personally or commercially sensitive information
check that the data you add to Notify is accurate and complies with data protection legislation
- If you do not keep to these terms, we might have to stop sending your messages.
+ If you do not keep to these terms, we might have to stop sending your messages.
- Notify will:
+ Notify will:
send all the messages you pass to us, as long as they meet our guidelines
@@ -39,7 +39,7 @@
Leaving Notify
- You can leave Notify at any time. Just contact us and we’ll close your account.
- When you leave Notify, all your data will be deleted.
+ You can leave Notify at any time. Just contact us and we’ll close your account.
+ When you leave Notify, all your data will be deleted.
{% endblock %}
diff --git a/app/templates/views/text-not-received.html b/app/templates/views/text-not-received.html
index 10e7d9faa..6f33e198d 100644
--- a/app/templates/views/text-not-received.html
+++ b/app/templates/views/text-not-received.html
@@ -13,7 +13,7 @@ Check your mobile number
Check your mobile number
-
Check your mobile phone number is correct and then resend the security code.
+
Check your mobile phone number is correct and then resend the security code.
{% call form_wrapper() %}
{{ textbox(form.mobile_number) }}
diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html
index 4a83f3ebd..fa942a0c2 100644
--- a/app/templates/views/trial-mode.html
+++ b/app/templates/views/trial-mode.html
@@ -8,8 +8,8 @@
Trial mode
-
When you add a new service it will start in trial mode. This lets you try out GOV.UK Notify, with a few restrictions.
-
While your service is in trial mode you can only:
+
When you add a new service it will start in trial mode. This lets you try out GOV.UK Notify, with a few restrictions.
+
While your service is in trial mode you can only:
send 50 text messages and emails per day
send messages to yourself and other people in your team
@@ -17,10 +17,10 @@
{% if current_service and current_service.trial_mode %}
-
+
To remove these restrictions, you can request to go live .
{% else %}
-
+
To remove these restrictions:
@@ -29,11 +29,11 @@
Select Request to go live .
{% endif %}
-
+
When we receive your request we’ll get back to you within one working day.
Before you request to go live
-
You must:
+
You must:
add examples of the messages you want to send
update your settings so you’re ready to send and receive messages
diff --git a/app/templates/views/two-factor-email.html b/app/templates/views/two-factor-email.html
index 7fd935b66..82e2c749e 100644
--- a/app/templates/views/two-factor-email.html
+++ b/app/templates/views/two-factor-email.html
@@ -10,8 +10,8 @@
{{ title }}
-
We’ve emailed you a link to sign in to Notify.
-
Clicking the link will open Notify in a new browser window, so you can close this one.
+
We’ve emailed you a link to sign in to Notify.
+
Clicking the link will open Notify in a new browser window, so you can close this one.
{{ page_footer(
secondary_link=url_for('main.email_not_received'),
secondary_link_text='Not received an email?'
diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html
index 439e1ee1f..3980f2840 100644
--- a/app/templates/views/two-factor.html
+++ b/app/templates/views/two-factor.html
@@ -14,7 +14,7 @@
Check your phone
-
We’ve sent you a text message with a security code.
+
We’ve sent you a text message with a security code.
{% call form_wrapper(class="extra-tracking") %}
{{ textbox(
diff --git a/app/templates/views/uploads/choose-file.html b/app/templates/views/uploads/choose-file.html
index dad4cc0d7..a27e50685 100644
--- a/app/templates/views/uploads/choose-file.html
+++ b/app/templates/views/uploads/choose-file.html
@@ -14,7 +14,7 @@
{% call banner_wrapper(type='dangerous') %}
{{ error.title }}
{% if error.detail %}
-
{{ error.detail | safe }}
+
{{ error.detail | safe }}
{% endif %}
{% endcall %}
{% else %}
@@ -22,11 +22,11 @@
'Upload a letter',
back_link=url_for('main.uploads', service_id=current_service.id)
) }}
-
Upload a single letter as a PDF and we’ll print, pack and post it for you.
-
You can use this feature if you send a lot of one-off letters or if our reusable letter templates do not meet your needs.
+
Upload a single letter as a PDF and we’ll print, pack and post it for you.
+
You can use this feature if you send a lot of one-off letters or if our reusable letter templates do not meet your needs.
{% endif %}
-
+
{{ file_upload(
form.file,
action=url_for('main.upload_letter', service_id=current_service.id),
@@ -37,9 +37,9 @@
Your file must meet our letter specification
-
The content of your letter must appear inside the printable area.
+
The content of your letter must appear inside the printable area.
-
Your file must be:
+
Your file must be:
a PDF
@@ -48,7 +48,7 @@
smaller than 2MB
-
To help you set up your letter, you can download our letter specification document (PDF) .
+
To help you set up your letter, you can download our letter specification document (PDF) .
{% endblock %}
diff --git a/app/templates/views/uploads/contact-list/column-errors.html b/app/templates/views/uploads/contact-list/column-errors.html
index 34dd9b13e..99f5354a1 100644
--- a/app/templates/views/uploads/contact-list/column-errors.html
+++ b/app/templates/views/uploads/contact-list/column-errors.html
@@ -29,7 +29,7 @@
Your file has too many rows
-
+
Notify can store files up to
{{ "{:,}".format(recipients.max_rows) }} rows in size. Your
file has {{ "{:,}".format(recipients|length) }} rows.
@@ -42,7 +42,7 @@
{{ 'this' if recipients|length == 1 else 'these' }}
{{ recipient_count_label(recipients|length, recipients.template_type) }}
-
+
In trial mode you can only
send to yourself and members of your team
diff --git a/app/templates/views/uploads/contact-list/row-errors.html b/app/templates/views/uploads/contact-list/row-errors.html
index c164a5ad1..6480e00c8 100644
--- a/app/templates/views/uploads/contact-list/row-errors.html
+++ b/app/templates/views/uploads/contact-list/row-errors.html
@@ -27,14 +27,14 @@
There’s a problem with {{ original_file_name }}
-
+
You need to {{ row_errors[0] }}.
{% else %}
There are some problems with {{ original_file_name }}
-
+
You need to:
diff --git a/app/templates/views/uploads/contact-list/too-many-columns.html b/app/templates/views/uploads/contact-list/too-many-columns.html
index 41ea59a86..c9f64e2a7 100644
--- a/app/templates/views/uploads/contact-list/too-many-columns.html
+++ b/app/templates/views/uploads/contact-list/too-many-columns.html
@@ -29,7 +29,7 @@
Your file is missing some rows
-
+
It needs at least one row of data
{%- if template_type %}.{% else %}, in a column called ‘email address’ or ‘phone number’.{% endif %}
@@ -39,7 +39,7 @@
Your file needs a column called ‘email address’ or ‘phone number’.
-
+
Right now it has 1 column called ‘{{ recipients._raw_column_headers[0] }}’.
@@ -48,10 +48,10 @@
Your file has too many columns
-
+
It needs to have 1 column, called ‘email address’ or ‘phone number’.
-
+
Right now it has {{ recipients._raw_column_headers|length }} columns called {{ recipients._raw_column_headers | formatted_list }}.
diff --git a/app/templates/views/uploads/contact-list/upload.html b/app/templates/views/uploads/contact-list/upload.html
index 265b366b5..8ca7b374e 100644
--- a/app/templates/views/uploads/contact-list/upload.html
+++ b/app/templates/views/uploads/contact-list/upload.html
@@ -13,7 +13,7 @@
{% call banner_wrapper(type='dangerous') %}
{{ error.title }}
{% if error.detail %}
- {{ error.detail | safe }}
+ {{ error.detail | safe }}
{% endif %}
{% endcall %}
{% else %}
diff --git a/app/templates/views/user-profile/confirm.html b/app/templates/views/user-profile/confirm.html
index f1d6e4c1b..c519d3c2a 100644
--- a/app/templates/views/user-profile/confirm.html
+++ b/app/templates/views/user-profile/confirm.html
@@ -17,7 +17,7 @@
-
+
We’ve sent a security code to your new {{ thing }}.
{% call form_wrapper() %}
diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html
index a47d0c14d..2e9a0bf00 100644
--- a/app/templates/views/using-notify.html
+++ b/app/templates/views/using-notify.html
@@ -15,9 +15,9 @@
Using Notify
-
The information on this page has moved.
+
The information on this page has moved.
-
Find out more about:
+
Find out more about:
trial mode message status types
Resend security code
-
Text messages sometimes take a few minutes to arrive. If you do not receive a security code, Notify can send you a new one.
-
+
Text messages sometimes take a few minutes to arrive. If you do not receive a security code, Notify can send you a new one.
+
{{ govukButton({
"element": "a",
"text": "Resend security code",
@@ -21,7 +21,7 @@
If your mobile number has changed
-
You’ll need to:
+
You’ll need to:
find a member of your team who has permission to manage settings, team and usage
ask them to change the mobile number for your account
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index 25bbc69d5..5589f8ab1 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -284,6 +284,7 @@ def test_letter_template_preview_links_to_the_correct_image(
page = client_request.get(
'main.letter_template',
_test_page_title=False,
+ _test_for_elements_without_class=False,
branding_style=branding_style
)
diff --git a/tests/conftest.py b/tests/conftest.py
index aaccada18..58f5e7260 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2983,6 +2983,7 @@ def client_request(
_follow_redirects=False,
_expected_redirect=None,
_test_page_title=True,
+ _test_for_elements_without_class=True,
_optional_args="",
**endpoint_kwargs
):
@@ -2992,6 +2993,7 @@ def client_request(
_follow_redirects=_follow_redirects,
_expected_redirect=_expected_redirect,
_test_page_title=_test_page_title,
+ _test_for_elements_without_class=_test_for_elements_without_class,
)
@staticmethod
@@ -3001,6 +3003,7 @@ def client_request(
_follow_redirects=False,
_expected_redirect=None,
_test_page_title=True,
+ _test_for_elements_without_class=True,
**endpoint_kwargs
):
resp = logged_in_client.get(
@@ -3024,6 +3027,22 @@ def client_request(
)
if not normalize_spaces(page_title).startswith(h1):
raise AssertionError('Page title ‘{}’ does not start with H1 ‘{}’'.format(page_title, h1))
+ if _test_for_elements_without_class and _expected_status not in (301, 302):
+ for tag, hint in (
+ ('p', 'govuk-body'),
+ ):
+ element = page.select_one(f'{tag}:not([class])')
+ if (
+ element
+ and not element.has_attr('style') # Elements with inline CSS are exempt
+ and element.text.strip() # Empty elements are exempt
+ ):
+ raise AssertionError(
+ f'Found a <{tag}> without a class attribute:\n'
+ f' {element}\n'
+ f'\n'
+ f'(you probably want to add class="{hint}")'
+ )
return page
@staticmethod