diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index e2cf9c959..eda259b5d 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -72,10 +72,10 @@

Sorry, there is a problem with the service

-

+

Try again later.

-

+

You can check our system status page to see if there are any known issues.
To report a problem, email {% for item in params.items %} diff --git a/app/templates/error/401.html b/app/templates/error/401.html index cf458405d..490852654 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -4,6 +4,6 @@

You’re not authorised to see this page

-

Sign in to Notify.gov and try again.

+

Sign in to Notify.gov and try again.

{% endblock %} diff --git a/app/templates/error/403.html b/app/templates/error/403.html index 2e7c136f6..be2c12acc 100644 --- a/app/templates/error/403.html +++ b/app/templates/error/403.html @@ -6,7 +6,7 @@

You’re not allowed to see this page

-

+

To check your permissions, speak to a member of your team who can manage settings, team and usage.

diff --git a/app/templates/error/404.html b/app/templates/error/404.html index 1b530a7e2..bb27fc403 100644 --- a/app/templates/error/404.html +++ b/app/templates/error/404.html @@ -6,13 +6,13 @@

Page not found

-

+

If you typed the web address, check it is correct.

-

+

If you pasted the web address, check you copied the entire address.

-

+

If the web address is correct or you selected a link or button, contact us.

diff --git a/app/templates/error/410.html b/app/templates/error/410.html index 1b530a7e2..bb27fc403 100644 --- a/app/templates/error/410.html +++ b/app/templates/error/410.html @@ -6,13 +6,13 @@

Page not found

-

+

If you typed the web address, check it is correct.

-

+

If you pasted the web address, check you copied the entire address.

-

+

If the web address is correct or you selected a link or button, contact us.

diff --git a/app/templates/error/500.html b/app/templates/error/500.html index 63fa1ea18..49645e00a 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -6,13 +6,13 @@

Sorry, there’s a problem with Notify.gov

-

+

Try again later.

- -

+

To report a problem, please email notify-support@gsa.gov.

diff --git a/app/templates/org_template.html b/app/templates/org_template.html index 2e15a03e6..dd3fbee20 100644 --- a/app/templates/org_template.html +++ b/app/templates/org_template.html @@ -23,7 +23,7 @@ {% block beforeContent %} {% block backLink %}{% endblock %} {% endblock %} -
+
{% block content %} {% include 'flash_messages.html' %} {% block maincolumn_content %}{% endblock %} diff --git a/app/templates/partials/check/message-too-long.html b/app/templates/partials/check/message-too-long.html index aca32f519..35facdffe 100644 --- a/app/templates/partials/check/message-too-long.html +++ b/app/templates/partials/check/message-too-long.html @@ -1,7 +1,7 @@

Message too long

-

+

Text messages cannot be longer than {{ SMS_CHAR_COUNT_LIMIT }} characters. Your message is {{ template.content_count }} characters.

diff --git a/app/templates/partials/check/not-allowed-to-send-to.html b/app/templates/partials/check/not-allowed-to-send-to.html index 87543ec77..ff566a76a 100644 --- a/app/templates/partials/check/not-allowed-to-send-to.html +++ b/app/templates/partials/check/not-allowed-to-send-to.html @@ -6,7 +6,7 @@ {{ 'es' if 'email address' == template_type_label else 's' }} {%- endif %} -

+

In trial mode you can only send to yourself and members of your team

diff --git a/app/templates/partials/check/sent-previously.html b/app/templates/partials/check/sent-previously.html index df861fb2c..0f657e047 100644 --- a/app/templates/partials/check/sent-previously.html +++ b/app/templates/partials/check/sent-previously.html @@ -1,6 +1,6 @@

These messages have already been sent today

-

+

If you need to resend them, rename the file and upload it again.

diff --git a/app/templates/partials/check/too-many-messages.html b/app/templates/partials/check/too-many-messages.html index 855733baf..ef2a87f06 100644 --- a/app/templates/partials/check/too-many-messages.html +++ b/app/templates/partials/check/too-many-messages.html @@ -5,7 +5,7 @@ Daily limit reached {% endif %} -

+

You can only send {{ current_service.message_limit|format_thousands }} messages per day {%- if current_service.trial_mode %} in trial mode @@ -13,7 +13,7 @@ .

{% if original_file_name %} -

+

