Medium-level content updates from audit (#497)

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 @@
 
 <h2 class="heading-medium" id="personalised-messages">Personalized content</h2>
 <p class="govuk-body">Notify makes it easy to send personalized messages from a single template.</p>
-<p class="govuk-body">See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.edit_and_format_messages', _anchor='personalised-content') }}">how to personalize your content</a>.</p>
+<p class="govuk-body">See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.guidance_index', _anchor='personalized-content') }}">how to personalize your content</a>.</p>
+<h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
+<p class="govuk-body">When you send a text message with Notify, the sender name tells people who it’s from.</p>
+
+<p class="govuk-body">To change the text message sender from the default of ‘U.S. Notify’:</p>
+
+<ol class="list list-number">
+  <li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{
+    service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
+  <li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message
+      senders</b> row.</li>
+  <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message
+      sender</b>.</li>
+</ol>
 
 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p class="govuk-body">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.</p>
@@ -56,7 +70,7 @@
 
 <!-- <p class="govuk-body">We send messages through several different providers. If one provider fails, Notify switches to another so that your messages are not affected.</p> -->
 
-<p class="govuk-body">Visit our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance data</a> page to see how Notify is performing.</p>
+<!-- <p class="govuk-body">Visit our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance data</a> page to see how Notify is performing.</p> -->
 
 <h2 class="heading-medium" id="security">Security</h2>
 <p class="govuk-body">Notify protects and manages data to meet the needs of government services.</p>

app/templates/views/guidance/edit-and-format-messages.html

@@ -13,7 +13,7 @@
   <ul class="list list-bullet">
     <li><a class="govuk-link govuk-link--no-visited-state" href="#formatting">format your content</a></li>
     <li><a class="govuk-link govuk-link--no-visited-state" href="#links">add links</a></li>
-    <li><a class="govuk-link govuk-link--no-visited-state" href="#personalised-content">personalize your content</a></li>
+    <li><a class="govuk-link govuk-link--no-visited-state" href="#personalized-content">personalize your content</a></li>
     <li><a class="govuk-link govuk-link--no-visited-state" href="#optional-content">add optional content</a></li>
   </ul>
 
@@ -50,7 +50,7 @@
     <li>you can no longer control where the redirect goes</li>
   </ul>
 
-  <h2 class="heading-medium" id="personalised-content">Personalize your content</h2>
+  <h2 class="heading-medium" id="personalized-content">Personalize your content</h2>
 
   <p class="govuk-body">To personalize the content of your messages, add a placeholder to the template.</p>
 

app/templates/views/performance.html

@@ -16,7 +16,7 @@
   </div>
 
   <h2 class="govuk-heading-m">
-    Messages sent since May 2016
+    Messages sent since May 2023
   </h2>
 
   <div class="govuk-grid-row">
@@ -47,7 +47,7 @@
   <div class="dashboard-table">
     {% 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',

app/templates/views/signedout.html

@@ -51,12 +51,12 @@
           Control your content
         </h2>
         <p class="govuk-body">
-          You do not need any technical knowledge to create message templates.
+          You do not need any technical knowledge to create messages.
         </p>
       </div>
       <div class="govuk-grid-column-one-half">
         <img
-          src="{{ asset_url('images/product/01-templates.svg') }}"
+          src="{{ asset_url('images/product/01-templates-no-chrome.svg') }}"
           alt="Example screenshot of adding a new text message template">
       </div>
     </div>
@@ -74,7 +74,7 @@
       </div>
       <div class="govuk-grid-column-one-half">
         <img
-          src="{{ asset_url('images/product/02-reporting.svg') }}"
+          src="{{ asset_url('images/product/02-reporting-no-chrome.svg') }}"
           alt="A screenshot of U.S. Notify showing counts of emails and text messages sent"
         >
       </div>
@@ -90,7 +90,7 @@
           Upload a spreadsheet of phone&nbsp;numbers and Notify sends the messages.
         </p>
         <img
-          src="{{ asset_url('images/product/03-spreadsheet.svg') }}"
+          src="{{ asset_url('images/product/03-spreadsheet-no-chrome.svg') }}"
           alt="A screenshot of a spreadsheet with columns for email address, name and color"
         >
       </div>
@@ -100,7 +100,7 @@
           back office system.
         </p>
         <img
-          src="{{ asset_url('images/product/04-api.svg') }}"
+          src="{{ asset_url('images/product/04-api-no-chrome.svg') }}"
           alt="A screenshot of some computer code with a notify.send_email function"
         >
       </div>
@@ -122,10 +122,10 @@
           <span class="govuk-visually-hidden">using Notify.</span>
         </div>
       </div>
-      <p class="govuk-body">
+      <!-- <p class="govuk-body">
         See the
         <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">list of services and organizations</a>.
-      </p>
+      </p> -->
     </div>
   </div>
   <!-- <div class="product-page-section">
@@ -154,7 +154,7 @@
     </div>
   </div> -->
   <div class="product-page-section">
-    <div class="govuk-grid-row">
+    <div class="govuk-grid-row bottom-gutter-2">
       <div class="govuk-grid-column-full">
         <h2 class="with-keyline">
           The team

app/templates/views/terms-of-use.html

@@ -28,9 +28,9 @@
   <p class="govuk-body"> U.S. Notify will:</p>
   <ul class="list list-bullet">
     <li>send all the messages you pass to us, as long as they meet our guidelines</li>
-    <li>
+    <!-- <li>
-      show how Notify is performing (through our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance</a> <!--and <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk/">status</a>-->page)
+      show how Notify is performing (through our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.performance') }}">performance</a> and <a class="govuk-link govuk-link--no-visited-state" href="https://status.notifications.service.gov.uk/">status</a> page)
-    </li>
+    </li> -->
     <li>keep your data <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.security') }}">secure</a></li>
     <li>give you one month’s notice by email if we change our terms of use or delivery providers</li>
   </ul>

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) == (
+    # assert normalize_spaces(page.select_one('#whos-using-notify').text) == (
-        'Who’s using U.S. Notify '
+    #     'Who’s using U.S. Notify '
-        'There are 111 organizations and 9,999 services using Notify. '
+    #     'There are 111 organizations and 9,999 services using Notify. '
-        'See the list of services and organizations.'
+    #     'See the list of services and organizations.'
-    )
+    # )
-    assert page.select_one('#whos-using-notify a')['href'] == url_for(
+    # assert page.select_one('#whos-using-notify a')['href'] == url_for(
-        'main.performance'
+    #     '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(

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,
+        "total_notifications": 1_789_000_000,
-      "email_notifications": 1_123_000_000,
+        "email_notifications": 1_123_000_000,
-      "sms_notifications": 987_654_321,
+        "sms_notifications": 987_654_321,
-      "live_service_count": random.randrange(1, 1000),
+        "live_service_count": random.randrange(1, 1000),
-      "notifications_by_type": [
+        "notifications_by_type": [
-        {
+            {
-          "date": "2021-02-21",
+                "date": "2021-02-21",
-          "emails": 1_234_567, "sms": 123_456,
+                "emails": 1_234_567, "sms": 123_456,
-        },
+            },
-        {
+            {
-          "date": "2021-02-22",
+                "date": "2021-02-22",
-          "emails": 1, "sms": 2,
+                "emails": 1, "sms": 2,
-        },
+            },
-        {
+            {
-          "date": "2021-02-23",
+                "date": "2021-02-23",
-          "emails": 1, "sms": 2,
+                "emails": 1, "sms": 2,
-        },
+            },
-        {
+            {
-          "date": "2021-02-24",
+                "date": "2021-02-24",
-          "emails": 1, "sms": 2,
+                "emails": 1, "sms": 2,
-        },
+            },
-        {
+            {
-          "date": "2021-02-25",
+                "date": "2021-02-25",
-          "emails": 1, "sms": 2,
+                "emails": 1, "sms": 2,
-        },
+            },
-        {
+            {
-          "date": "2021-02-26",
+                "date": "2021-02-26",
-          "emails": 1, "sms": 2,
+                "emails": 1, "sms": 2,
-        },
+            },
-        {
+            {
-          "date": "2021-02-27",
+                "date": "2021-02-27",
-          "emails": 1, "sms": 2,
+                "emails": 1, "sms": 2,
-        },
+            },
-      ],
+        ],
-      "processing_time": [
+        "processing_time": [
-        {
+            {
-          "date": "2021-02-21",
+                "date": "2021-02-21",
-          "percentage_under_10_seconds": 99.25
+                "percentage_under_10_seconds": 99.25
-        },
+            },
-        {
+            {
-          "date": "2021-02-22",
+                "date": "2021-02-22",
-          "percentage_under_10_seconds": 95.30
+                "percentage_under_10_seconds": 95.30
-        },
+            },
-        {
+            {
-          "date": "2021-02-23",
+                "date": "2021-02-23",
-          "percentage_under_10_seconds": 95.0
+                "percentage_under_10_seconds": 95.0
-        },
+            },
-        {
+            {
-          "date": "2021-02-24",
+                "date": "2021-02-24",
-          "percentage_under_10_seconds": 100.0
+                "percentage_under_10_seconds": 100.0
-        },
+            },
-        {
+            {
-          "date": "2021-02-25",
+                "date": "2021-02-25",
-          "percentage_under_10_seconds": 99.99
+                "percentage_under_10_seconds": 99.99
-        },
+            },
-        {
+            {
-          "date": "2021-02-26",
+                "date": "2021-02-26",
-          "percentage_under_10_seconds": 100.0
+                "percentage_under_10_seconds": 100.0
-        },
+            },
-        {
+            {
-          "date": "2021-02-27",
+                "date": "2021-02-27",
-          "percentage_under_10_seconds": 98.60
+                "percentage_under_10_seconds": 98.60
-        },
+            },
-      ],
+        ],
-      "services_using_notify": [
+        "services_using_notify": [
-        {
+            {
-          "organisation_id": uuid.uuid4(),
+                "organisation_id": uuid.uuid4(),
-          "organisation_name": "Department of Examples and Patterns",
+                "organisation_name": "Department of Examples and Patterns",
-          "service_id": uuid.uuid4(),
+                "service_id": uuid.uuid4(),
-          "service_name": "Example service"
+                "service_name": "Example service"
-        },
+            },
-        {
+            {
-          "organisation_id": uuid.uuid4(),
+                "organisation_id": uuid.uuid4(),
-          "organisation_name": "Department of Examples and Patterns",
+                "organisation_name": "Department of Examples and Patterns",
-          "service_id": uuid.uuid4(),
+                "service_id": uuid.uuid4(),
-          "service_name": "Example service 2"
+                "service_name": "Example service 2"
-        },
+            },
-        {
+            {
-          "organisation_id": uuid.uuid4(),
+                "organisation_id": uuid.uuid4(),
-          "organisation_name": "Department of One Service",
+                "organisation_name": "Department of One Service",
-          "service_id": uuid.uuid4(),
+                "service_id": uuid.uuid4(),
-          "service_name": "Example service 3"
+                "service_name": "Example service 3"
-        },
+            },
-        {
+            {
-          # On production there should be no live services without an
+                # On production there should be no live services without an
-          # organisation, but this isn’t always true in people’s local
+                # organisation, but this isn’t always true in people’s local
-          # environments
+                # environments
-          "organisation_id": None,
+                "organisation_id": None,
-          "organisation_name": None,
+                "organisation_name": None,
-          "service_id": uuid.uuid4(),
+                "service_id": uuid.uuid4(),
-          "service_name": "Example service 4"
+                "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 '