From 7177011427baf6fcc82394355566ef333ea63dfa Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 5 Apr 2019 12:05:25 +0100 Subject: [PATCH 001/151] Delete domains.py It was temporarily used to export data from `domains.yml` into a format that could be migrated into the database. --- domains.py | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100755 domains.py diff --git a/domains.py b/domains.py deleted file mode 100755 index 3cb1245a8..000000000 --- a/domains.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import os -import yaml -from itertools import chain -from operator import itemgetter -from sys import argv -from app.utils import AgreementInfo - -_dir_path = os.path.dirname(os.path.realpath(__file__)) - - -if len(argv) < 2: - raise TypeError('Must specify `orgs` or `domains` as the first argument to this script') - - -with open('{}/app/domains.yml'.format(_dir_path)) as source: - - data = yaml.load(source) - - for domain, details in data.items(): - if isinstance(details, dict): - # We’re looking at the canonical domain - data[domain]['domains'] = [domain] - - for domain, details in data.items(): - if isinstance(details, str): - # This is an alias, let’s add it to the canonical domain - data[AgreementInfo(domain).canonical_domain]['domains'].append(domain) - - out_data = [ - details for domain, details in data.items() - if isinstance(details, dict) - ] - - if argv[1] == 'orgs': - print(yaml.dump(out_data)) # noqa - elif argv[1] == 'domains': - print( # noqa - sorted( - set( - chain.from_iterable( - map( - itemgetter('domains'), out_data - ) - ) - ) - ) - ) - else: - raise TypeError('Must specify `orgs` or `domains` as the first argument to this script') From a72a422b4fa463c4e47e856d55b6455ca2ce21ed Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 Mar 2019 11:24:07 +0000 Subject: [PATCH 002/151] Updated introduction Updated introduction to explain that users can set up multiple services in their account. --- app/templates/views/pricing.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index cad28eb2e..1392c5df5 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -14,13 +14,15 @@

Pricing

-

To use GOV.UK Notify, there’s:

+

To use GOV.UK Notify, there’s:

    -
  • no procurement cost
  • no monthly charge
    • -
  • no setup fee to use
    • +
  • no setup fee
    • +
  • no procurement cost
- + +

Create an account then set up as many different services as you need to. Each service has its own free message allowance.

+

Emails

It’s free to send emails through GOV.UK Notify.

From 4fa33c678f7bc4825160e0737f21dd86b43103b9 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 Mar 2019 11:30:42 +0000 Subject: [PATCH 003/151] Update introduction Update introduction to give users more context and clearer instructions --- app/templates/views/documentation.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html index 0729b7658..ed834b147 100644 --- a/app/templates/views/documentation.html +++ b/app/templates/views/documentation.html @@ -9,8 +9,10 @@
-

Documentation

-

Integrate with the GOV.UK Notify API using one of our clients (links open in a new tab):

+

Documentation

+

Use the GOV.UK Notify API to send messages automatically.

+

Clients

+

Choose a client to integrate our API with your web application or back-office system. Links to documentation open in a new tab.

    {% for key, label in [ ('java', 'Java'), From 35db23298308a5f375c8db5a738c4a791a9f9ac4 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 Mar 2019 12:34:36 +0000 Subject: [PATCH 004/151] Updated trial mode and message states Updated trial mode and message states --- app/templates/views/using-notify.html | 42 ++++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index e6753719d..2411f3ac9 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -16,26 +16,36 @@

    Using Notify

    Trial mode

    -

    When you create a GOV.UK Notify account, you’ll start in trial mode. This lets you try out the service, but has some restrictions in place.

    +

    When you set up a new service it will start in trial mode. This lets you try out GOV.UK Notify, with a few restrictions.

    +

    A service in trial mode can only:

    +
      +
    • send 50 text messages and emails per day
      • +
    • send messages to you and other people in your team
      • +
    • draft letters, but not send them
      • +
    +

    - You can remove these restrictions by + To remove these restrictions, you can {% if current_service and current_service.trial_mode %} - requesting to go live. + send us a request to go live. {% else %} - going live. + send us a request to go live. {% endif %}

    -

    Restrictions in trial mode

    -

    In trial mode, you can:

    -
      -
    • send up to 50 text messages and emails per day
      • -
    • send messages to yourself and other people in your team
      • -
    • draft letters (but not send them)
      • +

      Before you can request to go live, you must:

      +
        +
      • sign our data sharing and financial agreement
        • +
      • accept our terms of use
        • +
      • set up your service so you're ready to send and receive messages
      - +

      Sending messages

      -

      When you send a message, it moves through different states in Notify.

      +

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

      + +

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

      + +

      Read our documentation for a detailed list of API message states.

      A picture of the sending flow of messages in Notify, showing the three states of Sending, Delivered, And Failed. Also shows the next @@ -43,7 +53,7 @@ temporary failures -

      Message statuses – emails and text messages

      +

      Message states – emails and text messages

      Sending

      GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.

      Sent internationally (text messages only)

      @@ -65,16 +75,14 @@

      You’ll have to try sending your messages again.

      You will not be charged for text messages that are affected by a technical failure.

      -

      Message statuses – letters

      +

      Message states – letters

      Sent

      GOV.UK Notify has sent the letter to the provider to be printed.

      Cancelled

      Sending cancelled. Your letter will not be printed or dispatched.

      Technical failure

      GOV.UK Notify had an unexpected error while sending to our printing provider.

      - -

      Read our documentation for a detailed list of API statuses.

      - +

      Receiving messages

      Email replies

      You can choose an email address you want replies to go to.

      From 4ba68cbaf785c01c372c74c3a71a8115eae0d3b3 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 19 Mar 2019 13:50:30 +0000 Subject: [PATCH 005/151] Remove 'multiple accounts' section Remove 'multiple accounts' section because we're going to explain this in Pricing and other features content. --- app/templates/views/using-notify.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 2411f3ac9..9bcbffb3f 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -92,14 +92,6 @@

      You’ll be able to see and reply to text messages you receive. You can also create automated processes to manage replies.

      You’ll still need to have a manual process in place for any messages that can’t be dealt with automatically.

      -

      Multiple services in one organisation

      -

      If your organisation offers multiple services, you can have a different Notify account for each of them.

      -

      Each service:

      -
        -
      • gets its own free message allowance
        • -
      • has to request to go live separately
        • -
      -

      Letters

      Letters can be up to 10 pages long (5 sides of paper, double-sided).

      Notify sends letters in C5 size envelopes, with a window.

      From f2c2e9d729fa115791f33f554893603e5ef9e487 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 10:47:31 +0000 Subject: [PATCH 006/151] Updated message status content Updated message status content --- app/templates/views/using-notify.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 9bcbffb3f..791c08e08 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -43,9 +43,9 @@

      Sending messages

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

      -

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

      +

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

      -

      Read our documentation for a detailed list of API message states.

      +

      Read our documentation for a detailed list of API message statuses.

      A picture of the sending flow of messages in Notify, showing the three states of Sending, Delivered, And Failed. Also shows the next @@ -53,7 +53,7 @@ temporary failures -

      Message states – emails and text messages

      +

      Message status – emails and text messages

      Sending

      GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.

      Sent internationally (text messages only)

      @@ -75,7 +75,7 @@

      You’ll have to try sending your messages again.

      You will not be charged for text messages that are affected by a technical failure.

      -

      Message states – letters

      +

      Message status – letters

      Sent

      GOV.UK Notify has sent the letter to the provider to be printed.

      Cancelled

      From 1ecfb966595a4d2956a0db91ebcdf0088e973c96 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 11:42:51 +0000 Subject: [PATCH 007/151] Add security information Add security information --- app/templates/views/features.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index deffa316d..5489b5f92 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -75,4 +75,12 @@

      Notify sends messages through multiple providers. If one provider fails, Notify automatically switches to another so that your messages aren’t affected.

      You can check how Notify is performing.

      + +

      Security

      +

      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've been sent. This means that only the recipient can see that information.

      +

      Two-factor authentication

      +

      Notify uses 2FA to keep your account secure. Every time you sign in, we'll send a unique one-time code to your phone and ask you to enter it first.

      +

      Read more about security. {% endblock %} From a90fa1875a3417b96786a7716f461acbe68f5647 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 11:49:06 +0000 Subject: [PATCH 008/151] Update Performance content Update Performance content --- app/templates/views/features.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 5489b5f92..d7b659f79 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -65,16 +65,16 @@

    • invite new users (including people without a government email address)
    -

    Send messages reliably

    -

    Notify commits to:

    +

    Performance

    +

    GOV.UK Notify commits to:

    • sending 95% of emails and text messages within 10 seconds
      • -
    • sending letters by 3pm the next working day (if you submit it through Notify before 5pm)
      • +
    • printing and posting letters by 3pm the next working day (if you send them to us before 5pm)
    -

    Notify sends messages through multiple providers. If one provider fails, Notify automatically switches to another so that your messages aren’t affected.

    +

    We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.

    -

    You can check 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.

    From 8b3d1a992b299447663bc734a6288ea01579df9f Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 12:01:06 +0000 Subject: [PATCH 009/151] Add Support information Add Support information --- app/templates/views/features.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index d7b659f79..d732cd2b5 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -78,9 +78,18 @@

    Security

    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've been sent. This means that only the recipient can see that information.

    +

    Two-factor authentication

    Notify uses 2FA to keep your account secure. Every time you sign in, we'll send a unique one-time code to your phone and ask you to enter it first.

    -

    Read more about security. +

    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. + + + {% endblock %} From 4a126ecaace6ab68972a0d6f5cbfbd5b7563a1fb Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 12:06:28 +0000 Subject: [PATCH 010/151] Update permissions content Update permissions content --- app/templates/views/features.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index d732cd2b5..1106d1b07 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -58,11 +58,13 @@

  • view your usage and reports
-

Manage your team

-

Through the Notify dashboard, you can:

+

Permissions

+

Notify lets you control which members of your team can see, create, edit and send messages.

+

You can:

    -
  • set permission levels for different team members
    • -
  • invite new users (including people without a government email address)
    • +
  • set different permission levels for each team member
    • +
  • invite team members who don’t have a government email address
    • +
  • choose who else can manage team members

Performance

From d66603f9e2096c8399cf975592f217798b1f2183 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 12:09:00 +0000 Subject: [PATCH 011/151] Add ID for anchor link Add ID for anchor link --- app/templates/views/using-notify.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 791c08e08..7a38fab93 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -53,7 +53,7 @@ temporary failures" style="width: 100%;" > -

Message status – emails and text messages

+

Message status – emails and text messages

Sending

GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.

Sent internationally (text messages only)

From 8e1545ee7df79b8b3913071bdf5a1b3cf3fbf38b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 12:09:43 +0000 Subject: [PATCH 012/151] Edit H2 ID Edit H2 ID --- app/templates/views/using-notify.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 7a38fab93..0fd622def 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -53,7 +53,7 @@ temporary failures" style="width: 100%;" > -

Message status – emails and text messages

+

Message status – emails and text messages

Sending

GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.

Sent internationally (text messages only)

From b62c1fab2a5e0791f82d3d45e630571b5b99a6d6 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 21 Mar 2019 12:13:13 +0000 Subject: [PATCH 013/151] Update reporting content Update reporting content --- app/templates/views/features.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 1106d1b07..751ad82af 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -50,13 +50,9 @@
  • send messages automatically through our API
    • -

    Track your activity

    -

    Through the Notify dashboard, you can:

    -
      -
    • check the delivery status of any emails and text messages
      • -
    • see a real-time dashboard of your activity
      • -
    • view your usage and reports
      • -
    +

    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 message statuses.

    Permissions

    Notify lets you control which members of your team can see, create, edit and send messages.

    From c8b4f304e7508cb1e11d37e009cbb43ac24eba02 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 26 Mar 2019 14:13:09 +0000 Subject: [PATCH 014/151] Add API content Add API content and update introduction --- app/templates/views/features.html | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 751ad82af..1ae996de0 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -15,24 +15,25 @@

    Features

    -

    With GOV.UK Notify, you can:

    +

    If you work for central government, a local authority or the NHS, you can use GOV.UK Notify to send your users:

      -
    • send emails
      • -
    • send and receive text messages (UK and internationally)
      • -
    • send letters
      • +
    • emails
      • +
    • text messages
      • +
    • letters

    You don’t need any technical knowledge to use Notify.

    Create an account for free and try it yourself.

    -

    Create messages quickly and easily

    +

    Send messages quickly and easily

    Without any technical knowledge, you can:

      -
    • create your own message templates
      • -
    • change how messages are formatted
      • -
    • preview messages before you send them
      • +
    • create reusable message templates
      • +
    • send personalised messages to individual users
      • +
    • schedule messages to be sent at a particular time
      • +
    • send bulk messages to lots of users
    -

    Customise your branding

    +

    Customised messages

    You control how your messages look when you send them through Notify. You can:

    • use your organisation’s own branding
      • @@ -41,14 +42,9 @@
    • get a unique phone number for text message replies
    -

    Send messages in bulk or individually

    -

    With Notify, you can:

    -
      -
    • send bulk messages to lots of users
      • -
    • send personalised messages to individual users
      • -
    • schedule messages to be sent at a particular time
      • -
    • send messages automatically through our API
      • -
    +

    API integration

    +

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    +

    Read our documentation to find out how to integrate with Notify.

    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 21bb95d2da34b59d486d37983a75033a16904949 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:12:50 +0000 Subject: [PATCH 015/151] =?UTF-8?q?Create=20channel-specific=20features=20?= =?UTF-8?q?page=20=E2=80=93=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create channel-specific features page – email --- app/templates/views/features/email.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/templates/views/features/email.html diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/app/templates/views/features/email.html @@ -0,0 +1 @@ + From ccd85bd7a73a9509cb0d0cc43991997985803e3b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:16:16 +0000 Subject: [PATCH 016/151] Add 'Send files by email' content Add 'Send files by email' content --- app/templates/views/features/email.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 8b1378917..dcb42a432 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -1 +1,10 @@ +

    Send files by email

    +

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    +

    Notify uses encrypted links instead of email attachments because:

    +
      +
    • they're more secure
      • +
    • you can track when the recipient downloads your document
      • +
    • email attachments are often marked as spam
      • +
    +

    Read the API documentation for more information.

    From a4f3109747f2f523fc673a7239857bddbb95f590 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:17:59 +0000 Subject: [PATCH 017/151] Add page formatting and H1 Add page formatting and H1 --- app/templates/views/features/email.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index dcb42a432..9553a0533 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -1,3 +1,20 @@ +{% extends "withoutnav_template.html" %} +{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %} +{% from "components/sub-navigation.html" import sub_navigation %} + +{% block per_page_title %} + Features +{% endblock %} + +{% block maincolumn_content %} + +
    +
    + {{ sub_navigation(navigation_links) }} +
    +
    + +

    Features – email

    Send files by email

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    From 89879229981c79c9f9a15d505c259507af6f2a92 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:31:31 +0000 Subject: [PATCH 018/151] Add list of features Add list of features --- app/templates/views/features/email.html | 38 ++++++++++++++++++------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 9553a0533..3ff9bbceb 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -14,14 +14,32 @@
    -

    Features – email

    +

    Email

    + +

    Intro

    -

    Send files by email

    -

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    -

    Notify uses encrypted links instead of email attachments because:

    -
      -
    • they're more secure
      • -
    • you can track when the recipient downloads your document
      • -
    • email attachments are often marked as spam
      • -
    -

    Read the API documentation for more information.

    +

    Key features

    +

    Lead-in line:

    +
      +
    • create reusable message templates
      • +
    • personalise the content of your messages
      • +
    • use your own logo and branding
      • +
    • send files by email
      • +
    • set up as many reply-to addresses as you need to
      • +
    • send bulk messages by uploading a spreadsheet of contact information
      • +
    • schedule messages to be sent at a particular time
      • +
    • integrate with the API to send messages automatically
      • +
    +

    Pricing

    +

    It’s free to send emails through GOV.UK Notify.

    +

    Find out more about pricing.

    + +

    Send files by email

    +

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    +

    Notify uses encrypted links instead of email attachments because:

    +
      +
    • they're more secure
      • +
    • you can track when the recipient downloads your document
      • +
    • email attachments are often marked as spam
      • +
    +

    Read the API documentation for more information.

    From a63dc159451ff135c0259f2b9305de1c2c25e2e7 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:38:53 +0000 Subject: [PATCH 019/151] Add letters content Add letters content --- app/templates/views/features/letters | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 app/templates/views/features/letters diff --git a/app/templates/views/features/letters b/app/templates/views/features/letters new file mode 100644 index 000000000..8578149d7 --- /dev/null +++ b/app/templates/views/features/letters @@ -0,0 +1,30 @@ + +

    Letters

    + +

    GOV.UK Notify will print, pack and post your letters for you. You can send letters by first or second class postage.

    + +

    Features

    + +

    Upload your own letters

    +

    You can create reusable letter templates using Notify, or upload and send your own PDFs as one-off letters.

    + +

    Delivery times

    +

    Letters sent before 5:30pm are dispatched the next working day (Monday to Friday).

    + +

    First class letters are delivered one day after they're dispatched. Second class letters are delivered 2 days after they're dispatched.

    + +

    Royal Mail delivers from Monday to Saturday, excluding bank holidays.

    + +

    Pricing

    +

    It costs between 30p and 76p 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.

    From 808c3792ebd2326af13386a0a0e4dace3158678b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:39:23 +0000 Subject: [PATCH 020/151] Add file extension Add file extension --- app/templates/views/features/{letters => letters.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/views/features/{letters => letters.html} (100%) diff --git a/app/templates/views/features/letters b/app/templates/views/features/letters.html similarity index 100% rename from app/templates/views/features/letters rename to app/templates/views/features/letters.html From 87a474c511025e48e6ad841af39ae681b001ffd4 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:40:45 +0000 Subject: [PATCH 021/151] Add page formatting Add page formatting --- app/templates/views/features/letters.html | 53 +++++++++++++++-------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index 8578149d7..fca066194 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -1,30 +1,45 @@ +{% extends "withoutnav_template.html" %} +{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %} +{% from "components/sub-navigation.html" import sub_navigation %} -

    Letters

    +{% block per_page_title %} + Features +{% endblock %} -

    GOV.UK Notify will print, pack and post your letters for you. You can send letters by first or second class postage.

    +{% block maincolumn_content %} -

    Features

    +
    +
    + {{ sub_navigation(navigation_links) }} +
    +
    + +

    Letters

    -

    Upload your own letters

    -

    You can create reusable letter templates using Notify, or upload and send your own PDFs as one-off letters.

    +

    GOV.UK Notify will print, pack and post your letters for you. You can send letters by first or second class postage.

    -

    Delivery times

    -

    Letters sent before 5:30pm are dispatched the next working day (Monday to Friday).

    +

    Features

    -

    First class letters are delivered one day after they're dispatched. Second class letters are delivered 2 days after they're dispatched.

    +

    Upload your own letters

    +

    You can create reusable letter templates using Notify, or upload and send your own PDFs as one-off letters.

    -

    Royal Mail delivers from Monday to Saturday, excluding bank holidays.

    +

    Delivery times

    +

    Letters sent before 5:30pm are dispatched the next working day (Monday to Friday).

    -

    Pricing

    -

    It costs between 30p and 76p to send a letter. Prices include:

    +

    First class letters are delivered one day after they're dispatched. Second class letters are delivered 2 days after they're dispatched.

    -
      -
    • paper
      • -
    • double-sided colour printing
      • -
    • C5 size envelopes with an address window
      • -
    • first or second class postage
      • -
    +

    Royal Mail delivers from Monday to Saturday, excluding bank holidays.

    -

    Letters can be up to 10 pages long (5 double-sided sheets of paper).

    +

    Pricing

    +

    It costs between 30p and 76p to send a letter. Prices include:

    -

    See pricing.

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

    From 4c1e878f1af555c8277f38721980fcc5628b2662 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 29 Mar 2019 14:51:23 +0000 Subject: [PATCH 022/151] Add text messages page Add text messages page --- app/templates/views/features/text-messages.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/templates/views/features/text-messages.html diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html new file mode 100644 index 000000000..24d67f709 --- /dev/null +++ b/app/templates/views/features/text-messages.html @@ -0,0 +1,17 @@ +{% extends "withoutnav_template.html" %} +{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %} +{% from "components/sub-navigation.html" import sub_navigation %} + +{% block per_page_title %} + Features +{% endblock %} + +{% block maincolumn_content %} + +
    +
    + {{ sub_navigation(navigation_links) }} +
    +
    + +

    Text messages

    From 6e2d1f99f4172efc58e4485309fcef5eb1d6d1b5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 2 Apr 2019 09:07:39 +0100 Subject: [PATCH 023/151] Update letters and how to pay content Update letters and how to pay content --- app/templates/views/pricing.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 1392c5df5..4421b9e8c 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -91,7 +91,7 @@

    Letters

    -

    The cost of sending a letter depends on how many sheets of paper you need and the class of postage.

    +

    The cost of sending a letter depends on the postage you use and how many sheets of paper you need.

    {% call mapping_table( caption='Letter pricing', @@ -114,7 +114,7 @@ {% endfor %} {% endcall %}
    -

    Letter prices include:

    +

    Prices include:

    • paper
    • double-sided colour printing
      • @@ -123,6 +123,7 @@

    How to pay

    +

    Notify will send you an invoice after each quarter. If the value of an invoice is very small, we roll it into the next quarter to save time and effort.

    You can find details of how to pay for Notify in our data sharing and financial agreement.

    {{ agreement_info.as_pricing_paragraph( From 895ca4952517ad0aa575acd2457d75faaff8d4fc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 3 Apr 2019 09:04:39 +0100 Subject: [PATCH 024/151] Add templates, personalisation and bulk sending Add templates, personalisation and bulk sending --- app/templates/views/features.html | 35 +++++++++++++------------------ 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 1ae996de0..5070592e3 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -15,32 +15,25 @@

    Features

    -

    If you work for central government, a local authority or the NHS, you can use GOV.UK Notify to send your users:

    +

    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:

    • emails
    • text messages
    • letters
    -

    You don’t need any technical knowledge to use Notify.

    Create an account for free and try it yourself.

    -

    Send messages quickly and easily

    -

    Without any technical knowledge, you can:

    -
      -
    • create reusable message templates
      • -
    • send personalised messages to individual users
      • -
    • schedule messages to be sent at a particular time
      • -
    • send bulk messages to lots of users
      • -
    - -

    Customised messages

    -

    You control how your messages look when you send them through Notify. You can:

    -
      -
    • use your organisation’s own branding
      • -
    • choose the name that emails and text messages come from
      • -
    • choose the email address that users reply to
      • -
    • get a unique phone number for text message replies
      • -
    +

    Reusable message templates

    +

    To send an email, text or letter with Notify, first create a reusable message template.

    +

    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.

    +

    If you want to include the recipient's name or a reference number in your message, you can add a placeholder. Placeholders get filled in each time you send a message. You can do this manually or upload a list of personal details and let Notify do it for you.

    + +

    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.

    API integration

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    @@ -51,8 +44,8 @@

    Read more about message statuses.

    Permissions

    -

    Notify lets you control which members of your team can see, create, edit and send messages.

    -

    You can:

    +

    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 don’t have a government email address
      • From 0de6db263468f1434b5845ecfac69a193ed3ace0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 10:00:39 +0100 Subject: [PATCH 025/151] Add text messages content Add text messages content --- .../views/features/text-messages.html | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 24d67f709..fb4ad5ab3 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -15,3 +15,39 @@

      Text messages

      +

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

      + +

      Create an account and try Notify for yourself.

      + +

      Features

      +

      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, or set up your own automated processes to manage replies.

      + +

      Contact the team 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.

      + +

      You can change the text message sender name from the default of 'GOVUK' in your service settings.

      + +

      More features

      + +

      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.

      + +

      Pricing

      +

      Each service you set up 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.

        From 966b77afde868ed947c04025ced2b7b05862becb Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 10:03:02 +0100 Subject: [PATCH 026/151] close
      tag close

    tag --- 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 fb4ad5ab3..95910367e 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -48,6 +48,6 @@

    The free allowance is:

    • 250,000 free text messages for central government services
      • -
    • 25,000 free text messages for other public sector services
      • +
    • 25,000 free text messages for other public sector services

    See pricing for more details.

    From 1528ca6c5f22e3da1d33b0d634cd2cbc84d2f2d1 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 10:29:09 +0100 Subject: [PATCH 027/151] Update email content Update email content --- app/templates/views/features/email.html | 65 +++++++++++++++---------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 3ff9bbceb..6553fa537 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -14,32 +14,45 @@
    -

    Email

    +

    Email

    -

    Intro

    - -

    Key features

    -

    Lead-in line:

    -
      -
    • create reusable message templates
      • -
    • personalise the content of your messages
      • -
    • use your own logo and branding
      • -
    • send files by email
      • -
    • set up as many reply-to addresses as you need to
      • -
    • send bulk messages by uploading a spreadsheet of contact information
      • -
    • schedule messages to be sent at a particular time
      • -
    • integrate with the API to send messages automatically
      • -
    -

    Pricing

    -

    It’s free to send emails through GOV.UK Notify.

    -

    Find out more about pricing.

    +

    It’s free to send emails with GOV.UK Notify.

    + +

    Create a free account and try Notify for yourself.

    + +

    Features

    + +

    Use your own logo and branding

    +

    description TBC

    Send files by email

    -

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    -

    Notify uses encrypted links instead of email attachments because:

    -
      -
    • they're more secure
      • -
    • you can track when the recipient downloads your document
      • -
    • email attachments are often marked as spam
      • -
    -

    Read the API documentation for more information.

    +

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    + +

    Notify uses encrypted links instead of email attachments because:

    + +
      +
    • they're more secure
      • +
    • you can track when the recipient downloads your document
      • +
    • email attachments are often marked as spam
      • +
    + +

    Read the API documentation for more information.

    + +

    Add a reply-to address/add reply-to email addresses

    +

    Description

    + +

    More features

    + +

    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 text messages automatically.

    + +

    Pricing

    +

    It’s free to send emails through GOV.UK Notify.

    + +

    See pricing for more details.

    From 228db768b3a51f24a9f740bb1ab0cda974149540 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 12:02:29 +0100 Subject: [PATCH 028/151] close

    tag --- 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 5070592e3..6ebf3b05b 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -75,7 +75,7 @@

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

    Find out more about support.

    From 3c84979989653dafc8b3c7a6bfd949f8f28035db Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:13:30 +0100 Subject: [PATCH 029/151] Updated email content Updated email content --- app/templates/views/features/email.html | 51 +++++++++++++++---------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 6553fa537..3d3947a7f 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -13,21 +13,32 @@ {{ sub_navigation(navigation_links) }}
    - -

    Email

    -

    It’s free to send emails with GOV.UK Notify.

    +

    Emails

    + +

    Send an unlimited number of emails for free with GOV.UK Notify.

    Create a free account and try Notify for yourself.

    Features

    -

    Use your own logo and branding

    -

    description TBC

    +

    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 text messages automatically.

    + + +

    Email branding

    +

    Add your organisation's logo and brand colour to email templates.

    +

    Change your branding in your service settings.

    Send files by email

    -

    You can use the GOV.UK Notify API to upload a file, then send the recipient an email with a secure link to download it.

    - +

    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:

      @@ -38,21 +49,19 @@

      Read the API documentation for more information.

      -

      Add a reply-to address/add reply-to email addresses

      -

      Description

      - -

      More features

      - -

      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 text messages automatically.

      - +

      Add a reply-to address

      +

      Notify lets you edit 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.

      +

      You can add reply-to addresses in your service settings.

      +

      Pricing

      It’s free to send emails through GOV.UK Notify.

      See pricing for more details.

      + + + + + + +{% endblock %} From 57ad2ef6346f7284d192a8c3a1dc58d107e26655 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:15:52 +0100 Subject: [PATCH 030/151] Moved features list Moved features list --- .../views/features/text-messages.html | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 95910367e..141f8d760 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -20,6 +20,15 @@

      Create an account and try Notify for yourself.

      Features

      + +

      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.

      +

      Receive text messages

      Let people send messages to your service or reply to your texts.

      @@ -32,16 +41,6 @@

      You can change the text message sender name from the default of 'GOVUK' in your service settings.

      -

      More features

      - -

      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.

      -

      Pricing

      Each service you set up has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.

      @@ -50,4 +49,8 @@
    • 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 %} From 5bf67e0e236a13458315f4ce64e0e7ac25c0fee5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:25:30 +0100 Subject: [PATCH 031/151] Update letters content Update letters content --- app/templates/views/features/letters.html | 36 ++++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index fca066194..ad1b1e060 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -16,20 +16,30 @@

    Letters

    -

    GOV.UK Notify will print, pack and post your letters for you. You can send letters by first or second class postage.

    +

    GOV.UK Notify will print, pack and post your letters for you.

    +

    Create a free account and try Notify for yourself.

    +

    Features

    +

    Notify makes it easy to:

    +
      +
    • create reusable letter templates
      • +
    • personalise the content of your letter
      • +
    • send and schedule bulk messages
      • +
    + +

    You can also integrate with our API to send text messages automatically.

    -

    Upload your own letters

    -

    You can create reusable letter templates using Notify, or upload and send your own PDFs as one-off letters.

    - -

    Delivery times

    -

    Letters sent before 5:30pm are dispatched the next working day (Monday to Friday).

    - +

    Choose your postage

    +

    You can send letters by first or second class postage.

    First class letters are delivered one day after they're dispatched. Second class letters are delivered 2 days after they're dispatched.

    - -

    Royal Mail delivers from Monday to Saturday, excluding bank holidays.

    - +

    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.

    + +

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

    +

    Pricing

    It costs between 30p and 76p to send a letter. Prices include:

    @@ -42,4 +52,8 @@

    Letters can be up to 10 pages long (5 double-sided sheets of paper).

    -

    See pricing.

    +

    See pricing for more details.

    + + + +{% endblock %} From 98296a8e077a864111107367b2b76d972819dfbb Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:28:58 +0100 Subject: [PATCH 032/151] Add contact link Add contact link --- 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 141f8d760..40fd829ea 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -34,7 +34,7 @@

    You can see and reply to the messages you receive, or set up your own automated processes to manage replies.

    -

    Contact the team to request a unique number for text message replies.

    +

    Contact the team 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.

    From 8957b4981d72b5d33a2403594a8ab190b9f9ecaf Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:29:24 +0100 Subject: [PATCH 033/151] Correct 'create account' link text Correct 'create account' link text --- app/templates/views/features/letters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index ad1b1e060..78ef20a4a 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -18,7 +18,7 @@

    GOV.UK Notify will print, pack and post your letters for you.

    -

    Create a free account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    Features

    Notify makes it easy to:

    From 31656a982d8ee87438a80821c4d4ea047bceca3f Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:29:45 +0100 Subject: [PATCH 034/151] Correct 'create account' link text Correct 'create account' link text --- app/templates/views/features/email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 3d3947a7f..289bc6810 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -18,7 +18,7 @@

    Send an unlimited number of emails for free with GOV.UK Notify.

    -

    Create a free account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    Features

    From ed3e8a88a4236fba898e5deb0f757bbbe1d83864 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:43:42 +0100 Subject: [PATCH 035/151] Update API content and introduction Update API content and introduction --- app/templates/views/features.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 6ebf3b05b..380d1e38f 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -22,6 +22,7 @@
  • text messages
  • letters
    • +

    You don’t need any technical knowledge to use Notify.

    Create an account for free and try it yourself.

    Reusable message templates

    @@ -36,8 +37,8 @@

    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.

    API integration

    -

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    -

    Read our documentation to find out how to integrate with Notify.

    +

    Integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    +

    Read our documentation for more details.

    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 741728999dcd12ddf84406104b54a00c6f0ad547 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:45:25 +0100 Subject: [PATCH 036/151] Update API content Update API content --- app/templates/views/features.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 380d1e38f..1a84a94c6 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -37,8 +37,8 @@

    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.

    API integration

    -

    Integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    -

    Read our documentation for more details.

    +

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    +

    Find out how in our documentation.

    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 cf23657bcaab4e27c9726c2cc153b2ff71b5e047 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 15:57:24 +0100 Subject: [PATCH 037/151] Create trial mode page Create trial mode page --- app/templates/views/trial-mode.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/templates/views/trial-mode.html diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/app/templates/views/trial-mode.html @@ -0,0 +1 @@ + From 39f96c2f83210c391757c68709d9a0ef6bb88db7 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:00:17 +0100 Subject: [PATCH 038/151] Add Trial mode content Add Trial mode content --- app/templates/views/trial-mode.html | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 8b1378917..3a39e4ad0 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -1 +1,45 @@ +{% extends "withoutnav_template.html" %} +{% from "components/sub-navigation.html" import sub_navigation %} +{% block per_page_title %} + Using Notify +{% endblock %} + +{% block maincolumn_content %} + +
    +
    + {{ sub_navigation(navigation_links) }} +
    +
    + +

    Trial mode

    + +

    When you set up a new service it will start in trial mode. This lets you try out GOV.UK Notify, with a few restrictions.

    +

    A service in trial mode can only:

    +
      +
    • send 50 text messages and emails per day
      • +
    • send messages to you and other people in your team
      • +
    • create draft letters, but not send them
      • +
    + +

    + To remove these restrictions, you can + {% if current_service and current_service.trial_mode %} + send us a request to go live. + {% else %} + send us a request to go live. + {% endif %} +

    + +

    Before you can request to go live, you must:

    +
      +
    • sign our data sharing and financial agreement
      • +
    • accept our terms of use
      • +
    • set up your service so you're ready to send and receive messages
      • +
    + + +
    + +{% endblock %} From 69592e7e8ca9ae90d87b53dc4e267708c60bd7a8 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:05:05 +0100 Subject: [PATCH 039/151] Create Message status page Create Message status page --- app/templates/views/message-status.html | 63 +++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 app/templates/views/message-status.html diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html new file mode 100644 index 000000000..3686ef1d4 --- /dev/null +++ b/app/templates/views/message-status.html @@ -0,0 +1,63 @@ +{% extends "withoutnav_template.html" %} +{% from "components/sub-navigation.html" import sub_navigation %} + +{% block per_page_title %} + What happens when you send a message OR Message states you’ll see in Notify +{% endblock %} + +{% block maincolumn_content %} + +
    +
    + {{ sub_navigation(navigation_links) }} +
    +
    + +

    What happens when you send a message // Message states you’ll see in Notify

    + +

    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 use our API to check the status of your messages too.

    + +

    Read our documentation for a detailed list of API message statuses.

    + A picture of the sending flow of messages in Notify, showing the three states of Sending, Delivered, And Failed. Also shows the next + steps when messages fail, deleting data and trying a new channel for permanent failures, and trying again or trying a new channel for + temporary failures +

    Message status – emails and text messages

    +

    Sending

    +

    GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.

    +

    Sent internationally (text messages only)

    +

    The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.

    +

    Delivered

    +

    The message was successfully delivered.

    +

    Notify will not tell you if a user has opened or read a message.

    +

    Phone number or email address does not exist

    +

    The provider could not deliver the message because the email address or phone number was wrong. +

    You should remove these email addresses or phone numbers from your database.

    +

    You’ll still be charged for text messages to numbers that do not exist.

    +

    Inbox/phone not accepting messages right now

    +

    The provider could not deliver the message after trying for 72 hours.

    +

    This can happen when the recipient’s inbox is full or their phone is off.

    +

    You can try to send the message again.

    +

    You’ll still be charged for text messages to phones that are not accepting messages.

    +

    Technical failure

    +

    Your message was not sent because there was a problem between Notify and the provider.

    +

    You’ll have to try sending your messages again.

    +

    You will not be charged for text messages that are affected by a technical failure.

    + +

    Message status – letters

    +

    Sent

    +

    GOV.UK Notify has sent the letter to the provider to be printed.

    +

    Cancelled

    +

    Sending cancelled. Your letter will not be printed or dispatched.

    +

    Technical failure

    +

    GOV.UK Notify had an unexpected error while sending to our printing provider.

    + +
    +
    + +{% endblock %} From 034588e4e4aaa6018675a059e7ed9aeacd779d82 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:10:21 +0100 Subject: [PATCH 040/151] Hide page content, add links Hide page content, add links --- app/templates/views/using-notify.html | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 0fd622def..175b6d15c 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -14,8 +14,19 @@

    Using Notify

    - -

    Trial mode

    + +

    The information on this page has moved.

    + +

    Use the links to find out more about:

    +
      +
    • using Notify in trial mode
      • +
    • message statuses in Notify
      • +
    • email replies
      • +
    • text message replies
      • +
    • letters
      • +
    + +
    From a31f63bb0b189b09e64dc8e2f7e9d0e994c469fb Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:21:08 +0100 Subject: [PATCH 041/151] Fix grammar Fix grammar --- app/templates/views/features.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 1a84a94c6..947c2c6db 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -38,10 +38,10 @@

    API integration

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    -

    Find out how in our documentation.

    +

    Read our documentation for instructions.

    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.

    +

    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 message statuses.

    Permissions

    @@ -57,7 +57,7 @@

    GOV.UK 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 5pm)
      • +
    • 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.

    @@ -75,7 +75,7 @@

    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.

    +

    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.

    From 28f66c1e797123558993465bf4d7aea0b8fe36f1 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:24:49 +0100 Subject: [PATCH 042/151] Fix grammar and html Fix grammar and html --- app/templates/views/features/email.html | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 289bc6810..6bd3017fd 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -3,7 +3,7 @@ {% from "components/sub-navigation.html" import sub_navigation %} {% block per_page_title %} - Features + Emails {% endblock %} {% block maincolumn_content %} @@ -15,38 +15,31 @@

    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.

    Create an account and try Notify for yourself.

    Features

    -

    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 text messages automatically.

    -

    Email branding

    Add your organisation's logo and brand colour to email templates.

    -

    Change your branding in your service settings.

    +

    You can change your branding in your service settings.

    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:

    -
    • they're more secure
    • you can track when the recipient downloads your document
    • email attachments are often marked as spam
    -

    Read the API documentation for more information.

    Add a reply-to address

    @@ -56,12 +49,9 @@

    Pricing

    It’s free to send emails through GOV.UK Notify.

    -

    See pricing for more details.

    - - - - +
    +

    {% endblock %} From f85759b073ae9c65b53945098c05f498b48bc1cd Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:26:19 +0100 Subject: [PATCH 043/151] Fix link and html Fix link and html --- app/templates/views/features.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 947c2c6db..86501242a 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -38,7 +38,7 @@

    API integration

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    -

    Read our documentation for instructions.

    +

    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.

    @@ -78,6 +78,7 @@

    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 %} From 15125e0dac994cf6efefa13fb29aaadbb230272d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:34:25 +0100 Subject: [PATCH 044/151] Fix html, add link to letter spec Fix html, add link to letter spec --- app/templates/views/features/letters.html | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index 78ef20a4a..13afcb728 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -3,7 +3,7 @@ {% from "components/sub-navigation.html" import sub_navigation %} {% block per_page_title %} - Features + Letters {% endblock %} {% block maincolumn_content %} @@ -15,9 +15,7 @@

    Letters

    -

    GOV.UK Notify will print, pack and post your letters for you.

    -

    Create an account and try Notify for yourself.

    Features

    @@ -27,7 +25,6 @@
  • personalise the content of your letter
  • send and schedule bulk messages
    • -

    You can also integrate with our API to send text messages automatically.

    Choose your postage

    @@ -37,23 +34,20 @@

    Upload your own letters

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

    - -

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

    +

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

    Pricing

    It costs between 30p and 76p 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.

    - +
    +
    {% endblock %} From 04dce301f2ab083f5d03e770fdb076445d52d87b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 4 Apr 2019 16:39:55 +0100 Subject: [PATCH 045/151] Fix html Fix html --- app/templates/views/features/text-messages.html | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 40fd829ea..a0a1deb91 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -3,7 +3,7 @@ {% from "components/sub-navigation.html" import sub_navigation %} {% block per_page_title %} - Features + Text messages {% endblock %} {% block maincolumn_content %} @@ -16,41 +16,35 @@

    Text messages

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

    -

    Create an account and try Notify for yourself.

    Features

    -

    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.

    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, or set up your own automated processes to manage replies.

    - +

    You can see and reply to the messages you receive, or set up your own automated processes to manage replies.

    Contact the team 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.

    -

    You can change the text message sender name from the default of 'GOVUK' in your service settings.

    Pricing

    Each service you set up 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.

    +

    +

    + - {% endblock %} From daf3d652d063d0c07dce9dc1ec8fe384eb407e59 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 08:34:36 +0100 Subject: [PATCH 046/151] Update How to pay Update How to pay --- app/templates/views/pricing.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 4421b9e8c..15f006c7e 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -123,8 +123,9 @@

    How to pay

    -

    Notify will send you an invoice after each quarter. If the value of an invoice is very small, we roll it into the next quarter to save time and effort.

    -

    You can find details of how to pay for Notify in our data sharing and financial agreement.

    +

    Before you can use Notify to send letters or pay for text messages you'll need to raise a Purchase Order (PO). You may need to set up the Cabinet Office as a supplier first.

    +

    Once you've done that, Notify will send you an invoice at the end of each quarter. If the value of an invoice is very small, we roll it into the next quarter to save time and effort.

    +

    Read our data sharing and financial agreement for more information.

    {{ agreement_info.as_pricing_paragraph( pricing_link=url_for('main.sign_in', next=url_for('main.pricing', _anchor='paying')), From c6cdd094bc4d855be743e80af131eca0425c50d0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 08:42:02 +0100 Subject: [PATCH 047/151] Add anchor link to How to pay Add anchor link to How to pay --- app/templates/views/pricing.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 15f006c7e..309e28cf6 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -33,6 +33,8 @@

  • 25,000 free text messages for other public sector services

    • It costs 1.58 pence (plus VAT) for each text message you send after your free allowance.

    + +

    See how to pay.

    Multiple services

    If your organisation offers multiple services, you can have a different Notify account for each of them.

    From 48af8b6383b8f744ba87ad3bfbbb3a336e96bfaa Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 09:03:08 +0100 Subject: [PATCH 048/151] Correct typo Correct typo --- app/templates/views/features/letters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index 13afcb728..fc5b1697d 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -25,7 +25,7 @@
  • personalise the content of your letter
  • 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 letters automatically.

    Choose your postage

    You can send letters by first or second class postage.

    From 5a049d5c7296615e6bfc5db6ebfda44ebdfdbe52 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 09:04:05 +0100 Subject: [PATCH 049/151] Correct typo Correct typo --- app/templates/views/features/email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 6bd3017fd..4fc7d4b48 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -25,7 +25,7 @@
  • personalise the content of your emails
  • 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 emails automatically.

    Email branding

    Add your organisation's logo and brand colour to email templates.

    From 27e177ddfa7c70c07cd9b4a1a05f413552738500 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 09:36:42 +0100 Subject: [PATCH 050/151] Updated text messages content Updated text messages content --- app/templates/views/pricing.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 309e28cf6..e95e78468 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -27,15 +27,14 @@

    It’s free to send emails through GOV.UK Notify.

    Text messages

    -

    You have a free allowance of text messages each financial year. You’ll get:

    +

    Each service you set up in Notify has a free annual 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 your free allowance.

    -

    See how to pay. - +

    Multiple services

    If your organisation offers multiple services, you can have a different Notify account for each of them.

    Each service will get its own free message allowance.

    From 893b1d65e879db09fdee6f7b0c71c24430edd479 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 09:53:32 +0100 Subject: [PATCH 051/151] Comment out document tracking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Comment out document tracking – it doesn't exist yet --- app/templates/views/features/email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 4fc7d4b48..ee7f4d8a3 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -37,7 +37,7 @@

    Notify uses encrypted links instead of email attachments because:

    • they're more secure
      • -
    • you can track when the recipient downloads your document
      • +
    • email attachments are often marked as spam

    Read the API documentation for more information.

    From 86404b73cadb1221cde81e8108003c620911bc14 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 09:55:39 +0100 Subject: [PATCH 052/151] Add contact line to Send a file Add contact line to Send a file --- app/templates/views/features/email.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index ee7f4d8a3..4d7e73146 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -40,6 +40,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.

    Add a reply-to address

    From 5ae0df241dce9ba6df22ffce146ad2c869c477b5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 11:12:49 +0100 Subject: [PATCH 053/151] Edit reply-to address information Edit reply-to address information --- app/templates/views/features/email.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/email.html index 4d7e73146..dba9543be 100644 --- a/app/templates/views/features/email.html +++ b/app/templates/views/features/email.html @@ -44,7 +44,7 @@

    Read the API documentation for more information.

    Add a reply-to address

    -

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

    +

    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.

    You can add reply-to addresses in your service settings.

    From 9737266ec081b8b9ab43b16acf3ba901fdfcd3b0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 12:00:42 +0100 Subject: [PATCH 054/151] Update report information Update report information --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 3686ef1d4..3369e818a 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -16,8 +16,8 @@

    What happens when you send a message // Message states you’ll see in Notify

    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 use our API to check the status of your messages too.

    +

    For security, this information is only available for X days after a message has been sent. You can download a list of sent messages for your own records.

    Read our documentation for a detailed list of API message statuses.

    Date: Fri, 5 Apr 2019 12:03:01 +0100 Subject: [PATCH 055/151] Updated status description --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 3369e818a..c9e6dc4d6 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -39,7 +39,7 @@

    The provider could not deliver the message because the email address or phone number was wrong.

    You should remove these email addresses or phone numbers from your database.

    You’ll still be charged for text messages to numbers that do not exist.

    -

    Inbox/phone not accepting messages right now

    +

    Inbox or phone not accepting messages right now

    The provider could not deliver the message after trying for 72 hours.

    This can happen when the recipient’s inbox is full or their phone is off.

    You can try to send the message again.

    From 4827c7f4babea59f57987f8dc846b29906015025 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 12:04:07 +0100 Subject: [PATCH 056/151] Add - to back-office Add - to back-office --- 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 86501242a..91495f9eb 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -37,7 +37,7 @@

    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.

    API integration

    -

    You can integrate the GOV.UK Notify API with your web application or back office system to send messages automatically.

    +

    You can integrate the GOV.UK Notify API with your web application or back-office system to send messages automatically.

    Read our API documentation for more information.

    Reporting

    From 574f7bb149a5bf6bba89803e90de7072af92bae3 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 12:23:40 +0100 Subject: [PATCH 057/151] Format statuses as a table Format statuses as a table --- app/templates/views/message-status.html | 77 +++++++++++++++---------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index c9e6dc4d6..556fa9ace 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -19,7 +19,6 @@

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

    For security, this information is only available for X days after a message has been sent. You can download a list of sent messages for your own records.

    -

    Read our documentation for a detailed list of API message statuses.

    A picture of the sending flow of messages in Notify, showing the three states of Sending, Delivered, And Failed. Also shows the next @@ -27,36 +26,56 @@ temporary failures -

    Message status – emails and text messages

    -

    Sending

    -

    GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.

    -

    Sent internationally (text messages only)

    -

    The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.

    -

    Delivered

    -

    The message was successfully delivered.

    -

    Notify will not tell you if a user has opened or read a message.

    -

    Phone number or email address does not exist

    -

    The provider could not deliver the message because the email address or phone number was wrong. -

    You should remove these email addresses or phone numbers from your database.

    -

    You’ll still be charged for text messages to numbers that do not exist.

    -

    Inbox or phone not accepting messages right now

    -

    The provider could not deliver the message after trying for 72 hours.

    -

    This can happen when the recipient’s inbox is full or their phone is off.

    -

    You can try to send the message again.

    -

    You’ll still be charged for text messages to phones that are not accepting messages.

    -

    Technical failure

    -

    Your message was not sent because there was a problem between Notify and the provider.

    -

    You’ll have to try sending your messages again.

    -

    You will not be charged for text messages that are affected by a technical failure.

    +

    Message states you’ll see in Notify

    + +

    Emails and text messages

    +
    + {% call mapping_table( + caption='Message statuses – email and text message', + field_headings=['Status', 'Description'], + field_headings_visible=True, + caption_visible=False + ) %} + {% for message_length, charge in [ + ('Sending', 'GOV.UK Notify has sent the message to the provider. The provider will try to deliver the message to the recipient. GOV.UK Notify is waiting for delivery information.'), + ('Sent internationally (text messages only)', 'The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.'), + ('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'), + ('Phone number or email address does not exist', 'The provider could not deliver the message because the email address or phone number was wrong. You should remove these email addresses or phone numbers from your database. You’ll still be charged for text messages to numbers that do not exist.'), + ('Inbox or phone not accepting messages right now', 'The provider could not deliver the message after trying for 72 hours. This can happen when the recipient’s inbox is full or their phone is off. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'), + ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'), + ] %} + {% call row() %} + {{ text_field(message_length) }} + {{ text_field(charge) }} + {% endcall %} + {% endfor %} + {% endcall %} +
    -

    Message status – letters

    -

    Sent

    -

    GOV.UK Notify has sent the letter to the provider to be printed.

    -

    Cancelled

    -

    Sending cancelled. Your letter will not be printed or dispatched.

    -

    Technical failure

    -

    GOV.UK Notify had an unexpected error while sending to our printing provider.

    +

    +
    + {% call mapping_table( + caption='Letters', + field_headings=['Status', 'Description'], + field_headings_visible=True, + caption_visible=False + ) %} + {% for message_length, charge in [ + ('Sent', 'GOV.UK Notify has sent the letter to the provider to be printed.'), + ('Cancelled', 'Sending cancelled. Your letter will not be printed or dispatched.'), + ('Technical failure', 'GOV.UK Notify had an unexpected error while sending to our printing provider.'), + ] %} + {% call row() %} + {{ text_field(message_length) }} + {{ text_field(charge) }} + {% endcall %} + {% endfor %} + {% endcall %} +
    + +

    Read our documentation for a detailed list of API message statuses.

    +
    From 4f2ff24d6d4945e9472e1f00f2da2c4f216472e1 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 14:58:01 +0100 Subject: [PATCH 058/151] Fix heading and table label Fix heading and table label --- 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 556fa9ace..283bc767e 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -52,10 +52,10 @@ {% endcall %}
    -

    +

    Letters

    {% call mapping_table( - caption='Letters', + caption='Message statuses – letters', field_headings=['Status', 'Description'], field_headings_visible=True, caption_visible=False From d7fe5eb3bb5791a92d8e87c4f8b30c711a3890c0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 15:33:25 +0100 Subject: [PATCH 059/151] Update introduction Update introduction --- app/templates/views/message-status.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 283bc767e..c67fedc8b 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -13,11 +13,11 @@
    -

    What happens when you send a message // Message states you’ll see in Notify

    +

    What happens when you send a message

    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 use our API to check the status of your messages too.

    -

    For security, this information is only available for X days after a message has been sent. You can download a list of sent messages for your own records.

    +

    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.

    -

    Message states you’ll see in Notify

    +

    Message statuses you’ll see in Notify

    Emails and text messages

    From 28a2023762ae7bfe3472bcc81e2f3bb1ac93910f Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Apr 2019 15:38:01 +0100 Subject: [PATCH 060/151] Update links Update links --- app/templates/views/using-notify.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 175b6d15c..6d59ad6f9 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -17,10 +17,10 @@

    The information on this page has moved.

    -

    Use the links to find out more about:

    +

    Use the links below to find out more about:

      -
    • using Notify in trial mode
      • -
    • message statuses in Notify
      • +
    • trial mode
      • +
    • message statuses
    • email replies
    • text message replies
    • letters
      • From e61213153dd537f0c75b39f58b8af22d9c8dea13 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 9 Apr 2019 09:47:49 +0100 Subject: [PATCH 061/151] Update filename Update filename --- app/templates/views/features/{email.html => emails.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/views/features/{email.html => emails.html} (100%) diff --git a/app/templates/views/features/email.html b/app/templates/views/features/emails.html similarity index 100% rename from app/templates/views/features/email.html rename to app/templates/views/features/emails.html From adf02729bcb279af462f65c1cc2d72b8199efd11 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 9 Apr 2019 14:04:49 +0100 Subject: [PATCH 062/151] Update introduction Update introduction --- app/templates/views/support/index.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 7c909aff5..4c3b774a1 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -13,6 +13,7 @@

      Support

      +

      We provide 24-hour online support for teams with a live service on GOV.UK Notify.

      {% call form_wrapper(class="bottom-gutter-2") %} {{ radios(form.support_type) }} @@ -21,13 +22,11 @@

      If something’s wrong, you can check the GOV.UK Notify system status page to see if we’re already aware of it.

      -

      24-hour support

      -

      You can get 24-hour online support for Notify if you have a live account.

      -

      During office hours

      +

      During office hours

      Our office hours are 9.30am to 5.30pm, Monday to Friday.

      Contact us using one of the options on this page and you’ll get a reply within 30 minutes.

      You can also get in touch with us on Slack.

      -

      Out-of-hours

      +

      Out-of-hours

      Outside office hours, response times depend on whether you’re reporting an emergency or not.

      If it’s an emergency, we’ll reply within 30 minutes and update you every hour until the problem’s fixed.

      A problem is only classed as an emergency if:

      From 23c772f5b8eb2afd8df1d8d349793de2217b6a3b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 9 Apr 2019 14:06:18 +0100 Subject: [PATCH 063/151] Update status page link Update status page link --- app/templates/views/support/index.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 4c3b774a1..191ec0301 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -20,8 +20,13 @@ {{ page_footer('Continue') }} {% endcall %} -

      If something’s wrong, you can check the GOV.UK Notify system status page to see if we’re already aware of it.

      - +
      +

      + Check our system status + page to see if there are any known issues with GOV.UK Notify. +

      +
      +

      During office hours

      Our office hours are 9.30am to 5.30pm, Monday to Friday.

      Contact us using one of the options on this page and you’ll get a reply within 30 minutes.

      From fce2c709f6c3f594fc2b9c24018b9e9d1a44b240 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 9 Apr 2019 15:06:09 +0100 Subject: [PATCH 064/151] Update Slack contact information Update Slack contact information --- app/templates/views/support/index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 191ec0301..96eae6ad9 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -20,6 +20,8 @@ {{ page_footer('Continue') }} {% endcall %} +

      You can also get in touch with us on Slack.

      +

      Check our system status @@ -29,8 +31,8 @@

      During office hours

      Our office hours are 9.30am to 5.30pm, Monday to Friday.

      -

      Contact us using one of the options on this page and you’ll get a reply within 30 minutes.

      -

      You can also get in touch with us on Slack.

      +

      Contact us using the form on this page or send us a message on Slack and you’ll get a reply within 30 minutes.

      +

      Out-of-hours

      Outside office hours, response times depend on whether you’re reporting an emergency or not.

      If it’s an emergency, we’ll reply within 30 minutes and update you every hour until the problem’s fixed.

      From a42e79ea2dc66ff39f4d9095662fc04319ca138d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 9 Apr 2019 15:08:14 +0100 Subject: [PATCH 065/151] Comment out agreement link Comment out agreement link. Removed link to help reduce the number of signed agreements submitted without completing the request to go live. The agreement doesn't contain any more information than the new How to pay content. --- app/templates/views/pricing.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index e95e78468..4ad9537c8 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -126,7 +126,7 @@

      How to pay

      Before you can use Notify to send letters or pay for text messages you'll need to raise a Purchase Order (PO). You may need to set up the Cabinet Office as a supplier first.

      Once you've done that, Notify will send you an invoice at the end of each quarter. If the value of an invoice is very small, we roll it into the next quarter to save time and effort.

      -

      Read our data sharing and financial agreement for more information.

      +
      From 8ad545ba354ff41637bc39d53c4a65b4bb135ab7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 9 Apr 2019 15:16:50 +0100 Subject: [PATCH 066/151] Add pages to nav --- app/main/views/index.py | 24 +++++++++++++++++++ app/main/views/sub_navigation_dictionaries.py | 12 ++++++++++ 2 files changed, 36 insertions(+) diff --git a/app/main/views/index.py b/app/main/views/index.py index 1247c0aa2..eab2c3921 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -236,6 +236,30 @@ def roadmap(): ) +@main.route('/features/email') +def features_email(): + return render_template( + 'views/features/emails.html', + navigation_links=features_nav() + ) + + +@main.route('/features/sms') +def features_sms(): + return render_template( + 'views/features/text-messages.html', + navigation_links=features_nav() + ) + + +@main.route('/features/letters') +def features_letters(): + return render_template( + 'views/features/letters.html', + navigation_links=features_nav() + ) + + @main.route('/features/security', endpoint='security') def security(): return render_template( diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index b6ab788bc..19c3f7e4e 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -4,6 +4,18 @@ def features_nav(): "name": "Features", "link": "main.features", }, + { + "name": "Emails", + "link": "main.features_email", + }, + { + "name": "Text messages", + "link": "main.features_sms", + }, + { + "name": "Letters", + "link": "main.features_letters", + }, { "name": "Roadmap", "link": "main.roadmap", From c9bfca3c32a49ec0a5e2e42200fd2a5901717749 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 9 Apr 2019 15:18:21 +0100 Subject: [PATCH 067/151] Fix HTML on letters page --- app/templates/views/features/letters.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index fc5b1697d..5ebbecd17 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -13,12 +13,12 @@ {{ sub_navigation(navigation_links) }}
    - +

    Letters

    GOV.UK Notify will print, pack and post your letters for you.

    Create an account and try Notify for yourself.

    - -

    Features

    + +

    Features

    Notify makes it easy to:

    • create reusable letter templates
      • @@ -27,15 +27,15 @@

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

    -

    Choose your postage

    +

    Choose your postage

    You can send letters by first or second class postage.

    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.

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

    - +

    Pricing

    It costs between 30p and 76p to send a letter. Prices include:

      @@ -49,5 +49,5 @@
    - + {% endblock %} From 22cbd8fd11757bd73ddafb903fbe241c2a554fad Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 9 Apr 2019 15:20:40 +0100 Subject: [PATCH 068/151] remove create account CTA if user signed in --- app/templates/views/features.html | 34 ++++++++++--------- app/templates/views/features/emails.html | 18 +++++----- app/templates/views/features/letters.html | 4 ++- .../views/features/text-messages.html | 12 ++++--- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 91495f9eb..0c1d8254d 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -23,27 +23,29 @@
  • letters

    • You don’t need any technical knowledge to use Notify.

    -

    Create an account for free and try it yourself.

    + {% if not current_user.is_authenticated %} +

    Create an account for free and try it yourself.

    + {% endif %}

    Reusable message templates

    To send an email, text or letter with Notify, first create a reusable message template.

    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.

    If you want to include the recipient's name or a reference number in your message, you can add a placeholder. Placeholders get filled in each time you send a message. You can do this manually or upload a list of personal details and let Notify do it for you.

    - +

    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.

    - +

    API integration

    You can integrate the GOV.UK 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 message statuses.

    - +

    Permissions

    Control which members of your team can see, create, edit and send messages.

    Notify lets you:

    @@ -52,7 +54,7 @@
  • invite team members who don’t have a government email address
  • choose who else can manage team members
    • - +

    Performance

    GOV.UK Notify commits to:

      @@ -61,24 +63,24 @@

    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.

    - +

    Security

    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've been sent. This means that only the recipient can see that information.

    - +

    Two-factor authentication

    Notify uses 2FA to keep your account secure. Every time you sign in, we'll send a unique one-time code to your phone and ask you to enter it first.

    -

    Read more about security. - +

    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.

    - +

    Find out more about support.

    +
    - + {% endblock %} diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index dba9543be..2b3a4f1b1 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -13,11 +13,13 @@ {{ sub_navigation(navigation_links) }}
    - +

    Emails

    -

    Send an unlimited number of emails for free with GOV.UK Notify.

    -

    Create an account and try Notify for yourself.

    - +

    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.

    + {% endif %} +

    Features

    Notify makes it easy to:

      @@ -42,17 +44,17 @@

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

    Read the 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.

    You can add reply-to addresses in your service settings.

    - +

    Pricing

    It’s free to send emails through GOV.UK Notify.

    See pricing for more details.

    - +
    - + {% endblock %} diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index 5ebbecd17..5dcd9606e 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -16,7 +16,9 @@

    Letters

    GOV.UK Notify will print, pack and post your letters for you.

    -

    Create an account and try Notify for yourself.

    + {% if not current_user.is_authenticated %} +

    Create an account and try Notify for yourself.

    + {% endif %}

    Features

    Notify makes it easy to:

    diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index a0a1deb91..47223e127 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -13,10 +13,12 @@ {{ sub_navigation(navigation_links) }}
    - +

    Text messages

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

    + {% if not current_user.is_authenticated %}

    Create an account and try Notify for yourself.

    + {% endif %}

    Features

    Notify makes it easy to:

    @@ -28,15 +30,15 @@

    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, or set up your own automated processes to manage replies.

    +

    You can see and reply to the messages you receive, or set up your own automated processes to manage replies.

    Contact the team 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.

    You can change the text message sender name from the default of 'GOVUK' in your service settings.

    Pricing

    -

    Each service you set up has a free annual allowance. After that it costs 1.58 pence (plus VAT) to send a text to a UK number.

    +

    Each service you set up 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
      • @@ -45,6 +47,6 @@

    - + {% endblock %} From 5a9c25d6bea5d5e0a73923674f0d03b21c86af69 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 9 Apr 2019 15:24:07 +0100 Subject: [PATCH 069/151] Add message status page --- app/main/views/index.py | 8 ++++++++ app/main/views/sub_navigation_dictionaries.py | 4 ++++ app/templates/views/message-status.html | 7 ++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index eab2c3921..15b700fe4 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -285,6 +285,14 @@ def using_notify(): ) +@main.route('/features/messages-status') +def message_status(): + return render_template( + 'views/message-status.html', + navigation_links=features_nav() + ) + + # --- Redirects --- # @main.route('/roadmap', endpoint='old_roadmap') diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 19c3f7e4e..4994203d8 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -32,4 +32,8 @@ def features_nav(): "name": "Using Notify", "link": "main.using_notify", }, + { + "name": "Message status", + "link": "main.message_status", + }, ] diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index c67fedc8b..0bfd067d0 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -1,5 +1,6 @@ {% extends "withoutnav_template.html" %} {% from "components/sub-navigation.html" import sub_navigation %} +{% from "components/table.html" import mapping_table, row, text_field %} {% block per_page_title %} What happens when you send a message OR Message states you’ll see in Notify @@ -27,7 +28,7 @@ style="width: 100%;" >

    Message statuses you’ll see in Notify

    - +

    Emails and text messages

    {% call mapping_table( @@ -72,10 +73,10 @@ {% endfor %} {% endcall %}
    - +

    Read our documentation for a detailed list of API message statuses.

    - + From 5968f23fd59968ba6e39537a44364df32c687c4b Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 9 Apr 2019 15:27:33 +0100 Subject: [PATCH 070/151] Add new trial mode page --- app/main/views/index.py | 18 +++++++++++++----- app/main/views/sub_navigation_dictionaries.py | 4 ++++ app/templates/views/trial-mode.html | 10 +++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 15b700fe4..defad3404 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -60,11 +60,6 @@ def privacy(): return render_template('views/privacy.html') -@main.route('/trial-mode') -def trial_mode(): - return redirect(url_for('.using_notify') + '#trial-mode', 301) - - @main.route('/pricing') def pricing(): return render_template( @@ -293,6 +288,19 @@ def message_status(): ) +@main.route('/trial-mode') +def trial_mode(): + return redirect(url_for('.trial_mode_new'), 301) + + +@main.route('/features/trial-mode') +def trial_mode_new(): + return render_template( + 'views/trial-mode.html', + navigation_links=features_nav() + ) + + # --- Redirects --- # @main.route('/roadmap', endpoint='old_roadmap') diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 4994203d8..c2e178990 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -36,4 +36,8 @@ def features_nav(): "name": "Message status", "link": "main.message_status", }, + { + "name": "Trial mode", + "link": "main.trial_mode_new", + }, ] diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 3a39e4ad0..8d0f2acf2 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -22,7 +22,7 @@
  • send messages to you and other people in your team
  • create draft letters, but not send them
    • - +

    To remove these restrictions, you can {% if current_service and current_service.trial_mode %} @@ -33,13 +33,13 @@

    Before you can request to go live, you must:

    -
      +
      • sign our data sharing and financial agreement
      • accept our terms of use
      • set up your service so you're ready to send and receive messages
      - - + + - + {% endblock %} From d4dfaa1e17752cb94b22414b703db5a54e255381 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 9 Apr 2019 15:33:28 +0100 Subject: [PATCH 071/151] =?UTF-8?q?Link=20to=20new=20pages=20from=20using?= =?UTF-8?q?=20Notify,=20specify=20that=20it=20shouldn=E2=80=99t=20be=20ind?= =?UTF-8?q?ex=20by=20search=20engines=20any=20more=20(by=20setting=20HTTP?= =?UTF-8?q?=20status=20to=20410=20GONE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/main/views/index.py | 2 +- app/templates/views/using-notify.html | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index defad3404..dc346733f 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -277,7 +277,7 @@ def using_notify(): return render_template( 'views/using-notify.html', navigation_links=features_nav() - ) + ), 410 @main.route('/features/messages-status') diff --git a/app/templates/views/using-notify.html b/app/templates/views/using-notify.html index 6d59ad6f9..ba475ba94 100644 --- a/app/templates/views/using-notify.html +++ b/app/templates/views/using-notify.html @@ -14,18 +14,18 @@

      Using Notify

      - +

      The information on this page has moved.

      - +

      Use the links below to find out more about:

      - +
      diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index 211d2b25e..3f90b1a20 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -64,7 +64,7 @@ def test_robots(client): @pytest.mark.parametrize('view', [ - 'cookies', 'privacy', 'using_notify', 'pricing', 'terms', 'roadmap', + 'cookies', 'privacy', 'pricing', 'terms', 'roadmap', 'features', 'callbacks', 'documentation', 'security' ]) def test_static_pages( @@ -75,26 +75,6 @@ def test_static_pages( assert not page.select_one('meta[name=description]') -@pytest.mark.parametrize('view, expected_anchor', [ - ('delivery_and_failure', 'messagedeliveryandfailure'), - ('trial_mode', 'trial-mode'), -]) -def test_old_static_pages_redirect_to_using_notify_with_anchor( - client_request, - view, - expected_anchor, -): - client_request.get( - 'main.{}'.format(view), - _expected_status=301, - _expected_redirect=url_for( - 'main.using_notify', - _anchor=expected_anchor, - _external=True - ), - ) - - @pytest.mark.parametrize('view, expected_view', [ ('information_risk_management', 'security'), ('old_integration_testing', 'integration_testing'), @@ -103,6 +83,7 @@ def test_old_static_pages_redirect_to_using_notify_with_anchor( ('old_terms', 'terms'), ('information_security', 'using_notify'), ('old_using_notify', 'using_notify'), + ('delivery_and_failure', 'message_status'), ]) def test_old_static_pages_redirect( client, @@ -117,6 +98,10 @@ def test_old_static_pages_redirect( ) +def test_old_using_notify_page(client_request): + client_request.get('main.using_notify', _expected_status=410) + + def test_old_integration_testing_page( client_request, ): @@ -148,28 +133,10 @@ def test_terms_is_generic_if_user_is_not_logged_in( ) -def test_pricing_is_generic_if_user_is_not_logged_in( - client -): - response = client.get(url_for('main.pricing')) - assert response.status_code == 200 - page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') - last_paragraph = page.select('main p')[-1] - assert normalize_spaces(last_paragraph.text) == ( - 'Sign in to download a copy or find out if one is already ' - 'in place with your organisation.' - ) - assert last_paragraph.select_one('a')['href'] == url_for( - 'main.sign_in', - next=url_for('main.pricing', _anchor='paying'), - ) - - @pytest.mark.parametrize(( 'email_address,' 'expected_terms_paragraph,' 'expected_terms_link,' - 'expected_pricing_paragraph' ), [ ( 'test@cabinet-office.gov.uk', @@ -178,10 +145,6 @@ def test_pricing_is_generic_if_user_is_not_logged_in( 'the GOV.UK Notify data sharing and financial agreement.' ), None, - ( - 'Download the agreement ' - '(Cabinet Office has already accepted it).' - ), ), ( 'test@aylesburytowncouncil.gov.uk', @@ -194,10 +157,6 @@ def test_pricing_is_generic_if_user_is_not_logged_in( url_for, 'main.agreement', ), - ( - 'Download the agreement ' - '(Aylesbury Town Council hasn’t accepted it yet).' - ), ), ( 'larry@downing-street.gov.uk', @@ -211,10 +170,6 @@ def test_pricing_is_generic_if_user_is_not_logged_in( url_for, 'main.agreement', ), - ( - 'Download the agreement or contact us to find out if ' - 'we already have one in place with your organisation.' - ), ), ( 'michael.fish@metoffice.gov.uk', @@ -226,10 +181,6 @@ def test_pricing_is_generic_if_user_is_not_logged_in( url_for, 'main.agreement', ), - ( - 'Download the agreement (Met Office hasn’t accepted it ' - 'yet).' - ), ), ]) def test_terms_tells_logged_in_users_what_we_know_about_their_agreement( @@ -239,19 +190,17 @@ def test_terms_tells_logged_in_users_what_we_know_about_their_agreement( email_address, expected_terms_paragraph, expected_terms_link, - expected_pricing_paragraph, ): user = active_user_with_permissions(fake_uuid) user.email_address = email_address mocker.patch('app.user_api_client.get_user', return_value=user) terms_page = client_request.get('main.terms') - pricing_page = client_request.get('main.pricing') + assert normalize_spaces(terms_page.select('main p')[1].text) == expected_terms_paragraph if expected_terms_link: assert terms_page.select_one('main p a')['href'] == expected_terms_link() else: assert not terms_page.select_one('main p').select('a') - assert normalize_spaces(pricing_page.select('main p')[-1].text) == expected_pricing_paragraph def test_css_is_served_from_correct_path(client_request): From 2c62409dbd150bd69020cbdc8648610aa62c6338 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 11 Apr 2019 16:32:02 +0100 Subject: [PATCH 093/151] Update status information --- app/templates/views/message-status.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index d7634edf4..b5dbbed3b 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -3,7 +3,7 @@ {% from "components/table.html" import mapping_table, row, text_field %} {% block per_page_title %} - Message statuses + Message status {% endblock %} {% block maincolumn_content %} @@ -29,9 +29,9 @@ >

      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 status types.

      +

      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.

      -

      Email

      +

      Emails

      {% call mapping_table( caption='Message statuses – emails', @@ -89,7 +89,7 @@ {% for message_length, charge in [ ('Sent', 'Notify has sent the letter to the provider to be printed.'), ('Cancelled', 'Sending cancelled. Your letter will not be printed or dispatched.'), - ('Technical failure', 'Notify had an unexpected error while sending to our printing provider.'), + ('Technical failure', 'Notify had an unexpected error while sending the letter to our printing provider.'), ] %} {% call row() %} {{ text_field(message_length) }} From d53499ed11b3592e4256e78f9a7186544760cf02 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 11 Apr 2019 16:32:48 +0100 Subject: [PATCH 094/151] Correct 'message status' nav label --- app/main/views/sub_navigation_dictionaries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 8ec428c51..31472b128 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -25,7 +25,7 @@ def features_nav(): "link": "main.trial_mode_new", }, { - "name": "Message statuses", + "name": "Message status", "link": "main.message_status", }, { From ea00f901fb486f36f75916f84a9e07505f114079 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Apr 2019 11:47:38 +0100 Subject: [PATCH 095/151] Clarify scheduling information Clarify scheduling information --- 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 6bd981ef4..e2de1eaa7 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -36,7 +36,7 @@

      If you want to include personalised content in your message, you can add a placeholder. Placeholders are filled in with details, like a name or reference number, each time you send a message. You can do this manually or upload a list of personal details and let Notify do it for you.

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

      From 747b68a2724a49b11d8856c0d58abc7ec608962c Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 12 Apr 2019 11:48:06 +0100 Subject: [PATCH 096/151] Remove reference to scheduling Remove reference to scheduling --- app/templates/views/features/letters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index b372866c2..7d6056872 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 and schedule bulk messages
        • +
      • send bulk messages

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

      From 2747be3ac0ad9de3794fe46a119b6a8ae5f0290a Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 12 Apr 2019 16:49:34 +0100 Subject: [PATCH 097/151] unpin patch version of python 3.5.5 is removed in the next version of python-buildpack --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index f0e4f4e5d..454452e35 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.5.5 +python-3.5.x From 116f36192f6278009ff87a0aa8c594d621d64c55 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 11 Apr 2019 16:40:25 +0100 Subject: [PATCH 098/151] Let inviting a user complete the go live checklist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At the moment you have to wait for whoever you’ve invited to accept the invitation before you can go live. Since this check is mainly for the benefit of the service, not us, we should trust that people’s intentions are good when they invite someone. So this commit also checks the invited users when counting how many team members a service has. --- app/models/service.py | 8 ++++-- app/notify_client/invite_api_client.py | 9 ++++++ tests/app/main/views/test_service_settings.py | 28 ++++++++++++++++--- tests/conftest.py | 19 +++++++++++++ 4 files changed, 58 insertions(+), 6 deletions(-) diff --git a/app/models/service.py b/app/models/service.py index dea52c3dc..14219b709 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -112,8 +112,12 @@ class Service(JSONModel): @cached_property def has_team_members(self): - return user_api_client.get_count_of_users_with_permission( - self.id, 'manage_service' + return ( + user_api_client.get_count_of_users_with_permission( + self.id, 'manage_service' + ) + invite_api_client.get_count_of_invites_with_permission( + self.id, 'manage_service' + ) ) > 1 def cancel_invite(self, invited_user_id): diff --git a/app/notify_client/invite_api_client.py b/app/notify_client/invite_api_client.py index 5cb856713..e07291e24 100644 --- a/app/notify_client/invite_api_client.py +++ b/app/notify_client/invite_api_client.py @@ -1,5 +1,6 @@ from app.models.user import ( InvitedUser, + roles, translate_permissions_from_admin_roles_to_db, ) from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache @@ -44,6 +45,14 @@ class InviteApiClient(NotifyAdminAPIClient): '/service/{}/invite'.format(service_id) )['data'] + def get_count_of_invites_with_permission(self, service_id, permission): + if permission not in roles.keys(): + raise TypeError('{} is not a valid permission'.format(permission)) + return len([ + invited_user for invited_user in self.get_invites_for_service(service_id) + if invited_user.has_permission_for_service(service_id, permission) + ]) + def check_token(self, token): resp = self.get(url='/invite/service/{}'.format(token)) return InvitedUser(**resp['data']) diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 78d25e59c..9f2fbdfc3 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -617,6 +617,7 @@ def test_should_check_if_estimated_volumes_provided( mock_get_service_templates, mock_get_users_by_service, mock_get_service_organisation, + mock_get_invites_for_service, volumes, consent_to_research, expected_estimated_volumes_item, @@ -649,9 +650,14 @@ def test_should_check_if_estimated_volumes_provided( ) -@pytest.mark.parametrize('count_of_users_with_manage_service, expected_user_checklist_item', [ - (1, 'Add a team member who can manage settings, team and usage Not completed'), - (2, 'Add a team member who can manage settings, team and usage Completed'), +@pytest.mark.parametrize(( + 'count_of_users_with_manage_service,' + 'count_of_invites_with_manage_service,' + 'expected_user_checklist_item' +), [ + (1, 0, 'Add a team member who can manage settings, team and usage Not completed'), + (2, 0, 'Add a team member who can manage settings, team and usage Completed'), + (1, 1, 'Add a team member who can manage settings, team and usage Completed'), ]) @pytest.mark.parametrize('count_of_templates, expected_templates_checklist_item', [ (0, 'Add templates with examples of the content you plan to send Not completed'), @@ -679,6 +685,7 @@ def test_should_check_for_sending_things_right( mock_get_service_organisation, single_sms_sender, count_of_users_with_manage_service, + count_of_invites_with_manage_service, expected_user_checklist_item, count_of_templates, expected_templates_checklist_item, @@ -694,9 +701,13 @@ def test_should_check_for_sending_things_right( }.get(template_type) mock_count_users = mocker.patch( - 'app.main.views.service_settings.user_api_client.get_count_of_users_with_permission', + 'app.models.service.user_api_client.get_count_of_users_with_permission', return_value=count_of_users_with_manage_service ) + mock_count_invites = mocker.patch( + 'app.models.service.invite_api_client.get_count_of_invites_with_permission', + return_value=count_of_invites_with_manage_service + ) mock_templates = mocker.patch( 'app.models.service.Service.all_templates', @@ -734,6 +745,7 @@ def test_should_check_for_sending_things_right( assert normalize_spaces(checklist_items[3].text) == expected_reply_to_checklist_item mock_count_users.assert_called_once_with(SERVICE_ONE_ID, 'manage_service') + mock_count_invites.assert_called_once_with(SERVICE_ONE_ID, 'manage_service') assert mock_templates.called is True if count_of_email_templates: @@ -753,6 +765,7 @@ def test_should_not_show_go_live_button_if_checklist_not_complete( mock_get_service_templates, mock_get_users_by_service, mock_get_service_organisation, + mock_get_invites_for_service, single_sms_sender, checklist_completed, agreement_signed, @@ -893,6 +906,7 @@ def test_should_check_for_sms_sender_on_go_live( service_one, mocker, mock_get_service_organisation, + mock_get_invites_for_service, organisation_type, count_of_sms_templates, sms_senders, @@ -971,6 +985,7 @@ def test_should_check_for_mou_on_request_to_go_live( service_one, mocker, agreement_signed, + mock_get_invites_for_service, expected_item, ): mocker.patch( @@ -1015,6 +1030,7 @@ def test_should_check_for_mou_on_request_to_go_live( def test_non_gov_user_is_told_they_cant_go_live( client_request, api_nongov_user_active, + mock_get_invites_for_service, mocker, mock_get_service_organisation, ): @@ -1292,6 +1308,7 @@ def test_should_redirect_after_request_to_go_live( mock_get_service_settings_page_common, mock_get_service_templates, mock_get_users_by_service, + mock_get_invites_without_manage_permission, volumes, displayed_volumes, formatted_displayed_volumes, @@ -1577,6 +1594,7 @@ def test_route_permissions( single_reply_to_email_address, single_letter_contact_block, mock_get_service_organisation, + mock_get_invites_for_service, single_sms_sender, route, mock_get_service_settings_page_common, @@ -1610,6 +1628,7 @@ def test_route_invalid_permissions( service_one, route, mock_get_service_templates, + mock_get_invites_for_service, ): validate_route_permission( mocker, @@ -1642,6 +1661,7 @@ def test_route_for_platform_admin( route, mock_get_service_settings_page_common, mock_get_service_templates, + mock_get_invites_for_service, ): validate_route_permission(mocker, app_, diff --git a/tests/conftest.py b/tests/conftest.py index 6fa21eae0..ca6f95287 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2258,6 +2258,25 @@ def mock_get_invites_for_service(mocker, service_one, sample_invite): return mocker.patch('app.invite_api_client._get_invites_for_service', side_effect=_get_invites) +@pytest.fixture(scope='function') +def mock_get_invites_without_manage_permission(mocker, service_one, sample_invite): + + def _get_invites(service_id): + return [invite_json( + id_=str(sample_uuid()), + from_user=service_one['users'][0], + email_address='invited_user@test.gov.uk', + service_id=service_one['id'], + permissions='view_activity,send_messages,manage_api_keys', + created_at=str(datetime.utcnow()), + auth_type='sms_auth', + folder_permissions=[], + status='pending', + )] + + return mocker.patch('app.invite_api_client._get_invites_for_service', side_effect=_get_invites) + + @pytest.fixture(scope='function') def mock_check_invite_token(mocker, sample_invite): def _check_token(token): From d97707652fa708bb4b3c3a491d8ac3e55c127491 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 15 Apr 2019 15:22:50 +0100 Subject: [PATCH 099/151] Update links --- app/templates/views/features.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index e2de1eaa7..b26a99743 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -44,7 +44,7 @@

      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 how message status works.

      +

      Read more about how message status typesmessage status works.

      Permissions

      Control which members of your team can see, create, edit and send messages.

      @@ -74,7 +74,7 @@

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

      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.

      From 230ba7bcb1f2d3b6951c6500ac24caf5a66a9c2a Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 15 Apr 2019 15:28:37 +0100 Subject: [PATCH 100/151] Update link --- app/templates/views/pricing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index f9dc181bf..c7ad5d79b 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -25,7 +25,7 @@

      Create an account then set up as many different services as you need to. Each service has its own free text message allowance.

      {% endif %} -

      When you set up a new service it will start in trial mode.

      +

      When you set up a new service it will start in trial mode.

      Emails

      It’s free to send emails through Notify.

      From 839fc99f30fc8d70af666f67680b29e36b63dcba Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:04:12 +0100 Subject: [PATCH 101/151] Update links --- app/templates/views/features.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index b26a99743..fdd099fe2 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.

      @@ -78,7 +78,7 @@

      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.

      +

      Find out more about support.

      From 27d4b702cc8733e1fa9b8eb1978fcd769a30f189 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:16:19 +0100 Subject: [PATCH 102/151] Update links One left to do --- app/templates/views/features/emails.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index 57f80ec6d..4a9c17c87 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -17,7 +17,7 @@

      Emails

      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

      @@ -27,7 +27,7 @@
    • 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.

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

    @@ -52,7 +52,7 @@

    Pricing

    It’s free to send emails through Notify.

    -

    See pricing for more details.

    +

    See pricing for more details.

    From 6830a412de349561d900ed5b3daa43f407466b94 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:18:33 +0100 Subject: [PATCH 103/151] Update links --- app/templates/views/features/letters.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index 7d6056872..e1abc0a17 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -17,7 +17,7 @@

    Letters

    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

    @@ -27,7 +27,7 @@
  • personalise the content of your letter
  • send bulk messages
    • -

    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

    You can send letters by first or second class post.

    @@ -47,7 +47,7 @@
  • first or second class postage

    • Letters can be up to 10 pages long (5 double-sided sheets of paper).

    -

    See pricing for more details.

    +

    See pricing for more details.

    From fe8e10a42a200093cda593e3af993e189f5c5650 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:19:45 +0100 Subject: [PATCH 104/151] Update links One left to do --- app/templates/views/features/text-messages.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index 47223e127..c2fb113ea 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -17,7 +17,7 @@

    Text messages

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

    {% if not current_user.is_authenticated %} -

    Create an account and try Notify for yourself.

    +

    Create an account and try Notify for yourself.

    {% endif %}

    Features

    @@ -26,7 +26,7 @@
  • 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.

    @@ -43,7 +43,7 @@
    • 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.

    From d12c184d7e3b0551f240338dbacf6fb93df4e5c2 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:21:01 +0100 Subject: [PATCH 105/151] Update links --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index b5dbbed3b..b8411d133 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -29,7 +29,7 @@ >

    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 3f4ca1018d9349496c7855b6120297c4e4011147 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:23:10 +0100 Subject: [PATCH 106/151] Updated link --- app/templates/views/pricing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index c7ad5d79b..9f42b8fdd 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -22,7 +22,7 @@ {% if not current_user.is_authenticated %} -

    Create an account then set up as many different services as you need to. Each service has its own free text message allowance.

    +

    Create an account then set up as many different services as you need to. Each service has its own free text message allowance.

    {% endif %}

    When you set up a new service it will start in trial mode.

    From 487919970bfeb899a15d158416d22592ca26b992 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:25:02 +0100 Subject: [PATCH 107/151] Update 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 4a9c17c87..367c5b9ad 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -42,7 +42,7 @@
  • email attachments are often marked as spam
    • -

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

    +

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

    Read the API documentation for more information.

    Add a reply-to address

    From 521c7824d68fd7f182af3b0c8e51e4a144cd53c5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:25:33 +0100 Subject: [PATCH 108/151] Update link --- 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 c2fb113ea..cb0dd2052 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -31,7 +31,7 @@

    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, or set up your own automated processes to manage replies.

    -

    Contact the team to request a unique number for text message replies.

    +

    Contact the team 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.

    From 0bf1068a3eb470692688fc8f090f8e24489f58a2 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:34:46 +0100 Subject: [PATCH 109/151] Make the formatting of postage times consistent Make the formatting of postage times consistent with the rest of the service, and the GOV.UK style guide. --- app/main/views/jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 33c4d782e..c6fa2c76d 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -92,7 +92,7 @@ def view_job(service_id, job_id): version=job['template_version'] )['data'] - just_sent_message = 'Your {} been sent. Printing starts {} at 5.30pm.'.format( + just_sent_message = 'Your {} been sent. Printing starts {} at 5:30pm.'.format( 'letter has' if job['notification_count'] == 1 else 'letters have', printing_today_or_tomorrow() ) From f833a9bd678924c99f10fa1787a6f1f6d76a9a19 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:36:32 +0100 Subject: [PATCH 110/151] Make the formatting of postage times consistent --- tests/app/main/views/test_jobs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index a562cd33a..9d145a60e 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -360,7 +360,7 @@ def test_should_show_letter_job_with_banner_after_sending_before_1730( assert page.select('p.bottom-gutter') == [] assert normalize_spaces(page.select('.banner-default-with-tick')[0].text) == ( - 'Your letter has been sent. Printing starts today at 5.30pm.' + 'Your letter has been sent. Printing starts today at 5:30pm.' ) @@ -383,7 +383,7 @@ def test_should_show_letter_job_with_banner_when_there_are_multiple_CSV_rows( assert page.select('p.bottom-gutter') == [] assert normalize_spaces(page.select('.banner-default-with-tick')[0].text) == ( - 'Your letters have been sent. Printing starts today at 5.30pm.' + 'Your letters have been sent. Printing starts today at 5:30pm.' ) @@ -406,7 +406,7 @@ def test_should_show_letter_job_with_banner_after_sending_after_1730( assert page.select('p.bottom-gutter') == [] assert normalize_spaces(page.select('.banner-default-with-tick')[0].text) == ( - 'Your letter has been sent. Printing starts tomorrow at 5.30pm.' + 'Your letter has been sent. Printing starts tomorrow at 5:30pm.' ) From a384ae8f9bed95a890cc4522ce5c80e881811dc9 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:38:54 +0100 Subject: [PATCH 111/151] Make the formatting of postage times consistent --- tests/app/main/views/test_notifications.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index 2a99eb110..bac017551 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -416,7 +416,7 @@ def test_notification_page_shows_page_for_first_class_letter_notification( notification_id=fake_uuid, ) - assert normalize_spaces(page.select('main p:nth-of-type(2)')[0].text) == 'Printing starts tomorrow at 5.30pm' + assert normalize_spaces(page.select('main p:nth-of-type(2)')[0].text) == 'Printing starts tomorrow at 5:30pm' assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == 'Estimated delivery date: 5 January' assert normalize_spaces(page.select_one('.letter-postage').text) == ( 'Postage: first class' @@ -716,14 +716,14 @@ def test_should_show_image_of_precompiled_letter_notification( @pytest.mark.parametrize('created_at, current_datetime', [ ('2017-07-07T12:00:00+00:00', '2017-07-07 16:29:00'), # created today, summer ('2017-12-12T12:00:00+00:00', '2017-12-12 17:29:00'), # created today, winter - ('2017-12-12T21:30:00+00:00', '2017-12-13 17:29:00'), # created after 5.30 yesterday + ('2017-12-12T21:30:00+00:00', '2017-12-13 17:29:00'), # created after 5:30 yesterday ('2017-03-25T17:30:00+00:00', '2017-03-26 16:29:00'), # over clock change period on 2017-03-26 ]) def test_get_letter_printing_statement_when_letter_prints_today(created_at, current_datetime): with freeze_time(current_datetime): statement = get_letter_printing_statement('created', created_at) - assert statement == 'Printing starts today at 5.30pm' + assert statement == 'Printing starts today at 5:30pm' @pytest.mark.parametrize('created_at, current_datetime', [ @@ -734,7 +734,7 @@ def test_get_letter_printing_statement_when_letter_prints_tomorrow(created_at, c with freeze_time(current_datetime): statement = get_letter_printing_statement('created', created_at) - assert statement == 'Printing starts tomorrow at 5.30pm' + assert statement == 'Printing starts tomorrow at 5:30pm' @pytest.mark.parametrize('created_at, print_day', [ From b7c955c010c793e6610fdfd355ab289d2748fd32 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 10:39:50 +0100 Subject: [PATCH 112/151] Make the formatting of postage times consistent --- app/main/views/notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/notifications.py b/app/main/views/notifications.py index 00765ebbb..30611432e 100644 --- a/app/main/views/notifications.py +++ b/app/main/views/notifications.py @@ -153,7 +153,7 @@ def get_letter_printing_statement(status, created_at): created_at_dt = parser.parse(created_at).replace(tzinfo=None) if letter_can_be_cancelled(status, created_at_dt): - return 'Printing starts {} at 5.30pm'.format(printing_today_or_tomorrow()) + return 'Printing starts {} at 5:30pm'.format(printing_today_or_tomorrow()) else: printed_datetime = utc_string_to_aware_gmt_datetime(created_at) + timedelta(hours=6, minutes=30) printed_date = _format_datetime_short(printed_datetime) From 5f1482f223d3c8719b5ae5b203b97b4c045ae0cb Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 11:03:09 +0100 Subject: [PATCH 113/151] Correct time formatting --- tests/app/main/views/test_notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index bac017551..b856924ba 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -167,7 +167,7 @@ def test_notification_page_shows_page_for_letter_notification( "‘sample template’ was sent by Test User on 1 January at 1:01am" ) assert normalize_spaces(page.select('main p:nth-of-type(2)')[0].text) == ( - 'Printing starts today at 5.30pm' + 'Printing starts today at 5:30pm' ) assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == ( 'Estimated delivery date: 6 January' From 1d88324175a8978c03d6b5a45063d807b184c8a7 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Tue, 16 Apr 2019 13:09:15 +0100 Subject: [PATCH 114/151] Revert "Update diff-dom package to 3.1.0" This reverts commit 01b97986f6b24c956d20e1b4b6db8445b75c157f. --- app/assets/javascripts/updateContent.js | 2 +- gulpfile.js | 2 +- package.json | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/updateContent.js b/app/assets/javascripts/updateContent.js index eb94f33eb..516bd913f 100644 --- a/app/assets/javascripts/updateContent.js +++ b/app/assets/javascripts/updateContent.js @@ -2,7 +2,7 @@ "use strict"; var queues = {}; - var dd = new diffDOM.DiffDOM(); + var dd = new diffDOM(); var getRenderer = $component => response => dd.apply( $component.get(0), diff --git a/gulpfile.js b/gulpfile.js index 60533475f..15df27cb6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -105,7 +105,7 @@ const javascripts = () => { paths.npm + 'hogan.js/dist/hogan-3.0.2.js', paths.npm + 'jquery/dist/jquery.min.js', paths.npm + 'query-command-supported/dist/queryCommandSupported.min.js', - paths.npm + 'diff-dom/browser/diffDOM.js', + paths.npm + 'diff-dom/diffDOM.js', paths.npm + 'timeago/jquery.timeago.js', paths.npm + 'textarea-caret/index.js' ])) diff --git a/package.json b/package.json index 2273a1e9a..fabff510a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "@babel/core": "7.4.0", "@babel/preset-env": "7.4.2", - "diff-dom": "https://github.com/fiduswriter/diffDOM/archive/v3.1.0.tar.gz", + "diff-dom": "2.3.1", "govuk-elements-sass": "3.1.2", "govuk_frontend_toolkit": "8.1.0", "govuk_template_jinja": "0.24.1", @@ -45,8 +45,5 @@ "gulp-sass-lint": "1.4.0", "jshint": "2.10.2", "jshint-stylish": "2.2.1" - }, - "peerDependencies": { - "rollup": "1.10.0" } } From 891443457313cd32d460ebe7e9e29883fd387c64 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Tue, 16 Apr 2019 13:11:24 +0100 Subject: [PATCH 115/151] Bump diff-dom to latest without Object.entries Versions past this make use of Object.entries which is not supported in IE11 (so causes an error). This is meant to be taken care of by polyfills but our frontend build pipeline isn't set up to polyfill NPM modules at the moment. This moves the version bump to the latest that will still work with our current pipeline. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fabff510a..be991f89a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "@babel/core": "7.4.0", "@babel/preset-env": "7.4.2", - "diff-dom": "2.3.1", + "diff-dom": "2.5.1", "govuk-elements-sass": "3.1.2", "govuk_frontend_toolkit": "8.1.0", "govuk_template_jinja": "0.24.1", From 527d8ff10fe3c13319a1ad567982389ab495a2b9 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 13:49:46 +0100 Subject: [PATCH 116/151] Correct table --- app/templates/views/pricing.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 9f42b8fdd..7c019bed2 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -14,7 +14,7 @@

    Pricing

    -

    To use GOV.UK Notify, there’s:

    +

    To use GOV.UK Notify, there's:

    • no monthly charge
    • no setup fee
      • @@ -96,7 +96,7 @@
      {% call mapping_table( caption='Letter pricing', - field_headings=['', 'Second class', 'First class'], + field_headings=['Paper', 'Second class', 'First class'], field_headings_visible=True, caption_visible=False ) %} From 59e981030ae6877ab90ead85b12b6fd1f3a35606 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:43:10 +0100 Subject: [PATCH 117/151] Update app/templates/views/features/emails.html Co-Authored-By: karlchillmaid --- 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 367c5b9ad..a9941bc8f 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -38,7 +38,7 @@

      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
        • +
      • they’re more secure
      • email attachments are often marked as spam
      From 534c5b1986f593f24bfc759c081801a125e7fbf6 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:43:22 +0100 Subject: [PATCH 118/151] Update app/templates/views/features/letters.html Co-Authored-By: karlchillmaid --- app/templates/views/features/letters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index e1abc0a17..57697249d 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -31,7 +31,7 @@

      Choose your postage

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

      +

      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

      From 163f8561e1fdba0aa2ffa28b7d0db68f407f3eb4 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:43:34 +0100 Subject: [PATCH 119/151] Update app/templates/views/message-status.html Co-Authored-By: karlchillmaid --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index b8411d133..a4e7336ea 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -29,7 +29,7 @@ >

      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 232b8aa9c83c7544c103500dc4f11c5263eca342 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:43:43 +0100 Subject: [PATCH 120/151] Update app/templates/views/pricing.html Co-Authored-By: karlchillmaid --- app/templates/views/pricing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index 7c019bed2..b9d721115 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -14,7 +14,7 @@

      Pricing

      -

      To use GOV.UK Notify, there's:

      +

      To use GOV.UK Notify, there’s:

      • no monthly charge
      • no setup fee
        • From 78333b70b9102f7c361762d0152071bd50c5227e Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:43:53 +0100 Subject: [PATCH 121/151] Update app/templates/views/pricing.html Co-Authored-By: karlchillmaid --- app/templates/views/pricing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index b9d721115..c79707a2a 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -124,7 +124,7 @@

      How to pay

      -

      Before you can use Notify to send letters or pay for text messages you'll need to:

      +

      Before you can use Notify to send letters or pay for text messages you’ll need to:

      • send us a request to make your service live
      • sign our data sharing and financial agreement
        • From 99ef4d61fffe269591fa9c85fe250c2df183e9a3 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:44:02 +0100 Subject: [PATCH 122/151] Update app/templates/views/pricing.html Co-Authored-By: karlchillmaid --- app/templates/views/pricing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/pricing.html b/app/templates/views/pricing.html index c79707a2a..e54df2e7d 100644 --- a/app/templates/views/pricing.html +++ b/app/templates/views/pricing.html @@ -132,7 +132,7 @@

      You may need to set up the Cabinet Office as a supplier before you can raise a PO.

      -

      After you've done that, Notify will send you an invoice at the end of each quarter. If the value of an invoice is very small, we roll it into the next quarter to save time and effort.

      +

      After you’ve done that, Notify will send you an invoice at the end of each quarter. If the value of an invoice is very small, we roll it into the next quarter to save time and effort.

      From 8872e30567e74d9b3024d48ff91847913545d283 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:44:21 +0100 Subject: [PATCH 123/151] Update app/templates/views/support/index.html Co-Authored-By: karlchillmaid --- app/templates/views/support/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 5b50fa9a0..f2738d5f9 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -24,7 +24,7 @@

      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.

      +

      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.

      From 042a61a9305bf63e30c9a455254bde4d0caf0e70 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:44:37 +0100 Subject: [PATCH 124/151] Update app/templates/views/trial-mode.html Co-Authored-By: karlchillmaid --- app/templates/views/trial-mode.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 8d0f2acf2..5140fe4ba 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -20,7 +20,7 @@
      • send 50 text messages and emails per day
      • send messages to you and other people in your team
        • -
      • create draft letters, but not send them
        • +
      • create letter templates, but not send them

      From ae403c5b5a65403588555956c612be0fd21d2d59 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 14:44:45 +0100 Subject: [PATCH 125/151] Update app/templates/views/trial-mode.html Co-Authored-By: karlchillmaid --- app/templates/views/trial-mode.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index 5140fe4ba..1f4321d76 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -36,7 +36,7 @@

      • sign our data sharing and financial agreement
      • accept our terms of use
        • -
      • set up your service so you're ready to send and receive messages
        • +
      • set up your service so you’re ready to send and receive messages
      From 9547fedcc3723a9f92a5e9b63ae6dea22441081f Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 12 Apr 2019 11:05:45 +0100 Subject: [PATCH 126/151] move manifest to single jinja template uses the same pattern as other apps. Infers route based on app name, you can declare more in the dict at the top if you need to. --- Makefile | 23 +++++------ Procfile | 1 + manifest-base.yml | 46 --------------------- manifest-preview.yml | 7 ---- manifest-production.yml | 9 ----- manifest-prototype-2-base.yml | 30 -------------- manifest-prototype-2-preview.yml | 6 --- manifest-prototype-2-production.yml | 6 --- manifest-prototype-base.yml | 30 -------------- manifest-prototype-preview.yml | 6 --- manifest-prototype-production.yml | 6 --- manifest-prototype-staging.yml | 6 --- manifest-sandbox.yml | 6 --- manifest-staging.yml | 10 ----- manifest.yml.j2 | 57 ++++++++++++++++++++++++++ requirements.txt | 8 ++-- requirements_for_test.txt | 2 + scripts/generate_manifest.py | 63 ----------------------------- 18 files changed, 74 insertions(+), 248 deletions(-) create mode 100644 Procfile delete mode 100644 manifest-base.yml delete mode 100644 manifest-preview.yml delete mode 100644 manifest-production.yml delete mode 100644 manifest-prototype-2-base.yml delete mode 100644 manifest-prototype-2-preview.yml delete mode 100644 manifest-prototype-2-production.yml delete mode 100644 manifest-prototype-base.yml delete mode 100644 manifest-prototype-preview.yml delete mode 100644 manifest-prototype-production.yml delete mode 100644 manifest-prototype-staging.yml delete mode 100644 manifest-sandbox.yml delete mode 100644 manifest-staging.yml create mode 100644 manifest.yml.j2 delete mode 100755 scripts/generate_manifest.py diff --git a/Makefile b/Makefile index 6b6c3554e..b9fa7ef31 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,6 @@ CF_SPACE ?= ${DEPLOY_ENV} CF_HOME ?= ${HOME} $(eval export CF_HOME) -CF_MANIFEST_FILE ?= manifest-${CF_SPACE}.yml NOTIFY_CREDENTIALS ?= ~/.notify-credentials .PHONY: help @@ -195,12 +194,16 @@ cf-login: ## Log in to Cloud Foundry .PHONY: generate-manifest generate-manifest: + $(if ${CF_APP},,$(error Must specify CF_APP)) $(if ${CF_SPACE},,$(error Must specify CF_SPACE)) $(if $(shell which gpg2), $(eval export GPG=gpg2), $(eval export GPG=gpg)) $(if ${GPG_PASSPHRASE_TXT}, $(eval export DECRYPT_CMD=echo -n $$$${GPG_PASSPHRASE_TXT} | ${GPG} --quiet --batch --passphrase-fd 0 --pinentry-mode loopback -d), $(eval export DECRYPT_CMD=${GPG} --quiet --batch -d)) - @./scripts/generate_manifest.py ${CF_MANIFEST_FILE} \ - <(${DECRYPT_CMD} ${NOTIFY_CREDENTIALS}/credentials/${CF_SPACE}/paas/environment-variables.gpg) + @jinja2 --strict manifest.yml.j2 \ + -D environment=${CF_SPACE} \ + -D CF_APP=${CF_APP} \ + --format=yaml \ + <(${DECRYPT_CMD} ${NOTIFY_CREDENTIALS}/credentials/${CF_SPACE}/paas/environment-variables.gpg) 2>&1 .PHONY: cf-deploy cf-deploy: ## Deploys the app to Cloud Foundry @@ -213,18 +216,12 @@ cf-deploy: ## Deploys the app to Cloud Foundry cf delete -f notify-admin-rollback .PHONY: cf-deploy-prototype -cf-deploy-prototype: cf-target ## Deploys the app to Cloud Foundry - $(if ${CF_SPACE},,$(error Must specify CF_SPACE)) - (make -s CF_MANIFEST_FILE=manifest-prototype-${CF_SPACE}.yml generate-manifest) > /tmp/admin_manifest.yml - cf push -f /tmp/admin_manifest.yml - rm /tmp/admin_manifest.yml +cf-deploy-prototype: cf-target ## Deploys the first prototype to Cloud Foundry + cf push -f <(CF_APP=notify-admin-prototype make -s generate-manifest) .PHONY: cf-deploy-prototype-2 -cf-deploy-prototype-2: cf-target ## Deploys the app to Cloud Foundry - $(if ${CF_SPACE},,$(error Must specify CF_SPACE)) - (make -s CF_MANIFEST_FILE=manifest-prototype-2-${CF_SPACE}.yml generate-manifest) > /tmp/admin_manifest.yml - cf push -f /tmp/admin_manifest.yml - rm /tmp/admin_manifest.yml +cf-deploy-prototype-2: cf-target ## Deploys the second prototype to Cloud Foundry + cf push -f <(CF_APP=notify-admin-prototype-2 make -s generate-manifest) .PHONY: cf-rollback cf-rollback: ## Rollbacks the app to the previous release diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..79b31cf9e --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: unset GUNICORN_CMD_ARGS; scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py application diff --git a/manifest-base.yml b/manifest-base.yml deleted file mode 100644 index c28457046..000000000 --- a/manifest-base.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- - -buildpack: python_buildpack -command: > - unset GUNICORN_CMD_ARGS; - scripts/run_app_paas.sh - gunicorn - -c /home/vcap/app/gunicorn_config.py - application - -instances: 1 -memory: 1G - -services: - - logit-ssl-syslog-drain - -env: - NOTIFY_APP_NAME: admin - - # Credentials variables - ADMIN_CLIENT_SECRET: null - ADMIN_BASE_URL: null - API_HOST_NAME: null - DANGEROUS_SALT: null - SECRET_KEY: null - ROUTE_SECRET_KEY_1: null - ROUTE_SECRET_KEY_2: null - - AWS_ACCESS_KEY_ID: null - AWS_SECRET_ACCESS_KEY: null - - ANTIVIRUS_API_HOST: null - ANTIVIRUS_API_KEY: null - - STATSD_PREFIX: null - - ZENDESK_API_KEY: null - - TEMPLATE_PREVIEW_API_HOST: null - TEMPLATE_PREVIEW_API_KEY: null - - REDIS_ENABLED: null - REDIS_URL: null - -applications: - - name: notify-admin diff --git a/manifest-preview.yml b/manifest-preview.yml deleted file mode 100644 index a8f10e896..000000000 --- a/manifest-preview.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -inherit: manifest-base.yml - -routes: - - route: notify-admin-preview.cloudapps.digital - - route: www.notify.works diff --git a/manifest-production.yml b/manifest-production.yml deleted file mode 100644 index 1eca336c7..000000000 --- a/manifest-production.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -inherit: manifest-base.yml - -routes: - - route: notify-admin-production.cloudapps.digital - - route: www.notifications.service.gov.uk -instances: 2 -memory: 1G diff --git a/manifest-prototype-2-base.yml b/manifest-prototype-2-base.yml deleted file mode 100644 index 284fb6427..000000000 --- a/manifest-prototype-2-base.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- - -buildpack: python_buildpack -command: scripts/run_app_paas.sh gunicorn -w 5 -b 0.0.0.0:$PORT application -instances: 1 -memory: 1G -env: - NOTIFY_APP_NAME: admin - - # Credentials variables - ADMIN_CLIENT_SECRET: null - ADMIN_BASE_URL: null - API_HOST_NAME: null - DANGEROUS_SALT: null - SECRET_KEY: null - ROUTE_SECRET_KEY_1: null - ROUTE_SECRET_KEY_2: null - - AWS_ACCESS_KEY_ID: null - AWS_SECRET_ACCESS_KEY: null - - STATSD_PREFIX: null - - ZENDESK_API_KEY: null - - TEMPLATE_PREVIEW_API_HOST: null - TEMPLATE_PREVIEW_API_KEY: null - -applications: - - name: notify-admin-prototype-2 diff --git a/manifest-prototype-2-preview.yml b/manifest-prototype-2-preview.yml deleted file mode 100644 index 1a998d2d9..000000000 --- a/manifest-prototype-2-preview.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -inherit: manifest-prototype-2-base.yml - -routes: - - route: notify-admin-prototype-2-preview.cloudapps.digital diff --git a/manifest-prototype-2-production.yml b/manifest-prototype-2-production.yml deleted file mode 100644 index ffffa7686..000000000 --- a/manifest-prototype-2-production.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -inherit: manifest-prototype-2-base.yml - -routes: - - route: notify-admin-prototype-2-production.cloudapps.digital diff --git a/manifest-prototype-base.yml b/manifest-prototype-base.yml deleted file mode 100644 index d2165800e..000000000 --- a/manifest-prototype-base.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- - -buildpack: python_buildpack -command: scripts/run_app_paas.sh gunicorn -w 5 -b 0.0.0.0:$PORT application -instances: 1 -memory: 1G -env: - NOTIFY_APP_NAME: admin - - # Credentials variables - ADMIN_CLIENT_SECRET: null - ADMIN_BASE_URL: null - API_HOST_NAME: null - DANGEROUS_SALT: null - SECRET_KEY: null - ROUTE_SECRET_KEY_1: null - ROUTE_SECRET_KEY_2: null - - AWS_ACCESS_KEY_ID: null - AWS_SECRET_ACCESS_KEY: null - - STATSD_PREFIX: null - - ZENDESK_API_KEY: null - - TEMPLATE_PREVIEW_API_HOST: null - TEMPLATE_PREVIEW_API_KEY: null - -applications: - - name: notify-admin-prototype diff --git a/manifest-prototype-preview.yml b/manifest-prototype-preview.yml deleted file mode 100644 index 140d17a98..000000000 --- a/manifest-prototype-preview.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -inherit: manifest-prototype-base.yml - -routes: - - route: notify-admin-prototype-preview.cloudapps.digital diff --git a/manifest-prototype-production.yml b/manifest-prototype-production.yml deleted file mode 100644 index 4fc239945..000000000 --- a/manifest-prototype-production.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -inherit: manifest-prototype-base.yml - -routes: - - route: notify-admin-prototype-production.cloudapps.digital diff --git a/manifest-prototype-staging.yml b/manifest-prototype-staging.yml deleted file mode 100644 index 0c840b43f..000000000 --- a/manifest-prototype-staging.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -inherit: manifest-prototype-base.yml - -routes: - - route: notify-admin-prototype-staging.cloudapps.digital diff --git a/manifest-sandbox.yml b/manifest-sandbox.yml deleted file mode 100644 index 8f22b1e17..000000000 --- a/manifest-sandbox.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -inherit: manifest-base.yml - -routes: - - route: notify-admin-sandbox.cloudapps.digital diff --git a/manifest-staging.yml b/manifest-staging.yml deleted file mode 100644 index c4a719da0..000000000 --- a/manifest-staging.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -inherit: manifest-base.yml - -routes: - - route: notify-admin-staging.cloudapps.digital - - route: www.staging-notify.works - -instances: 2 -memory: 1G diff --git a/manifest.yml.j2 b/manifest.yml.j2 new file mode 100644 index 000000000..a14826014 --- /dev/null +++ b/manifest.yml.j2 @@ -0,0 +1,57 @@ +{%- set apps = { + 'notify-admin': { + 'routes': { + 'preview': ['www.notify.works'], + 'staging': ['www.staging-notify.works'], + 'production': ['www.notifications.service.gov.uk'], + } + }, + 'notify-admin-prototype': {}, + 'notify-admin-prototype-2': {} +} -%} + +{%- set app = apps[CF_APP] -%} + +--- +applications: + - name: {{ CF_APP }} + buildpack: python_buildpack + + memory: 1G + + routes: + - route: {{ CF_APP }}-{{ environment }}.cloudapps.digital + {%- for route in app.get('routes', {}).get(environment, []) %} + - route: {{ route }} + {%- endfor %} + + services: + - logit-ssl-syslog-drain + + env: + NOTIFY_APP_NAME: admin + + # Credentials variables + ADMIN_CLIENT_SECRET: {{ ADMIN_CLIENT_SECRET }} + ADMIN_BASE_URL: {{ ADMIN_BASE_URL }} + API_HOST_NAME: {{ API_HOST_NAME }} + DANGEROUS_SALT: {{ DANGEROUS_SALT }} + SECRET_KEY: {{ SECRET_KEY }} + ROUTE_SECRET_KEY_1: {{ ROUTE_SECRET_KEY_1 }} + ROUTE_SECRET_KEY_2: {{ ROUTE_SECRET_KEY_2 }} + + AWS_ACCESS_KEY_ID: {{ AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: {{ AWS_SECRET_ACCESS_KEY }} + + ANTIVIRUS_API_HOST: {{ ANTIVIRUS_API_HOST }} + ANTIVIRUS_API_KEY: {{ ANTIVIRUS_API_KEY }} + + STATSD_PREFIX: {{ STATSD_PREFIX }} + + ZENDESK_API_KEY: {{ ZENDESK_API_KEY }} + + TEMPLATE_PREVIEW_API_HOST: {{ TEMPLATE_PREVIEW_API_HOST }} + TEMPLATE_PREVIEW_API_KEY: {{ TEMPLATE_PREVIEW_API_KEY }} + + REDIS_ENABLED: {{ REDIS_ENABLED }} + REDIS_URL: {{ REDIS_URL }} diff --git a/requirements.txt b/requirements.txt index e2bb6204d..8bd7bb210 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,10 +28,10 @@ itsdangerous==0.24 # pyup: <1.0.0 git+https://github.com/alphagov/notifications-utils.git@31.2.4#egg=notifications-utils==31.2.4 ## The following requirements were added by pip freeze: -awscli==1.16.136 +awscli==1.16.140 bleach==3.1.0 boto3==1.6.16 -botocore==1.12.126 +botocore==1.12.130 certifi==2019.3.9 chardet==3.0.4 Click==7.0 @@ -45,7 +45,7 @@ future==0.17.1 greenlet==0.4.15 idna==2.8 jdcal==1.4 -Jinja2==2.10 +Jinja2==2.10.1 jmespath==0.9.4 lml==0.0.9 lxml==4.3.3 @@ -72,7 +72,7 @@ statsd==3.3.0 texttable==1.6.1 urllib3==1.24.1 webencodings==0.5.1 -Werkzeug==0.15.1 +Werkzeug==0.15.2 WTForms==2.2.1 xlrd==1.2.0 xlwt==1.3.0 diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 266092efd..3b0140c52 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -11,3 +11,5 @@ freezegun==0.3.11 flake8==3.7.7 flake8-print==3.1.0 requests-mock==1.5.2 +# used for creating manifest file locally +jinja2-cli[yaml]==0.6.0 diff --git a/scripts/generate_manifest.py b/scripts/generate_manifest.py deleted file mode 100755 index ce7982763..000000000 --- a/scripts/generate_manifest.py +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import os -import sys - -import json -import yaml - - -def merge_dicts(a, b): - if not (isinstance(a, dict) and isinstance(b, dict)): - raise ValueError("Error merging variables: '{}' and '{}'".format( - type(a).__name__, type(b).__name__ - )) - - result = a.copy() - for key, val in b.items(): - if isinstance(result.get(key), dict): - result[key] = merge_dicts(a[key], b[key]) - else: - result[key] = val - - return result - - -def load_manifest(manifest_file): - with open(manifest_file) as f: - manifest = yaml.load(f) - - if 'inherit' in manifest: - inherit_file = os.path.join(os.path.dirname(manifest_file), manifest.pop('inherit')) - manifest = merge_dicts(load_manifest(inherit_file), manifest) - - return manifest - - -def load_variables(vars_files): - variables = {} - for vars_file in vars_files: - with open(vars_file) as f: - variables = merge_dicts(variables, yaml.load(f)) - - return { - k.upper(): json.dumps(v) if isinstance(v, (dict, list)) else v - for k, v in variables.items() - } - - -def paas_manifest(manifest_file, *vars_files): - manifest = load_manifest(manifest_file) - variables = load_variables(vars_files) - - for key in manifest.get('env', {}): - if key in variables: - manifest['env'][key] = variables[key] - - return yaml.dump(manifest, default_flow_style=False, allow_unicode=True) - - -if __name__ == "__main__": - print('---') # noqa - print(paas_manifest(*sys.argv[1:])) # noqa From 0303d6a018b1fe7d6c1c3cf96f17e597b24a4dde Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 15:19:28 +0100 Subject: [PATCH 127/151] Indent sub navigation items --- .../stylesheets/components/navigation.scss | 4 +++ app/main/views/sub_navigation_dictionaries.py | 26 +++++++++-------- app/templates/components/sub-navigation.html | 29 +++++++++++++------ 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss index 388cfffb7..682346b76 100644 --- a/app/assets/stylesheets/components/navigation.scss +++ b/app/assets/stylesheets/components/navigation.scss @@ -108,6 +108,10 @@ a:active { text-decoration: underline; } + + ol ol & { + padding-left: $gutter; + } } &__item--active { diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index 31472b128..f862034b5 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -3,18 +3,20 @@ def features_nav(): { "name": "Features", "link": "main.features", - }, - { - "name": "Emails", - "link": "main.features_email", - }, - { - "name": "Text messages", - "link": "main.features_sms", - }, - { - "name": "Letters", - "link": "main.features_letters", + "sub_navigation_items": [ + { + "name": "Emails", + "link": "main.features_email", + }, + { + "name": "Text messages", + "link": "main.features_sms", + }, + { + "name": "Letters", + "link": "main.features_letters", + }, + ] }, { "name": "Roadmap", diff --git a/app/templates/components/sub-navigation.html b/app/templates/components/sub-navigation.html index ed7464e52..635181f80 100644 --- a/app/templates/components/sub-navigation.html +++ b/app/templates/components/sub-navigation.html @@ -1,18 +1,29 @@ +{% macro sub_navigation_item(item) %} +
    • + + {{item['name']}} + +
      • +{% endmacro %} + {% macro sub_navigation( item_set ) %} From 1f0195c1d1695119287e3693360ec44564ed0a09 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 15:20:00 +0100 Subject: [PATCH 128/151] =?UTF-8?q?Remove=20=E2=80=98using=20notify?= =?UTF-8?q?=E2=80=99=20from=20nav=20(it=E2=80=99s=20a=20redirect=20now)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/main/views/sub_navigation_dictionaries.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py index f862034b5..e5f7c58ec 100644 --- a/app/main/views/sub_navigation_dictionaries.py +++ b/app/main/views/sub_navigation_dictionaries.py @@ -38,8 +38,4 @@ def features_nav(): "name": "Terms of use", "link": "main.terms", }, - { - "name": "Using Notify", - "link": "main.using_notify", - }, ] From f05e5af6d8f19538b60f66af28b26fa858dbb652 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 15:22:37 +0100 Subject: [PATCH 129/151] Update footer to reflect new features navigation" --- app/templates/admin_template.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index a78581cfd..2eb67b172 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -86,9 +86,10 @@
      From 3e969280fcb37f14afb10837be869c9458deff2c Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 15:45:36 +0100 Subject: [PATCH 130/151] Remove pricing stuff from organisation model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’re not linking to the agreement from the pricing page any more, so we don’t need to talk about whether an organisation has signed it or not. --- app/models/organisation.py | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/app/models/organisation.py b/app/models/organisation.py index c9cdef32b..555bafa44 100644 --- a/app/models/organisation.py +++ b/app/models/organisation.py @@ -88,36 +88,6 @@ class Organisation(JSONModel): 'agreement.'.format(self.name) ) - def as_pricing_paragraph(self, **kwargs): - return Markup(self._as_pricing_paragraph(**kwargs)) - - def _as_pricing_paragraph(self, pricing_link, download_link, support_link, signed_in): - - if not signed_in: - return (( - 'Sign in to download a copy or find ' - 'out if one is already in place with your organisation.' - ).format(pricing_link)) - - if self.agreement_signed is None: - return (( - 'Download the agreement or ' - 'contact us to find out if we already ' - 'have one in place with your organisation.' - ).format(download_link, support_link)) - - return ( - 'Download the agreement ' - '({} {}).'.format( - download_link, - self.name, - { - True: 'has already accepted it', - False: 'hasn’t accepted it yet' - }.get(self.agreement_signed) - ) - ) - @property def _acceptance_required(self): return ( From 386cdc5eaf9e8829d6274ea436d05c4e8a6ef03f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 15 Apr 2019 14:57:09 +0100 Subject: [PATCH 131/151] Update pyexcel-io from 0.5.16 to 0.5.17 --- requirements-app.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-app.txt b/requirements-app.txt index a4ca59d71..9a0e42043 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -8,7 +8,7 @@ Flask-Login==0.4.1 blinker==1.4 pyexcel==0.5.13 -pyexcel-io==0.5.16 +pyexcel-io==0.5.17 pyexcel-xls==0.5.8 pyexcel-xlsx==0.5.7 pyexcel-ods3==0.5.3 From 01ab517a31f46fcbaac3ce61eb1c5a99b777f2b9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 15 Apr 2019 14:57:11 +0100 Subject: [PATCH 132/151] Update pytz from 2018.9 to 2019.1 --- requirements-app.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-app.txt b/requirements-app.txt index 9a0e42043..a95d82259 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -12,7 +12,7 @@ pyexcel-io==0.5.17 pyexcel-xls==0.5.8 pyexcel-xlsx==0.5.7 pyexcel-ods3==0.5.3 -pytz==2018.9 +pytz==2019.1 gunicorn==19.7.1 # pyup: ignore, >19.8 breaks eventlet patching eventlet==0.24.1 notifications-python-client==5.3.0 From b48393fbb6522ff38bd96d7049fe906625cc1846 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 15:50:11 +0100 Subject: [PATCH 133/151] Freeze requirements --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index e2bb6204d..510d59b95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,11 +10,11 @@ Flask-Login==0.4.1 blinker==1.4 pyexcel==0.5.13 -pyexcel-io==0.5.16 +pyexcel-io==0.5.17 pyexcel-xls==0.5.8 pyexcel-xlsx==0.5.7 pyexcel-ods3==0.5.3 -pytz==2018.9 +pytz==2019.1 gunicorn==19.7.1 # pyup: ignore, >19.8 breaks eventlet patching eventlet==0.24.1 notifications-python-client==5.3.0 @@ -28,10 +28,10 @@ itsdangerous==0.24 # pyup: <1.0.0 git+https://github.com/alphagov/notifications-utils.git@31.2.4#egg=notifications-utils==31.2.4 ## The following requirements were added by pip freeze: -awscli==1.16.136 +awscli==1.16.140 bleach==3.1.0 boto3==1.6.16 -botocore==1.12.126 +botocore==1.12.130 certifi==2019.3.9 chardet==3.0.4 Click==7.0 @@ -45,7 +45,7 @@ future==0.17.1 greenlet==0.4.15 idna==2.8 jdcal==1.4 -Jinja2==2.10 +Jinja2==2.10.1 jmespath==0.9.4 lml==0.0.9 lxml==4.3.3 @@ -72,7 +72,7 @@ statsd==3.3.0 texttable==1.6.1 urllib3==1.24.1 webencodings==0.5.1 -Werkzeug==0.15.1 +Werkzeug==0.15.2 WTForms==2.2.1 xlrd==1.2.0 xlwt==1.3.0 From fccab8103c5813f2c9e52707b8b78a8d04bec099 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 16:44:35 +0100 Subject: [PATCH 134/151] Correct link, apostrophe and contraction --- app/templates/views/features.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/features.html b/app/templates/views/features.html index fdd099fe2..168c41ef9 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -22,7 +22,7 @@
    • text messages
    • letters
    -

    You don’t 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.

    {% endif %} @@ -44,7 +44,7 @@

    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 how message status typesmessage status works.

    +

    Read more about how message status works.

    Permissions

    Control which members of your team can see, create, edit and send messages.

    @@ -70,7 +70,7 @@

    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've been sent. This means that only the recipient can see that information.

    +

    Notify lets you redact personal information from your messages after they’ve 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.

    From 43f23046d5d96d267f2672343f0f9fd00e1d561c Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 16:46:44 +0100 Subject: [PATCH 135/151] Correct apostrophe --- 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 a9941bc8f..fd1fb9776 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -30,7 +30,7 @@

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

    Email branding

    -

    Add your organisation's logo and brand colour to email templates.

    +

    Add your organisation’s logo and brand colour to email templates.

    You can change your branding in your service settings.

    Send files by email

    From d37a3557c4ff8286c4bfa25769ffa152a1fc81fa Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 16:47:52 +0100 Subject: [PATCH 136/151] Correct apostrophe, add VAT --- 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 57697249d..d63599962 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -31,7 +31,7 @@

    Choose your postage

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

    +

    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

    @@ -39,7 +39,7 @@

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

    Pricing

    -

    It costs between 30p and 76p to send a letter. Prices include:

    +

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

    • paper
    • double-sided colour printing
      • From 50747d190e407a45e4c0d319dc23f4955f0f0b9c Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Tue, 16 Apr 2019 16:49:36 +0100 Subject: [PATCH 137/151] Correct apostrophes --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index a4e7336ea..c82aa3148 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -29,7 +29,7 @@ >

      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 39c4740d03def2f0dfba2b7bf6bbe8514005248a Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 Apr 2019 16:51:28 +0100 Subject: [PATCH 138/151] Fix links to support --- app/templates/views/features/emails.html | 2 +- app/templates/views/features/text-messages.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index fd1fb9776..a9ab091db 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -42,7 +42,7 @@
    • email attachments are often marked as spam
    -

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

    +

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

    Read the API documentation for more information.

    Add a reply-to address

    diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index cb0dd2052..8fc20a042 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -31,7 +31,7 @@

    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, or set up your own automated processes to manage replies.

    -

    Contact the team to request a unique number for text message replies.

    +

    Contact the team 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.

    From b3d73030ee76b9ba7382feec05d3bd4ec9b43fa1 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Wed, 17 Apr 2019 12:40:49 +0100 Subject: [PATCH 139/151] Remove use of spread operator This is a temporary fix for the fact that the babel plugin for the spread operator calls a function called `_iterableToArray` which assumes the JavaScript runtime supports Symbols. IE11 doesn't support Symbols so this causes an error when it runs our JS. This swaps out use of the spread operator for a use of [apply](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/apply) to unpack the `arguments` object. Related issue on babel: https://github.com/babel/babel/issues/7597 --- app/assets/javascripts/updateContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/updateContent.js b/app/assets/javascripts/updateContent.js index 516bd913f..928aed1db 100644 --- a/app/assets/javascripts/updateContent.js +++ b/app/assets/javascripts/updateContent.js @@ -34,7 +34,7 @@ ); setTimeout( - () => poll(...arguments), interval + () => poll.apply(window, arguments), interval ); }; From a70ab1bd9d5f393ce7bddc42b419e44264baec31 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 17 Apr 2019 17:19:07 +0100 Subject: [PATCH 140/151] Add Metropolitan Thames Valley to email domains --- app/email_domains.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/email_domains.yml b/app/email_domains.yml index cd4ec34fb..6826b2e33 100644 --- a/app/email_domains.yml +++ b/app/email_domains.yml @@ -52,3 +52,4 @@ - caa.co.uk - onevoicewales.wales - cefas.co.uk +- mtvh.co.uk From 39b84e63c3d709668068a71b889792c3c0abe558 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Apr 2019 10:55:22 +0100 Subject: [PATCH 141/151] 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 142/151] 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 143/151] 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 144/151] 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 145/151] 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 146/151] 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 147/151] 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 148/151] 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, From 4b386d36ef46d02c27dd1e5109089e9637f7527e Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 18 Apr 2019 14:48:23 +0100 Subject: [PATCH 149/151] default CF_APP to notify-admin (it's overriden in the calls to generate-manifest for the prototypes) --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b9fa7ef31..5587e362f 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ CF_API ?= api.cloud.service.gov.uk CF_ORG ?= govuk-notify CF_SPACE ?= ${DEPLOY_ENV} CF_HOME ?= ${HOME} +CF_APP ?= notify-admin $(eval export CF_HOME) NOTIFY_CREDENTIALS ?= ~/.notify-credentials From 9f10cd0b8264a536b3e7ca57a13781194924e5b0 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 18 Apr 2019 15:14:32 +0100 Subject: [PATCH 150/151] ensure env vars in manifest are quoted if they're not defined in the credentials file, they should be an empty string, rather than null. --- manifest.yml.j2 | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/manifest.yml.j2 b/manifest.yml.j2 index a14826014..ccf758095 100644 --- a/manifest.yml.j2 +++ b/manifest.yml.j2 @@ -32,26 +32,26 @@ applications: NOTIFY_APP_NAME: admin # Credentials variables - ADMIN_CLIENT_SECRET: {{ ADMIN_CLIENT_SECRET }} - ADMIN_BASE_URL: {{ ADMIN_BASE_URL }} - API_HOST_NAME: {{ API_HOST_NAME }} - DANGEROUS_SALT: {{ DANGEROUS_SALT }} - SECRET_KEY: {{ SECRET_KEY }} - ROUTE_SECRET_KEY_1: {{ ROUTE_SECRET_KEY_1 }} - ROUTE_SECRET_KEY_2: {{ ROUTE_SECRET_KEY_2 }} + ADMIN_CLIENT_SECRET: '{{ ADMIN_CLIENT_SECRET }}' + ADMIN_BASE_URL: '{{ ADMIN_BASE_URL }}' + API_HOST_NAME: '{{ API_HOST_NAME }}' + DANGEROUS_SALT: '{{ DANGEROUS_SALT }}' + SECRET_KEY: '{{ SECRET_KEY }}' + ROUTE_SECRET_KEY_1: '{{ ROUTE_SECRET_KEY_1 }}' + ROUTE_SECRET_KEY_2: '{{ ROUTE_SECRET_KEY_2 }}' - AWS_ACCESS_KEY_ID: {{ AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: {{ AWS_SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: '{{ AWS_ACCESS_KEY_ID }}' + AWS_SECRET_ACCESS_KEY: '{{ AWS_SECRET_ACCESS_KEY }}' - ANTIVIRUS_API_HOST: {{ ANTIVIRUS_API_HOST }} - ANTIVIRUS_API_KEY: {{ ANTIVIRUS_API_KEY }} + ANTIVIRUS_API_HOST: '{{ ANTIVIRUS_API_HOST }}' + ANTIVIRUS_API_KEY: '{{ ANTIVIRUS_API_KEY }}' - STATSD_PREFIX: {{ STATSD_PREFIX }} + STATSD_PREFIX: '{{ STATSD_PREFIX }}' - ZENDESK_API_KEY: {{ ZENDESK_API_KEY }} + ZENDESK_API_KEY: '{{ ZENDESK_API_KEY }}' - TEMPLATE_PREVIEW_API_HOST: {{ TEMPLATE_PREVIEW_API_HOST }} - TEMPLATE_PREVIEW_API_KEY: {{ TEMPLATE_PREVIEW_API_KEY }} + TEMPLATE_PREVIEW_API_HOST: '{{ TEMPLATE_PREVIEW_API_HOST }}' + TEMPLATE_PREVIEW_API_KEY: '{{ TEMPLATE_PREVIEW_API_KEY }}' - REDIS_ENABLED: {{ REDIS_ENABLED }} - REDIS_URL: {{ REDIS_URL }} + REDIS_ENABLED: '{{ REDIS_ENABLED }}' + REDIS_URL: '{{ REDIS_URL }}' From fc24509fd270f59cbd875095106895eaadcd7c1e Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Tue, 23 Apr 2019 11:12:14 +0100 Subject: [PATCH 151/151] Added officeforstudents.org.uk to email domains --- app/email_domains.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/email_domains.yml b/app/email_domains.yml index 6826b2e33..bfec593cd 100644 --- a/app/email_domains.yml +++ b/app/email_domains.yml @@ -53,3 +53,4 @@ - onevoicewales.wales - cefas.co.uk - mtvh.co.uk +- officeforstudents.org.uk