From e53d12733acbaeb6a20ae0d2b887e14ee547ff69 Mon Sep 17 00:00:00 2001 From: James Moffet Date: Wed, 20 Jul 2022 15:23:54 -0700 Subject: [PATCH] branding --- app/assets/error_pages/5xx.html | 220 +- app/assets/javascripts/analytics/analytics.js | 12 +- app/assets/javascripts/modules/all.mjs | 6 +- app/main/_commonly_used_passwords.py | 9 +- app/main/views/api_keys.py | 2 +- app/main/views/feedback.py | 4 +- app/main/views/index.py | 2 +- app/s3_client/s3_mou_client.py | 2 +- app/templates/admin_template.html | 2 +- app/templates/error/401.html | 2 +- app/templates/error/500.html | 2 +- app/templates/partials/jobs/status.html | 2 +- .../views/accessibility_statement.html | 14 +- .../views/agreement/agreement-confirm.html | 4 +- .../views/agreement/agreement-public.html | 4 +- .../agreement/service-agreement-choose.html | 2 +- .../agreement/service-agreement-signed.html | 2 +- .../views/agreement/service-agreement.html | 2 +- app/templates/views/broadcast/tour/1.html | 4 +- app/templates/views/cookies.html | 4 +- app/templates/views/documentation.html | 2 +- app/templates/views/features.html | 2 +- app/templates/views/features/emails.html | 2 +- app/templates/views/features/letters.html | 2 +- .../views/features/text-messages.html | 2 +- app/templates/views/get-started.html | 2 +- .../guidance/branding-and-customisation.html | 2 +- app/templates/views/guidance/index.html | 4 +- .../views/guidance/who-can-use-notify.html | 8 +- .../organisations/organisation/billing.html | 8 +- .../organisations/organisation/index.html | 2 +- app/templates/views/pricing/how-to-pay.html | 2 +- app/templates/views/pricing/index.html | 2 +- app/templates/views/privacy.html | 20 +- app/templates/views/roadmap.html | 2 +- app/templates/views/security.html | 2 +- .../branding/email-branding-govuk-org.html | 4 +- .../branding/email-branding-govuk.html | 4 +- .../views/service-settings/set-email.html | 2 +- app/templates/views/signedout.html | 22 +- app/templates/views/support/form.html | 2 +- app/templates/views/support/index.html | 2 +- app/templates/views/support/public.html | 6 +- app/templates/views/support/triage.html | 4 +- .../views/templates/action_blocked.html | 2 +- app/templates/views/terms-of-use.html | 4 +- app/templates/views/trial-mode.html | 2 +- app/webauthn_server.py | 2 +- paas-failwhale/index.html | 238 +- .../static_503/stylesheets/main.css | 9922 ++++++++++++++++- 50 files changed, 10251 insertions(+), 330 deletions(-) diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 79041dfa5..45c6a635f 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -1,128 +1,122 @@ - - - - Sorry, there is a problem with the service – GOV.UK Notify - - - - - - - - - - + + + + Sorry, there is a problem with the service – US Notify + + + + - - - + + + + + + - - - - Skip to main content - + +
+
+
+
+

+ Sorry, there is a problem with the service +

+

+ Try again later. +

+

+ You can check our system status page to see if there are any known + issues.
To report a problem, email gov-uk-notify-support@digital.cabinet-office.gov.uk

