From 4f91a9e9f9faf077278ce415515107fb835bbc37 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 1 Jun 2023 12:46:19 -0400 Subject: [PATCH] Medium-level content updates from audit (#497) --- .../images/product/01-templates-no-chrome.svg | 84 ++++++++ .../images/product/02-reporting-no-chrome.svg | 85 ++++++++ .../product/03-spreadsheet-no-chrome.svg | 113 +++++++++++ .../images/product/04-api-no-chrome.svg | 22 ++ app/templates/views/features.html | 18 +- .../guidance/edit-and-format-messages.html | 4 +- app/templates/views/performance.html | 4 +- app/templates/views/signedout.html | 16 +- app/templates/views/terms-of-use.html | 6 +- tests/app/main/views/test_index.py | 20 +- tests/app/main/views/test_performance.py | 190 +++++++++--------- 11 files changed, 442 insertions(+), 120 deletions(-) create mode 100644 app/assets/images/product/01-templates-no-chrome.svg create mode 100644 app/assets/images/product/02-reporting-no-chrome.svg create mode 100644 app/assets/images/product/03-spreadsheet-no-chrome.svg create mode 100644 app/assets/images/product/04-api-no-chrome.svg diff --git a/app/assets/images/product/01-templates-no-chrome.svg b/app/assets/images/product/01-templates-no-chrome.svg new file mode 100644 index 000000000..385166770 --- /dev/null +++ b/app/assets/images/product/01-templates-no-chrome.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/product/02-reporting-no-chrome.svg b/app/assets/images/product/02-reporting-no-chrome.svg new file mode 100644 index 000000000..fc877a5ef --- /dev/null +++ b/app/assets/images/product/02-reporting-no-chrome.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/product/03-spreadsheet-no-chrome.svg b/app/assets/images/product/03-spreadsheet-no-chrome.svg new file mode 100644 index 000000000..b957b6d72 --- /dev/null +++ b/app/assets/images/product/03-spreadsheet-no-chrome.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/product/04-api-no-chrome.svg b/app/assets/images/product/04-api-no-chrome.svg new file mode 100644 index 000000000..bcdb15e36 --- /dev/null +++ b/app/assets/images/product/04-api-no-chrome.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/templates/views/features.html b/app/templates/views/features.html index eda6d6bc3..73759a769 100644 --- a/app/templates/views/features.html +++ b/app/templates/views/features.html @@ -1,6 +1,7 @@ {% extends "content_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 %} +{% from "components/service-link.html" import service_link %} {% block per_page_title %} Features @@ -26,7 +27,20 @@

Personalized content

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

-

See how to personalize your content.

+

See how to personalize your content.

+

Show people who your texts are from

+

When you send a text message with Notify, the sender name tells people who it’s from.

+ +

To change the text message sender from the default of ‘U.S. Notify’:

+ +
    +
  1. Go to the Text message settings section of the {{ + service_link(current_service, 'main.service_settings', 'settings') }} page.
  2. +
  3. Select Manage on the Text message + senders row.
  4. +
  5. Select Change or Add text message + sender.
  6. +

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.

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

Visit our performance data page to see how Notify is performing.

+

Security

Notify protects and manages data to meet the needs of government services.

diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html index 5c0281fd1..760ee839d 100644 --- a/app/templates/views/guidance/edit-and-format-messages.html +++ b/app/templates/views/guidance/edit-and-format-messages.html @@ -13,7 +13,7 @@ @@ -50,7 +50,7 @@
  • you can no longer control where the redirect goes
  • -

    Personalize your content

    +

    Personalize your content

    To personalize the content of your messages, add a placeholder to the template.

    diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html index 4eaad99da..beff5f13d 100644 --- a/app/templates/views/performance.html +++ b/app/templates/views/performance.html @@ -16,7 +16,7 @@

    - Messages sent since May 2016 + Messages sent since May 2023

    @@ -47,7 +47,7 @@
    {% call(item, row_number) list_table( notifications_by_type|reverse, - caption='Messages sent since May 2016', + caption='Messages sent since May 2023', caption_visible=False, field_headings=[ 'Date', diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 72ccc4c8a..22c611a74 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -51,12 +51,12 @@ Control your content

    - You do not need any technical knowledge to create message templates. + You do not need any technical knowledge to create messages.

    Example screenshot of adding a new text message template
    @@ -74,7 +74,7 @@
    A screenshot of U.S. Notify showing counts of emails and text messages sent
    @@ -90,7 +90,7 @@ Upload a spreadsheet of phone numbers and Notify sends the messages.

    A screenshot of a spreadsheet with columns for email address, name and color @@ -100,7 +100,7 @@ back office system.

    A screenshot of some computer code with a notify.send_email function @@ -122,10 +122,10 @@ using Notify. -

    +

    -
    +

    The team diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 1186d07a4..e470c4d13 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -28,9 +28,9 @@

    U.S. Notify will:

    • send all the messages you pass to us, as long as they meet our guidelines
    • -
    • - show how Notify is performing (through our performance page) -
    • +
    • keep your data secure
    • give you one month’s notice by email if we change our terms of use or delivery providers
    diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index d9f0e1825..c05398e15 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -28,14 +28,18 @@ def test_non_logged_in_user_can_see_homepage( 'to your users. Try it now if you work in federal, state, or local government.' ) - assert normalize_spaces(page.select_one('#whos-using-notify').text) == ( - 'Who’s using U.S. Notify ' - 'There are 111 organizations and 9,999 services using Notify. ' - 'See the list of services and organizations.' - ) - assert page.select_one('#whos-using-notify a')['href'] == url_for( - 'main.performance' - ) + # assert normalize_spaces(page.select_one('#whos-using-notify').text) == ( + # 'Who’s using U.S. Notify ' + # 'There are 111 organizations and 9,999 services using Notify. ' + # 'See the list of services and organizations.' + # ) + # assert page.select_one('#whos-using-notify a')['href'] == url_for( + # 'main.performance' + # ) + + # To be removed if we decide to use the "Who’s using Notify" link + anchor_tag = page.select_one('#whos-using-notify a') + assert anchor_tag is None def test_logged_in_user_redirects_to_choose_account( diff --git a/tests/app/main/views/test_performance.py b/tests/app/main/views/test_performance.py index a4bb53e35..b7a560b79 100644 --- a/tests/app/main/views/test_performance.py +++ b/tests/app/main/views/test_performance.py @@ -9,99 +9,99 @@ from tests.conftest import normalize_spaces def _get_example_performance_data(): return { - "total_notifications": 1_789_000_000, - "email_notifications": 1_123_000_000, - "sms_notifications": 987_654_321, - "live_service_count": random.randrange(1, 1000), - "notifications_by_type": [ - { - "date": "2021-02-21", - "emails": 1_234_567, "sms": 123_456, - }, - { - "date": "2021-02-22", - "emails": 1, "sms": 2, - }, - { - "date": "2021-02-23", - "emails": 1, "sms": 2, - }, - { - "date": "2021-02-24", - "emails": 1, "sms": 2, - }, - { - "date": "2021-02-25", - "emails": 1, "sms": 2, - }, - { - "date": "2021-02-26", - "emails": 1, "sms": 2, - }, - { - "date": "2021-02-27", - "emails": 1, "sms": 2, - }, - ], - "processing_time": [ - { - "date": "2021-02-21", - "percentage_under_10_seconds": 99.25 - }, - { - "date": "2021-02-22", - "percentage_under_10_seconds": 95.30 - }, - { - "date": "2021-02-23", - "percentage_under_10_seconds": 95.0 - }, - { - "date": "2021-02-24", - "percentage_under_10_seconds": 100.0 - }, - { - "date": "2021-02-25", - "percentage_under_10_seconds": 99.99 - }, - { - "date": "2021-02-26", - "percentage_under_10_seconds": 100.0 - }, - { - "date": "2021-02-27", - "percentage_under_10_seconds": 98.60 - }, - ], - "services_using_notify": [ - { - "organisation_id": uuid.uuid4(), - "organisation_name": "Department of Examples and Patterns", - "service_id": uuid.uuid4(), - "service_name": "Example service" - }, - { - "organisation_id": uuid.uuid4(), - "organisation_name": "Department of Examples and Patterns", - "service_id": uuid.uuid4(), - "service_name": "Example service 2" - }, - { - "organisation_id": uuid.uuid4(), - "organisation_name": "Department of One Service", - "service_id": uuid.uuid4(), - "service_name": "Example service 3" - }, - { - # On production there should be no live services without an - # organisation, but this isn’t always true in people’s local - # environments - "organisation_id": None, - "organisation_name": None, - "service_id": uuid.uuid4(), - "service_name": "Example service 4" - }, - ], + "total_notifications": 1_789_000_000, + "email_notifications": 1_123_000_000, + "sms_notifications": 987_654_321, + "live_service_count": random.randrange(1, 1000), + "notifications_by_type": [ + { + "date": "2021-02-21", + "emails": 1_234_567, "sms": 123_456, + }, + { + "date": "2021-02-22", + "emails": 1, "sms": 2, + }, + { + "date": "2021-02-23", + "emails": 1, "sms": 2, + }, + { + "date": "2021-02-24", + "emails": 1, "sms": 2, + }, + { + "date": "2021-02-25", + "emails": 1, "sms": 2, + }, + { + "date": "2021-02-26", + "emails": 1, "sms": 2, + }, + { + "date": "2021-02-27", + "emails": 1, "sms": 2, + }, + ], + "processing_time": [ + { + "date": "2021-02-21", + "percentage_under_10_seconds": 99.25 + }, + { + "date": "2021-02-22", + "percentage_under_10_seconds": 95.30 + }, + { + "date": "2021-02-23", + "percentage_under_10_seconds": 95.0 + }, + { + "date": "2021-02-24", + "percentage_under_10_seconds": 100.0 + }, + { + "date": "2021-02-25", + "percentage_under_10_seconds": 99.99 + }, + { + "date": "2021-02-26", + "percentage_under_10_seconds": 100.0 + }, + { + "date": "2021-02-27", + "percentage_under_10_seconds": 98.60 + }, + ], + "services_using_notify": [ + { + "organisation_id": uuid.uuid4(), + "organisation_name": "Department of Examples and Patterns", + "service_id": uuid.uuid4(), + "service_name": "Example service" + }, + { + "organisation_id": uuid.uuid4(), + "organisation_name": "Department of Examples and Patterns", + "service_id": uuid.uuid4(), + "service_name": "Example service 2" + }, + { + "organisation_id": uuid.uuid4(), + "organisation_name": "Department of One Service", + "service_id": uuid.uuid4(), + "service_name": "Example service 3" + }, + { + # On production there should be no live services without an + # organisation, but this isn’t always true in people’s local + # environments + "organisation_id": None, + "organisation_name": None, + "service_id": uuid.uuid4(), + "service_name": "Example service 4" + }, + ], } @@ -123,12 +123,12 @@ def test_should_render_performance_page( assert normalize_spaces(page.select_one('main').text) == ( 'Performance data ' '' - 'Messages sent since May 2016 ' + 'Messages sent since May 2023 ' '1.8 billion total ' '1.1 billion emails ' '987.7 million text messages ' '' - 'Messages sent since May 2016 ' + 'Messages sent since May 2023 ' 'Date Emails Text messages ' '26 February 2021 1 2 ' '25 February 2021 1 2 '