{% if current_service.message_limit != remaining_messages %} You can still send {{ remaining_messages|format_thousands }} messages today, but {% endif %} diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 84f45a28e..e33e2c342 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -5,7 +5,7 @@

{% if job.scheduled %} -

+

Sending {{ job.template.name }} {{ job.scheduled_for|format_datetime_relative }} diff --git a/app/templates/partials/notifications/notifications.html b/app/templates/partials/notifications/notifications.html index 021a03b4c..0e605eacc 100644 --- a/app/templates/partials/notifications/notifications.html +++ b/app/templates/partials/notifications/notifications.html @@ -16,7 +16,7 @@ field_headings_visible=False ) %} {% call row_heading() %} -

{{ item.to }}

+

{{ item.to }}

{% endcall %} {{ notification_status_field(item) }} {% endcall %} diff --git a/app/templates/partials/templates/guidance-formatting-letters.html b/app/templates/partials/templates/guidance-formatting-letters.html index 6e502bc47..2c948395a 100644 --- a/app/templates/partials/templates/guidance-formatting-letters.html +++ b/app/templates/partials/templates/guidance-formatting-letters.html @@ -1,14 +1,14 @@ {% from "components/components/inset-text/macro.njk" import govukInsetText %}

Formatting

-

+

To put a heading in your template, use a hash:

{{ govukInsetText({ "text": "# This is a heading", "classes": ""}) }} -

+

To make bullet points, use asterisks:

{{ govukInsetText({ @@ -17,7 +17,7 @@ * point 3
", "classes": ""}) }} -

+

To insert a page break, use three asterisks:

{{ govukInsetText({ diff --git a/app/templates/partials/templates/guidance-formatting.html b/app/templates/partials/templates/guidance-formatting.html index 25a87bd3d..afaa38a88 100644 --- a/app/templates/partials/templates/guidance-formatting.html +++ b/app/templates/partials/templates/guidance-formatting.html @@ -28,8 +28,8 @@ To add a horizontal line, use three dashes:

{{ govukInsetText({ - "html": '

First paragraph

-

---

-

Second paragraph

', + "html": '

First paragraph

+

---

+

Second paragraph

', "classes": ""}) }} diff --git a/app/templates/partials/templates/guidance-send-a-document.html b/app/templates/partials/templates/guidance-send-a-document.html index c0f2ab1a4..12d9eae65 100644 --- a/app/templates/partials/templates/guidance-send-a-document.html +++ b/app/templates/partials/templates/guidance-send-a-document.html @@ -3,7 +3,7 @@

Send a document by email

-

+

Use double brackets to add a placeholder field to your template. This will contain a secure link to download the document.

{{ govukInsetText({ diff --git a/app/templates/partials/tour.html b/app/templates/partials/tour.html index acae011f9..1862c7c79 100644 --- a/app/templates/partials/tour.html +++ b/app/templates/partials/tour.html @@ -7,7 +7,7 @@

1.

-

+

Every message is sent from a template

@@ -17,7 +17,7 @@

2.

-

+

The template pulls in the data you provide

@@ -27,7 +27,7 @@

3.

-

+

Notify delivers the message

{% if help == '3' %} diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html index b15e8bdd6..315dc806c 100644 --- a/app/templates/views/email-not-received.html +++ b/app/templates/views/email-not-received.html @@ -25,7 +25,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
    • -
  • select Resend email link
    • +
  • select Resend email link
diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 1f80b17e3..244334f97 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -10,39 +10,39 @@ {% block content_column_content %}

Features

-

If you work for the government, you can use Notify.gov to keep your users updated.

-

Notify makes it easy to create, customize, and send text messages.

+

If you work for the government, you can use Notify.gov to keep your users updated.

+

Notify makes it easy to create, customize, and send text messages.

-

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 a text 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 a text 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.

Personalized content

-

Notify makes it easy to send personalized messages from a single template.

-

See how to personalize your content.

+

Notify makes it easy to send personalized messages from a single template.

+

See how to personalize your content.

Bulk sending

-

To send a batch of messages at once, upload a list of contact details to Notify. 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. You can also schedule the date and time you want them to be sent.

+

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:

Performance

-

Notify commits to sending 95% of text messages within 10 seconds.

+

Notify commits to sending 95% of text messages within 10 seconds.

- + - +

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. +

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/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html index 6aeff21dc..5c03d2f8e 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: