From dcc38b561925b9b9f10284aa743530924c3d96f0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 13:46:04 +0100 Subject: [PATCH 01/19] Change previous to past --- app/main/views/broadcast.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/views/broadcast.py b/app/main/views/broadcast.py index 1ad578a58..35627d236 100644 --- a/app/main/views/broadcast.py +++ b/app/main/views/broadcast.py @@ -64,7 +64,7 @@ def broadcast_dashboard(service_id): ) -@main.route('/services//previous-alerts') +@main.route('/services//past-alerts') @user_has_permissions() @service_has_permission('broadcast') def broadcast_dashboard_previous(service_id): @@ -74,8 +74,8 @@ def broadcast_dashboard_previous(service_id): 'cancelled', 'completed', ), - page_title='Previous alerts', - empty_message='You do not have any previous alerts', + page_title='Past alerts', + empty_message='You do not have any past alerts', view_broadcast_endpoint='.view_previous_broadcast', ) From ff576555cfaba9df4bb3d374ce9b6ccf662a2e7d Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 13:47:10 +0100 Subject: [PATCH 02/19] Change previous to past --- app/templates/main_nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index f7702cd10..092825c73 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -6,7 +6,7 @@ {% if current_user.has_permissions() %} {% if current_service.has_permission('broadcast') %}
  • Current alerts
    • -
  • Previous alerts
    • +
  • Past alerts
  • Rejected alerts
    • {% elif current_user.has_permissions('view_activity') %}
  • Dashboard
    • From a8bd65254e88993006c412880f09e742e958f685 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 13:49:36 +0100 Subject: [PATCH 03/19] Change previous to past --- tests/app/main/views/test_broadcast.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 126e31509..fe380b9c8 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -568,7 +568,7 @@ def test_previous_broadcasts_page( ) assert normalize_spaces(page.select_one('main h1').text) == ( - 'Previous alerts' + 'Past alerts' ) assert len(page.select('.ajax-block-container')) == 1 assert [ @@ -1657,7 +1657,7 @@ def test_view_broadcast_message_page( ), ( 'completed', - 'Previous alerts', + 'Past alerts', '.broadcast_dashboard_previous', ), ( From 72e83adb19fbd5dafdeb85462efe01d18e2da3dc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 15:56:21 +0100 Subject: [PATCH 04/19] Replace use of 'broadcast' --- app/templates/views/broadcast/libraries.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/broadcast/libraries.html b/app/templates/views/broadcast/libraries.html index 5b5981531..8c4fb8df3 100644 --- a/app/templates/views/broadcast/libraries.html +++ b/app/templates/views/broadcast/libraries.html @@ -3,13 +3,13 @@ {% extends "withnav_template.html" %} {% block service_page_title %} - Choose where to broadcast to + Choose where to send this alert {% endblock %} {% block maincolumn_content %} {{ page_header( - "Choose where to broadcast to", + "Choose where to send this alert", back_link=url_for(".preview_broadcast_areas", service_id=current_service.id, broadcast_message_id=broadcast_message.id) ) }} From 4d2e76940004e4aebc4c23eea050a4813c394580 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 15:57:37 +0100 Subject: [PATCH 05/19] Replace use of 'broadcast' --- app/templates/views/broadcast/preview-areas.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/broadcast/preview-areas.html b/app/templates/views/broadcast/preview-areas.html index a1317bfbd..125502f57 100644 --- a/app/templates/views/broadcast/preview-areas.html +++ b/app/templates/views/broadcast/preview-areas.html @@ -6,7 +6,7 @@ {% extends "withnav_template.html" %} {% block service_page_title %} - Choose where to broadcast to + Choose where to send this alert {% endblock %} {% block extra_stylesheets %} @@ -20,7 +20,7 @@ {% block maincolumn_content %} {{ page_header( - "Choose where to broadcast to", + "Choose where to send this alert", back_link=back_link ) }} From 5ffb2a85945c5d23081081b2accbd3154e6da017 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:22:47 +0100 Subject: [PATCH 06/19] Remove use of 'broadcast' --- app/templates/views/broadcast/areas.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/areas.html b/app/templates/views/broadcast/areas.html index f55c364cf..0ec748c56 100644 --- a/app/templates/views/broadcast/areas.html +++ b/app/templates/views/broadcast/areas.html @@ -26,7 +26,7 @@ {% call form_wrapper() %} {{ form.areas }} - {{ sticky_page_footer('Add to broadcast') }} + {{ sticky_page_footer('Continue') }} {% endcall %} {% endblock %} From 64b0fb769bc0ca24f02eaaf989c1c5e7994eb449 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:23:25 +0100 Subject: [PATCH 07/19] Remove use of 'broadcast' --- app/templates/views/broadcast/counties.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/counties.html b/app/templates/views/broadcast/counties.html index e50e091cb..0d9a503dc 100644 --- a/app/templates/views/broadcast/counties.html +++ b/app/templates/views/broadcast/counties.html @@ -35,7 +35,7 @@ {% endfor %} - {{ sticky_page_footer('Add to broadcast') }} + {{ sticky_page_footer('Continue') }} {% endcall %} From f910c91a9df82f15896a1b0db149fefbc85f5974 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:23:55 +0100 Subject: [PATCH 08/19] Remove use of 'broadcast' --- app/templates/views/broadcast/sub-areas.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/sub-areas.html b/app/templates/views/broadcast/sub-areas.html index 71b446996..a69d0aa9e 100644 --- a/app/templates/views/broadcast/sub-areas.html +++ b/app/templates/views/broadcast/sub-areas.html @@ -28,7 +28,7 @@ {{ form.areas }} - {{ sticky_page_footer('Add to broadcast') }} + {{ sticky_page_footer('Continue') }} {% endcall %} From d804ab747e9d7df4d09459a38eb667b1863e989b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:38:46 +0100 Subject: [PATCH 09/19] Replace use of 'broadcast' --- app/templates/views/templates/_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html index 90a84165d..bcb73f2b2 100644 --- a/app/templates/views/templates/_template.html +++ b/app/templates/views/templates/_template.html @@ -31,7 +31,7 @@ {% if current_user.has_permissions('send_messages') %}
    - Prepare broadcast + Get ready to send
    {% endif %} From 60d8734f79709ee438c0ea470f8639d05aa5f5c0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:39:48 +0100 Subject: [PATCH 10/19] Replace use of 'broadcast' --- tests/app/main/views/test_templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 4412c4bb0..7efa565e7 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -913,7 +913,7 @@ def test_view_broadcast_template( (link.text.strip(), link['href']) for link in page.select('.pill-separate-item') ] == [ - ('Prepare broadcast', url_for( + ('Get ready to send', url_for( '.broadcast', service_id=SERVICE_ONE_ID, template_id=fake_uuid, From d7e2b0b783b4ce04848d767081d96a9b2b71fa56 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:41:17 +0100 Subject: [PATCH 11/19] Replace 'broadcast' and 'prepared' --- app/templates/views/broadcast/view-message.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index 5a447b032..a0af70ee6 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -134,7 +134,7 @@

    {% else %}

    - Broadcast + Sent {{ broadcast_message.starts_at|format_datetime_human }}.

    {% endif %} @@ -165,7 +165,7 @@ {% if broadcast_message.status != 'pending-approval' %}

    {% if broadcast_message.created_by %} - Prepared by {{ broadcast_message.created_by.name }} + Sent by {{ broadcast_message.created_by.name }} {%- else %} Created from an API call {%- endif %} From 2b8a495dc7e7b547e6233b8cba97d118e204c0fc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 16:50:49 +0100 Subject: [PATCH 12/19] Update preview button content --- app/templates/views/broadcast/preview-areas.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/preview-areas.html b/app/templates/views/broadcast/preview-areas.html index 125502f57..923c0f43a 100644 --- a/app/templates/views/broadcast/preview-areas.html +++ b/app/templates/views/broadcast/preview-areas.html @@ -54,7 +54,7 @@ {% if broadcast_message.areas %} {{ map(broadcast_message) }}

    - {{ page_footer('Continue to preview') }} + {{ page_footer('Preview this alert') }}
    {% endif %} From 2cc1ccfd7edf3e77eec3138405081fdbe4bced2b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 17:10:35 +0100 Subject: [PATCH 13/19] Change 'withdraw' to 'discard' --- app/templates/views/broadcast/view-message.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index a0af70ee6..21edc5b0c 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -53,7 +53,7 @@

    {{ page_footer( delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id), - delete_link_text='Withdraw this alert' + delete_link_text='Discard this alert' ) }} {% else %}

    From 18800a9cec819325d88946a81a11b8959991e809 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 17:11:26 +0100 Subject: [PATCH 14/19] Change 'withdraw' to 'discard' --- tests/app/main/views/test_broadcast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index fe380b9c8..bc2fa28b0 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -2011,7 +2011,7 @@ def test_cant_approve_own_broadcast( assert not page.select('form') link = page.select_one('.banner a.govuk-link.govuk-link--destructive') - assert link.text == 'Withdraw this alert' + assert link.text == 'Discard this alert' assert link['href'] == url_for( '.reject_broadcast_message', service_id=SERVICE_ONE_ID, From d90d0d632e764d16c46fc36a55921b7d357c23a3 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 17:21:57 +0100 Subject: [PATCH 15/19] Change 'cancel' to 'reject' --- tests/app/main/views/test_broadcast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index bc2fa28b0..390198e97 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -2075,7 +2075,7 @@ def test_can_approve_own_broadcast_in_trial_mode( 'alerts, to see how it works. ' 'No real alerts will be broadcast to anyone’s phone. ' 'Start broadcasting now ' - 'Cancel this alert' + 'Reject this alert' ) form = page.select_one('.banner details form') From 4b198fdf7256aa290851d9a4d5c33a8c7b1141a0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 17:22:35 +0100 Subject: [PATCH 16/19] Change 'cancel' to 'reject' --- app/templates/views/broadcast/view-message.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index 21edc5b0c..fc76c8deb 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -75,7 +75,7 @@ {{ page_footer( "Start broadcasting now", delete_link=url_for('main.reject_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id), - delete_link_text='Cancel this alert' + delete_link_text='Reject this alert' ) }} {% endcall %} From cd6574c28dc5539bc3d12e48dd3aa26bbf452479 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Mon, 5 Jul 2021 17:42:37 +0100 Subject: [PATCH 17/19] Change 'broadcasting' to 'sending' --- app/templates/views/broadcast/view-message.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index fc76c8deb..1ba0edceb 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -124,7 +124,7 @@

    Live since {{ broadcast_message.starts_at|format_datetime_relative }}  {%- if not hide_stop_link %} - Stop broadcasting + Stop sending {% endif %}

    {% elif broadcast_message.status == 'rejected' %} From 59ed8b0f8b20728b3fdb518bd92975d75e2a8094 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Tue, 6 Jul 2021 16:42:54 +0100 Subject: [PATCH 18/19] Update tests for new content --- tests/app/main/views/test_broadcast.py | 26 +++++++++++++------------- tests/app/test_navigation.py | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 390198e97..bca5cbbf5 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -1542,15 +1542,15 @@ def test_start_broadcasting( 'status': 'broadcasting', 'finishes_at': '2020-02-23T23:23:23.000000', }, [ - 'Live since 20 February at 8:20pm Stop broadcasting', - 'Prepared by Alice and approved by Bob.', + 'Live since 20 February at 8:20pm Stop sending', + 'Sent by Alice and approved by Bob.', 'Broadcasting stops tomorrow at 11:23pm.' ]), ('.view_current_broadcast', True, { 'status': 'broadcasting', 'finishes_at': '2020-02-23T23:23:23.000000', }, [ - 'Live since 20 February at 8:20pm Stop broadcasting', + 'Live since 20 February at 8:20pm Stop sending', 'Created from an API call and approved by Alice.', 'Broadcasting stops tomorrow at 11:23pm.' ]), @@ -1558,15 +1558,15 @@ def test_start_broadcasting( 'status': 'broadcasting', 'finishes_at': '2020-02-22T22:20:20.000000', # 2 mins before now() }, [ - 'Broadcast on 20 February at 8:20pm.', - 'Prepared by Alice and approved by Bob.', + 'Sent on 20 February at 8:20pm.', + 'Sent by Alice and approved by Bob.', 'Finished broadcasting today at 10:20pm.' ]), ('.view_previous_broadcast', True, { 'status': 'broadcasting', 'finishes_at': '2020-02-22T22:20:20.000000', # 2 mins before now() }, [ - 'Broadcast on 20 February at 8:20pm.', + 'Sent on 20 February at 8:20pm.', 'Created from an API call and approved by Alice.', 'Finished broadcasting today at 10:20pm.' ]), @@ -1574,8 +1574,8 @@ def test_start_broadcasting( 'status': 'completed', 'finishes_at': '2020-02-21T21:21:21.000000', }, [ - 'Broadcast on 20 February at 8:20pm.', - 'Prepared by Alice and approved by Bob.', + 'Sent on 20 February at 8:20pm.', + 'Sent by Alice and approved by Bob.', 'Finished broadcasting yesterday at 9:21pm.', ]), ('.view_previous_broadcast', False, { @@ -1583,8 +1583,8 @@ def test_start_broadcasting( 'cancelled_by_id': sample_uuid, 'cancelled_at': '2020-02-21T21:21:21.000000', }, [ - 'Broadcast on 20 February at 8:20pm.', - 'Prepared by Alice and approved by Bob.', + 'Sent on 20 February at 8:20pm.', + 'Sent by Alice and approved by Bob.', 'Stopped by Carol yesterday at 9:21pm.', ]), ('.view_rejected_broadcast', False, { @@ -1592,7 +1592,7 @@ def test_start_broadcasting( 'updated_at': '2020-02-21T21:21:21.000000', }, [ 'Rejected yesterday at 9:21pm.', - 'Prepared by Alice and approved by Bob.', + 'Sent by Alice and approved by Bob.', ]), )) @freeze_time('2020-02-22T22:22:22.000000') @@ -1662,7 +1662,7 @@ def test_view_broadcast_message_page( ), ( 'cancelled', - 'Previous alerts', + 'Past alerts', '.broadcast_dashboard_previous', ), ( @@ -2086,7 +2086,7 @@ def test_can_approve_own_broadcast_in_trial_mode( ) link = page.select_one('.banner a.govuk-link.govuk-link--destructive') - assert link.text == 'Cancel this alert' + assert link.text == 'Reject this alert' assert link['href'] == url_for( '.reject_broadcast_message', service_id=SERVICE_ONE_ID, diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index f29ea0a0d..5488ea728 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -509,7 +509,7 @@ def test_navigation_for_services_with_broadcast_permission( a['href'] for a in page.select('.navigation a') ] == [ '/services/{}/current-alerts'.format(SERVICE_ONE_ID), - '/services/{}/previous-alerts'.format(SERVICE_ONE_ID), + '/services/{}/past-alerts'.format(SERVICE_ONE_ID), '/services/{}/rejected-alerts'.format(SERVICE_ONE_ID), '/services/{}/templates'.format(SERVICE_ONE_ID), '/services/{}/users'.format(SERVICE_ONE_ID), From 9ac51481d74545989b14f0fd72916975c4a083cc Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Jul 2021 16:31:28 +0100 Subject: [PATCH 19/19] Remove most uses of broadcast from the tour We prefer send now. I think broadcast as a verb is still good in explaining how it coming straight from the towers is different to a normal text message. --- app/templates/views/broadcast/tour/2.html | 4 ++-- app/templates/views/broadcast/tour/5.html | 4 ++-- app/templates/views/broadcast/tour/6.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/templates/views/broadcast/tour/2.html b/app/templates/views/broadcast/tour/2.html index 2031d717d..9c0d697ac 100644 --- a/app/templates/views/broadcast/tour/2.html +++ b/app/templates/views/broadcast/tour/2.html @@ -3,7 +3,7 @@ {% extends "admin_template.html" %} {% block per_page_title %} - In an emergency, you can broadcast an alert to every mobile phone in + In an emergency, you can send an alert to every mobile phone in the affected area at exactly the same time. {% endblock %} @@ -15,7 +15,7 @@

    - In an emergency, you can broadcast an alert to every mobile phone in + In an emergency, you can send an alert to every mobile phone in the affected area at exactly the same time.

    diff --git a/app/templates/views/broadcast/tour/5.html b/app/templates/views/broadcast/tour/5.html index 2e35a9aec..5e9fc7fa0 100644 --- a/app/templates/views/broadcast/tour/5.html +++ b/app/templates/views/broadcast/tour/5.html @@ -22,13 +22,13 @@ You’re in training mode.

    - There’s no risk of broadcasting a real alert. + There’s no risk of sending a real alert.

    Get used to the system now, so you know what to do in an emergency.

    - When you’re ready, you can turn off training mode. + When you’re ready, you can ask for access to the live system.

    diff --git a/app/templates/views/broadcast/tour/6.html b/app/templates/views/broadcast/tour/6.html index ef4517315..10e30d69e 100644 --- a/app/templates/views/broadcast/tour/6.html +++ b/app/templates/views/broadcast/tour/6.html @@ -3,7 +3,7 @@ {% extends "admin_template.html" %} {% block per_page_title %} - Notify has not broadcast your alert because you’re in training mode. + Notify has not sent your alert because you’re in training mode. {% endblock %} {% set mainClasses = "govuk-!-padding-top-0 govuk-!-padding-bottom-0" %} @@ -16,7 +16,7 @@

    - Notify has not broadcast your alert because you’re in training mode. + Notify has not sent your alert because you’re in training mode.

    In a real emergency, every mobile phone in the area