- +
+
- - + + + + + \ No newline at end of file diff --git a/app/assets/javascripts/analytics/analytics.js b/app/assets/javascripts/analytics/analytics.js index a776f93a2..10400f162 100644 --- a/app/assets/javascripts/analytics/analytics.js +++ b/app/assets/javascripts/analytics/analytics.js @@ -15,16 +15,18 @@ window.ga('set', 'anonymizeIp', config.anonymizeIp); window.ga('set', 'allowAdFeatures', config.allowAdFeatures); window.ga('set', 'transport', config.transport); - window.ga('set', 'title', 'GOV.UK Notify'); + window.ga('set', 'title', 'US Notify'); }; Analytics.load = function () { /* jshint ignore:start */ - (function(i, s, o, g, r, a, m){ i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { - (i[r].q = i[r].q || []).push(arguments) }, i[r].l = 1 * new Date(); a = s.createElement(o), - m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + (function (i, s, o, g, r, a, m) { + i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { + (i[r].q = i[r].q || []).push(arguments) + }, i[r].l = 1 * new Date(); a = s.createElement(o), + m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m) + })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); /* jshint ignore:end */ }; diff --git a/app/assets/javascripts/modules/all.mjs b/app/assets/javascripts/modules/all.mjs index 33af699f4..6312f03dc 100644 --- a/app/assets/javascripts/modules/all.mjs +++ b/app/assets/javascripts/modules/all.mjs @@ -21,7 +21,7 @@ import morphdom from 'morphdom'; * This seems to fail in IE8, requires more investigation. * See: https://github.com/imagitama/nodelist-foreach-polyfill */ -function nodeListForEach (nodes, callback) { +function nodeListForEach(nodes, callback) { if (window.NodeList.prototype.forEach) { return nodes.forEach(callback) } @@ -32,11 +32,11 @@ function nodeListForEach (nodes, callback) { // Copy of the initAll function from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/all.js // except it only includes, and initialises, the components used by this application. -function initAll (options) { +function initAll(options) { // Set the options to an empty object by default if no options are passed. options = typeof options !== 'undefined' ? options : {} - // Allow the user to initialise GOV.UK Frontend in only certain sections of the page + // Allow the user to initialise US Frontend in only certain sections of the page // Defaults to the entire document if nothing is set. var scope = typeof options.scope !== 'undefined' ? options.scope : document diff --git a/app/main/_commonly_used_passwords.py b/app/main/_commonly_used_passwords.py index f30052d77..4541e46a8 100644 --- a/app/main/_commonly_used_passwords.py +++ b/app/main/_commonly_used_passwords.py @@ -1,9 +1,8 @@ commonly_used_passwords = [ - 'govuknotify', - 'GOVUKnotify', - 'GOV.UK Notify', - 'GOV.UK notify', - 'gov.uk notify' + 'usnotify', + 'USnotify', + 'us Notify', + 'us notify' ] + [ '11111111', '12345678', diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index 840a753b4..37fffb720 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -125,7 +125,7 @@ def revoke_api_key(service_id, key_id): if request.method == 'GET': flash([ "Are you sure you want to revoke ‘{}’?".format(key_name), - "You will not be able to use this API key to connect to GOV.UK Notify." + "You will not be able to use this API key to connect to US Notify." ], 'revoke this API key') return render_template( 'views/api/keys.html', diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py index f76f6e95e..d380bdab9 100644 --- a/app/main/views/feedback.py +++ b/app/main/views/feedback.py @@ -76,7 +76,7 @@ def triage(ticket_type=PROBLEM_TICKET_TYPE): form=form, page_title={ PROBLEM_TICKET_TYPE: 'Report a problem', - GENERAL_TICKET_TYPE: 'Contact GOV.UK Notify support', + GENERAL_TICKET_TYPE: 'Contact US Notify support', }.get(ticket_type) ) @@ -151,7 +151,7 @@ def feedback(ticket_type): ), show_status_page_banner=(ticket_type == PROBLEM_TICKET_TYPE), page_title={ - GENERAL_TICKET_TYPE: 'Contact GOV.UK Notify support', + GENERAL_TICKET_TYPE: 'Contact US Notify support', PROBLEM_TICKET_TYPE: 'Report a problem', QUESTION_TICKET_TYPE: 'Ask a question or give feedback', }.get(ticket_type), diff --git a/app/main/views/index.py b/app/main/views/index.py index b997ee232..6b1dae713 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -133,7 +133,7 @@ def email_template(): '\n' '10. Three' '\n\n' - 'This is an example of an email sent using GOV.UK Notify.' + 'This is an example of an email sent using US Notify.' '\n\n' 'https://www.notifications.service.gov.uk' ) diff --git a/app/s3_client/s3_mou_client.py b/app/s3_client/s3_mou_client.py index b6921df66..dd203e973 100644 --- a/app/s3_client/s3_mou_client.py +++ b/app/s3_client/s3_mou_client.py @@ -7,7 +7,7 @@ from app.s3_client.s3_logo_client import get_s3_object def get_mou(organisation_is_crown): bucket = current_app.config['MOU_BUCKET_NAME'] filename = 'crown.pdf' if organisation_is_crown else 'non-crown.pdf' - attachment_filename = 'GOV.UK Notify data sharing and financial agreement{}.pdf'.format( + attachment_filename = 'US Notify data sharing and financial agreement{}.pdf'.format( '' if organisation_is_crown else ' (non-crown)' ) try: diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 480a9770e..39a7ccd82 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -34,7 +34,7 @@ {% endblock %} {% block pageTitle %} - {% block per_page_title %}{% endblock %} – GOV.UK Notify + {% block per_page_title %}{% endblock %} – US Notify {% endblock %} {% block bodyStart %} diff --git a/app/templates/error/401.html b/app/templates/error/401.html index 86487df99..72e56270b 100644 --- a/app/templates/error/401.html +++ b/app/templates/error/401.html @@ -4,6 +4,6 @@

You’re not authorised to see this page

-

Sign in to GOV.UK Notify and try again.

+

Sign in to US Notify and try again.

{% endblock %} diff --git a/app/templates/error/500.html b/app/templates/error/500.html index 662b2c202..dff42f48f 100644 --- a/app/templates/error/500.html +++ b/app/templates/error/500.html @@ -4,7 +4,7 @@

- Sorry, there’s a problem with GOV.UK Notify + Sorry, there’s a problem with US Notify

Try again later. diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 94be44736..86f360d39 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -25,7 +25,7 @@ Notify cannot send these messages because you have reached your daily limit. You can only send {{ current_service.message_limit|format_thousands }} messages per day.

- Upload this spreadsheet again tomorrow or contact the GOV.UK Notify team to raise the limit. + Upload this spreadsheet again tomorrow or contact the US Notify team to raise the limit.

{% endif %}
diff --git a/app/templates/views/accessibility_statement.html b/app/templates/views/accessibility_statement.html index f7a2f0f31..4f7ebc9b8 100644 --- a/app/templates/views/accessibility_statement.html +++ b/app/templates/views/accessibility_statement.html @@ -19,11 +19,11 @@ ) }}

- This accessibility statement applies to the www.notifications.service.gov.uk domain. It does not apply to the GOV.UK Notify API documentation subdomain. + This accessibility statement applies to the us notify domain. It does not apply to the US Notify API documentation subdomain.

- This website is run by the GOV.UK Notify team at the Government Digital Service (GDS). It is designed to be used by as many people as possible. You should be able to: + This website is run by the US Notify team at the Government Digital Service (GDS). It is designed to be used by as many people as possible. You should be able to:

  • change colours, contrast levels and fonts
    • @@ -66,7 +66,7 @@

    Feedback and contact information

    - If you need any part of this service in a different format like large print, audio recording or braille, contact the GOV.UK Notify team. + If you need any part of this service in a different format like large print, audio recording or braille, contact the US Notify team.

    @@ -76,7 +76,7 @@

    Reporting accessibility problems with this website

    - We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact the GOV.UK Notify team. + We’re always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact the US Notify team.

    Enforcement procedure

    @@ -86,7 +86,7 @@

    - Find out how to contact the GOV.UK Notify team. + Find out how to contact the US Notify team.

    Technical information about this website’s accessibility

    @@ -96,7 +96,7 @@

    - GOV.UK Notify is partially compliant with the Web Content Accessibility Guidelines (WCAG) version 2.1 AA standard, due to the non-compliances listed below. + US Notify is partially compliant with the Web Content Accessibility Guidelines (WCAG) version 2.1 AA standard, due to the non-compliances listed below.

    Non-accessible content

    @@ -211,6 +211,6 @@

    - We decided which pages to test based on the most common tasks that GOV.UK Notify users need to complete. We also tested a sample of pages with common user interface components. + We decided which pages to test based on the most common tasks that US Notify users need to complete. We also tested a sample of pages with common user interface components.

    {% endblock %} diff --git a/app/templates/views/agreement/agreement-confirm.html b/app/templates/views/agreement/agreement-confirm.html index 4b998de6c..021147d79 100644 --- a/app/templates/views/agreement/agreement-confirm.html +++ b/app/templates/views/agreement/agreement-confirm.html @@ -24,11 +24,11 @@ {% if current_service.organisation.agreement_signed_on_behalf_of_name and current_service.organisation.agreement_signed_on_behalf_of_email_address %}

    - I confirm that I have the legal authority to accept the GOV.UK Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it. + I confirm that I have the legal authority to accept the US Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it.

    {% else %}

    - I confirm that I have the legal authority to accept the GOV.UK Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it. + I confirm that I have the legal authority to accept the US Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it.

    {% endif %} diff --git a/app/templates/views/agreement/agreement-public.html b/app/templates/views/agreement/agreement-public.html index 064540f55..c9ec8f549 100644 --- a/app/templates/views/agreement/agreement-public.html +++ b/app/templates/views/agreement/agreement-public.html @@ -2,7 +2,7 @@ {% from "components/sub-navigation.html" import sub_navigation %} {% block per_page_title %} - Download the GOV.UK Notify data sharing and financial agreement + Download the US Notify data sharing and financial agreement {% endblock %} {% block maincolumn_content %} @@ -11,7 +11,7 @@

    - Download the GOV.UK Notify data sharing and financial agreement + Download the US Notify data sharing and financial agreement

    diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 7173f1adc..0257dbb55 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -18,7 +18,7 @@ {{ page_header('Accept the data sharing and financial agreement')}}

    - Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement. + Before you can use US Notify, you need to accept our data sharing and financial agreement.

    This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation. diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index d0d2bd8f6..62ffb7a8b 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -18,7 +18,7 @@ {{ page_header('Your organisation has already accepted the agreement')}}

    - {{ current_service.organisation.name }} has already accepted the GOV.UK + {{ current_service.organisation.name }} has already accepted the US Notify data sharing and financial agreement.

    For more information, you can download a copy of the agreement (PDF). diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index bd0932600..91d762fe3 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -19,7 +19,7 @@ {{ page_header('Accept our data sharing and financial agreement')}}

    - Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement. + Before you can use US Notify, you need to accept our data sharing and financial agreement.

    This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}. diff --git a/app/templates/views/broadcast/tour/1.html b/app/templates/views/broadcast/tour/1.html index 5eef5017a..65c8220a6 100644 --- a/app/templates/views/broadcast/tour/1.html +++ b/app/templates/views/broadcast/tour/1.html @@ -3,7 +3,7 @@ {% extends "admin_template.html" %} {% block per_page_title %} - You’ve been invited to use GOV.UK Notify for emergency alerts. + You’ve been invited to use US Notify for emergency alerts. {% endblock %} {% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %} @@ -14,7 +14,7 @@

    - You’ve been invited to use GOV.UK Notify for emergency alerts. + You’ve been invited to use US Notify for emergency alerts.

    Emergency alerts let you warn the public about an diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html index 8e3cdc521..e2aa48070 100644 --- a/app/templates/views/cookies.html +++ b/app/templates/views/cookies.html @@ -21,7 +21,7 @@

    Cookies are small files saved on your phone, tablet or computer when you visit a website.

    -

    We use cookies to make GOV.UK Notify work and collect information about how you use our service.

    +

    We use cookies to make US Notify work and collect information about how you use our service.

    Essential cookies

    @@ -73,7 +73,7 @@ Google Analytics stores anonymised information about:

      -
    • how you got to GOV.UK Notify
      • +
    • how you got to US Notify
    • the pages you visit on Notify and how long you spend on them
    • any errors you see while using Notify
    diff --git a/app/templates/views/documentation.html b/app/templates/views/documentation.html index d2ec1d80b..34e6edec2 100644 --- a/app/templates/views/documentation.html +++ b/app/templates/views/documentation.html @@ -7,7 +7,7 @@ {% block content_column_content %}

    Documentation

    -

    This documentation is for developers who want to integrate the GOV.UK Notify API with a web application or back office system.

    +

    This documentation is for developers who want to integrate the US Notify API with a web application or back office system.

    Client libraries

    Links to documentation open in a new tab.

      diff --git a/app/templates/views/features.html b/app/templates/views/features.html index 29c84c843..7a8e0c9bd 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -9,7 +9,7 @@ {% block content_column_content %}

      Features

      -

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

      +

      If you work for central government, a local authority or the NHS, you can use US Notify to keep your users updated.

      Notify makes it easy to create, customise and send:

      • emails
        • diff --git a/app/templates/views/features/emails.html b/app/templates/views/features/emails.html index a62a9039f..524c766d7 100644 --- a/app/templates/views/features/emails.html +++ b/app/templates/views/features/emails.html @@ -8,7 +8,7 @@ {% block content_column_content %}

        Emails

        -

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

        +

        Send an unlimited number of emails for free with US Notify.

        {% if not current_user.is_authenticated %}

        Create an account and try Notify for yourself.

        {% endif %} diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html index e791ef3ed..5989813f9 100644 --- a/app/templates/views/features/letters.html +++ b/app/templates/views/features/letters.html @@ -8,7 +8,7 @@ {% block content_column_content %}

        Letters

        -

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

        +

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

        {% if not current_user.is_authenticated %}

        Create an account and try Notify for yourself.

        {% endif %} diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html index ad7d1d675..9f12e009c 100644 --- a/app/templates/views/features/text-messages.html +++ b/app/templates/views/features/text-messages.html @@ -8,7 +8,7 @@ {% block content_column_content %}

        Text messages

        -

        Send thousands of free text messages to UK and international numbers with GOV.UK Notify.

        +

        Send thousands of free text messages to UK and international numbers with US Notify.

        {% if not current_user.is_authenticated %}

        Create an account and try Notify for yourself.

        {% endif %} diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html index e1e1dfca2..7dd6f83fc 100644 --- a/app/templates/views/get-started.html +++ b/app/templates/views/get-started.html @@ -13,7 +13,7 @@
        1. -

          Check if GOV.UK Notify is right for you

          +

          Check if US Notify is right for you

          Read about our features, pricing and roadmap.

          Check whether your organisation can use Notify. diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html index 637b72a63..0fd0804e3 100644 --- a/app/templates/views/guidance/branding-and-customisation.html +++ b/app/templates/views/guidance/branding-and-customisation.html @@ -20,7 +20,7 @@

          Change your email branding

          -

          The default branding for email templates is the GOV.UK logo.

          +

          The default branding for email templates is the US Notifylogo.

          To change your email branding:

          diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html index 1f3d53c3e..8e5454f93 100644 --- a/app/templates/views/guidance/index.html +++ b/app/templates/views/guidance/index.html @@ -10,7 +10,7 @@

          Guidance

          -

          This guidance is for teams using GOV.UK Notify to send emails, text messages and letters.

          +

          This guidance is for teams using US Notify to send emails, text messages and letters.

          It explains how to:

          @@ -23,7 +23,7 @@

          More information

          -

          The GOV.UK Service Manual has advice on:

          +

          The US NotifyService Manual has advice on:

    diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index bbb30ccd3..7b9d89c9f 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -107,7 +107,7 @@
    {% if not services %}

    - {{ current_org.name }} has no live services on GOV.UK Notify + {{ current_org.name }} has no live services on US Notify

    {% else %} diff --git a/app/templates/views/pricing/how-to-pay.html b/app/templates/views/pricing/how-to-pay.html index a7c33c755..afc8b6c2e 100644 --- a/app/templates/views/pricing/how-to-pay.html +++ b/app/templates/views/pricing/how-to-pay.html @@ -10,7 +10,7 @@ {{ page_header('How to pay') }}

    - If you use GOV.UK Notify to send text messages or letters, you may need to send us a purchase order. + If you use US Notify to send text messages or letters, you may need to send us a purchase order.

    diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html index ef29a5785..649a2114e 100644 --- a/app/templates/views/pricing/index.html +++ b/app/templates/views/pricing/index.html @@ -19,7 +19,7 @@ } ) }} -

    GOV.UK Notify is free to use unless you:

    +

    US Notify is free to use unless you:

    • exceed your free text message allowance
    • send letters
      • diff --git a/app/templates/views/privacy.html b/app/templates/views/privacy.html index c1184ec4b..4aca97402 100644 --- a/app/templates/views/privacy.html +++ b/app/templates/views/privacy.html @@ -19,39 +19,39 @@

      Who we are

      -

      GOV.UK Notify is a service that lets public service teams in the UK send emails, text messages, and letters +

      US Notify is a service that lets public service teams in the UK send emails, text messages, and letters to users of their service.

      -

      GOV.UK Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.

      +

      US Notify is provided by the Government Digital Service (GDS) which is part of the Cabinet Office.

      -

      Organisations sending notifications using GOV.UK Notify are the data controller and Cabinet Office is the data processor. The data controller must tell you about what they are doing with your personal data.

      +

      Organisations sending notifications using US Notify are the data controller and Cabinet Office is the data processor. The data controller must tell you about what they are doing with your personal data.

      -

      For the credentials used to access GOV.UK Notify, Cabinet Office is the data controller.

      +

      For the credentials used to access US Notify, Cabinet Office is the data controller.

      For more information see the Information Commissioner’s Office (ICO) Data Protection Public Register. The Cabinet Office registration number is: Z7414053

      What data we collect from you

      -

      The personal data we collect from public sector employees that create a GOV.UK Notify account includes:

      +

      The personal data we collect from public sector employees that create a US Notify account includes:

      • your name
      • your email address
      • your mobile phone number
        • -
      • the IP address you use to access GOV.UK Notify
        • +
      • the IP address you use to access US Notify
      -

      The legal basis for processing this data is ‘public task’ – allowing you to access GOV.UK Notify to send notifications +

      The legal basis for processing this data is ‘public task’ – allowing you to access US Notify to send notifications to users of your public service.

      Why we need your data

      -

      We need your personal data to ensure that only legitimate users of GOV.UK Notify can use it to send notifications.

      +

      We need your personal data to ensure that only legitimate users of US Notify can use it to send notifications.

      What we do with your data

      -

      We use your data to check that you are allowed to access GOV.UK Notify and to record your activity when using it. We use third party suppliers to do this.

      +

      We use your data to check that you are allowed to access US Notify and to record your activity when using it. We use third party suppliers to do this.

      We will not:

      @@ -64,7 +64,7 @@

      How long we keep your data

      -

      We will retain your personal data for as long as you have a GOV.UK Notify account.

      +

      We will retain your personal data for as long as you have a US Notify account.

      Where your data is processed and stored

      diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index 03fc3b689..ff9d38a01 100644 --- a/app/templates/views/roadmap.html +++ b/app/templates/views/roadmap.html @@ -18,7 +18,7 @@ ) }} -

      The GOV.UK Notify roadmap shows what we’re working on and some of the things we’ve done.

      +

      The US Notify roadmap shows what we’re working on and some of the things we’ve done.

      The roadmap is only a guide. It does not cover everything we do, and some things may change.

      You can contact us if you have any questions about the roadmap or suggestions for new features.

      diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 623133d5c..7f27f353a 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -8,7 +8,7 @@ {% block content_column_content %}

      Security

      -

      GOV.UK Notify is built for the needs of government services. It has processes in place to:

      +

      US Notify is built for the needs of government services. It has processes in place to:

      • protect user data
      • keep systems secure
        • diff --git a/app/templates/views/service-settings/branding/email-branding-govuk-org.html b/app/templates/views/service-settings/branding/email-branding-govuk-org.html index 7fa100ee9..f0dd80db8 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk-org.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk-org.html @@ -18,10 +18,10 @@ {{ page_header('Before you request new branding') }} -

        You can only use GOV.UK branding if people go to GOV.UK to access your service.

        +

        You can only use US Notifybranding if people go to US Notifyto access your service.

        - You cannot use GOV.UK branding if your organisation is + You cannot use US Notifybranding if your organisation is independent from government. diff --git a/app/templates/views/service-settings/branding/email-branding-govuk.html b/app/templates/views/service-settings/branding/email-branding-govuk.html index e4b16841f..2d895ba53 100644 --- a/app/templates/views/service-settings/branding/email-branding-govuk.html +++ b/app/templates/views/service-settings/branding/email-branding-govuk.html @@ -27,10 +27,10 @@

        Before you continue

        -

        You can only use GOV.UK branding if people go to GOV.UK to access your service.

        +

        You can only use US Notifybranding if people go to US Notifyto access your service.

        - You cannot use GOV.UK branding if your organisation is + You cannot use US Notifybranding if your organisation is independent from government. diff --git a/app/templates/views/service-settings/set-email.html b/app/templates/views/service-settings/set-email.html index 4d4cd23a1..8f2286154 100644 --- a/app/templates/views/service-settings/set-email.html +++ b/app/templates/views/service-settings/set-email.html @@ -18,7 +18,7 @@

        {{ page_header('Send emails') }}

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

        {% call form_wrapper() %} {{ form.enabled }} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 00076d9b5..b53f57089 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -2,11 +2,11 @@ {% from "components/button/macro.njk" import govukButton %} {% block meta %} - + {% endblock %} {% block pageTitle %} - GOV.UK Notify + US Notify {% endblock %} {% block content %} @@ -16,10 +16,10 @@ @@ -29,7 +29,7 @@ Send emails, text messages and letters to your users

    - Try GOV.UK Notify now if you work in central government, a local authority, or the NHS. + Try US Notify now if you work in federal, state or local government.

    {{ govukButton({ @@ -76,7 +76,7 @@
    A screenshot of GOV.UK Notify showing counts of emails and text messages sent
    @@ -98,7 +98,7 @@

    - Integrate the GOV.UK Notify API with your web application or + Integrate the US Notify API with your web application or back office system.

    - Introducing GOV.UK Notify + Introducing US Notify

    @@ -120,7 +120,7 @@
    -

    Who’s using GOV.UK Notify

    +

    Who’s using US Notify

    There are @@ -177,7 +177,7 @@ The team

    - GOV.UK Notify is built by the Government Digital Service + US Notify is built by the Government Digital Service and is supported 24 hours a day, 7 days a week.

    @@ -188,7 +188,7 @@

    A photo of the GOV.UK Notify team gathered around a big screen. One team member is pointing at a graph on the screen.
    diff --git a/app/templates/views/support/form.html b/app/templates/views/support/form.html index f8556f0c5..ea4372dd8 100644 --- a/app/templates/views/support/form.html +++ b/app/templates/views/support/form.html @@ -22,7 +22,7 @@

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

    {% endif %} diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index 410f36bbd..9473a65e1 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -9,7 +9,7 @@ {% block maincolumn_content %}

    Support

    -

    GOV.UK Notify provides 24-hour online support.

    +

    US Notify provides 24-hour online support.

    {% call form_wrapper() %} {% if current_user.is_authenticated %} diff --git a/app/templates/views/support/public.html b/app/templates/views/support/public.html index 082c52b06..f241153fc 100644 --- a/app/templates/views/support/public.html +++ b/app/templates/views/support/public.html @@ -4,7 +4,7 @@ {% from "components/back-link/macro.njk" import govukBackLink %} {% block per_page_title %} - The GOV.UK Notify service is for people who work in the government + The US Notify service is for people who work in the government {% endblock %} {% block backLink %} @@ -16,14 +16,14 @@
    - {{ page_header('The GOV.UK Notify service is for people who work in the government') }} + {{ page_header('The US Notify service is for people who work in the government') }}

    We cannot give advice to the public. We do not have access to information about you held by government departments.

    - There are other pages on GOV.UK where you can get help: + There are other pages on US Notifywhere you can get help:

    diff --git a/app/templates/views/support/triage.html b/app/templates/views/support/triage.html index f44eca807..21cc04f85 100644 --- a/app/templates/views/support/triage.html +++ b/app/templates/views/support/triage.html @@ -48,11 +48,11 @@ you send the wrong message by accident
  • - a team member uses GOV.UK Notify to send an + a team member uses US Notify to send an inappropriate message
  • - your system is telling the GOV.UK Notify API to send the wrong + your system is telling the US Notify API to send the wrong message

diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html index 3923e8c97..7e0790885 100644 --- a/app/templates/views/templates/action_blocked.html +++ b/app/templates/views/templates/action_blocked.html @@ -21,7 +21,7 @@

If you need to send {{ 999|message_count_label(notification_type, suffix='') }} - get in touch with the GOV.UK Notify team. + get in touch with the US Notify team.

diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 3080ab3b5..3a4b45133 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -10,7 +10,7 @@

Terms of use

- These terms apply to your service’s use of GOV.UK Notify. You must be the service manager to accept them. + These terms apply to your service’s use of US Notify. You must be the service manager to accept them.

When using Notify

@@ -22,7 +22,7 @@
  • get the right levels of consent (to send messages and to use data)
  • not send unsolicited messages, only ones related to a transaction or something the user has subscribed to be updated about (check the Service Manual if you’re not sure)
  • - send messages that meet the GOV.UK Service Manual standards for writing text messages and emails
    • + send messages that meet the US NotifyService Manual standards for writing text messages and emails
  • check that the data you add to Notify is accurate and complies with data protection legislation

    • If you do not keep to these terms, we might have to stop sending your messages.

    diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html index fa942a0c2..4fb808af6 100644 --- a/app/templates/views/trial-mode.html +++ b/app/templates/views/trial-mode.html @@ -8,7 +8,7 @@

    Trial mode

    -

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

    +

    When you add a new service it will start in trial mode. This lets you try out US Notify, with a few restrictions.

    While your service is in trial mode you can only: