From 39b84e63c3d709668068a71b889792c3c0abe558 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 10:55:22 +0100 Subject: [PATCH 1/8] Reformat API documentation link --- app/templates/views/features.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 168c41ef9..537771192 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -40,7 +40,7 @@

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.

+

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.

From 17a3abf6a622252c318ae6e222b83bd659d58e54 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 10:56:45 +0100 Subject: [PATCH 2/8] Reformat API documentation link --- app/templates/views/features/emails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index a9ab091db..2dbf384a5 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -43,7 +43,7 @@
  • email attachments are often marked as spam

    • Contact the team and ask us to turn this feature on for your service.

    -

    Read the API documentation for more information.

    +

    Read the API documentation for more information.

    Add a reply-to address

    Notify lets you choose the email address that users reply to.

    From 30cff547bf4312cc1a379c62376fd6a3fc8be99c Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 10:59:18 +0100 Subject: [PATCH 3/8] Update introduction Update introduction --- app/templates/views/features/text-messages.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 8fc20a042..a85eca875 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -15,7 +15,7 @@

    Text messages

    -

    With GOV.UK Notify you can send thousands of free text messages to UK and international numbers.

    +

    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.

    {% endif %} From 33ec4228db88987708363fdbfd7b06968b6ed9e6 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 11:22:31 +0100 Subject: [PATCH 4/8] Update bulk sending, postage and upload --- app/templates/views/features/letters.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index d63599962..10c6ea636 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -25,18 +25,19 @@
    • create reusable letter templates
    • personalise the content of your letter
      • -
    • send bulk messages
      • +
    • send letters in bulk

    You can also integrate with our API to send letters automatically.

    Choose your postage

    -

    You can send letters by first or second class post.

    +

    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 sent before 5:30pm are dispatched the next working day (Monday to Friday). Royal Mail delivers from Monday to Saturday, excluding bank holidays.

    Upload your own letters

    -

    You can create reusable letter templates in Notify, or upload and send your own letters.

    +

    You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.

    Use the letter specification document to help you set up your letter, save it as a PDF, then upload it to Notify.

    +

    Read the API documentation for more information.

    Pricing

    It costs between 30p and 76p (plus VAT) to send a letter. Prices include:

    From 96772374a454ca39298fc398a92a81d91abc3be7 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 11:26:57 +0100 Subject: [PATCH 5/8] Update link text --- app/templates/views/features/emails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index 2dbf384a5..826647c96 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -43,7 +43,7 @@
  • email attachments are often marked as spam

    • Contact the team and ask us to turn this feature on for your service.

    -

    Read the API documentation for more information.

    +

    Read our API documentation for more information.

    Add a reply-to address

    Notify lets you choose the email address that users reply to.

    From 67a75bedf65ed2aa12a8ca2796774f2dba22e4fd Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 11:29:57 +0100 Subject: [PATCH 6/8] Update content --- app/templates/views/features/letters.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index 10c6ea636..29244673d 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -25,7 +25,7 @@
    • create reusable letter templates
    • personalise the content of your letter
      • -
    • send letters in bulk
      • +
    • send bulk mail

    You can also integrate with our API to send letters automatically.

    @@ -37,7 +37,7 @@

    Upload your own letters

    You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.

    Use the letter specification document to help you set up your letter, save it as a PDF, then upload it to Notify.

    -

    Read the API documentation for more information.

    +

    Read our API documentation for more information.

    Pricing

    It costs between 30p and 76p (plus VAT) to send a letter. Prices include:

    From ba4bc5a5aaa6ffb73cb31aa901701e4a8a08ba61 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 11:34:58 +0100 Subject: [PATCH 7/8] Add and update links --- app/templates/views/message-status.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index c82aa3148..26e168d90 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -18,7 +18,7 @@

    When you send a message using GOV.UK Notify, it moves through different states.

    Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered. You can also use our API to check the status of your messages.

    -

    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.

    +

    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.

    Types of message status

    These are the types of message status you’ll see when you’re signed in to Notify.

    -

    If you’re using our API, some of the statuses you’ll see will be different. Read our documentation for a detailed list of API message statuses.

    +

    If you’re using our API, some of the statuses you’ll see will be different. Read our documentation for a detailed list of API message statuses.

    Emails

    From aa16e1f2ce6c8f6e40ab74ecc25bc4d933e44dbf Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 18 Apr 2019 13:06:39 +0100 Subject: [PATCH 8/8] Add tests to make sure static pages render This will catch if we accidentally break them by adding a `url_for` that references a non-existant endpoint or something like that. --- tests/app/main/views/test_index.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 3c0a5998b..3d3088bd2 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -78,7 +78,9 @@ def test_robots(client): @pytest.mark.parametrize('view', [ 'cookies', 'privacy', 'pricing', 'terms', 'roadmap', - 'features', 'callbacks', 'documentation', 'security' + 'features', 'callbacks', 'documentation', 'security', + 'message_status', 'features_email', 'features_sms', + 'features_letters', ]) def test_static_pages( client_request,