diff --git a/app/main/views/broadcast.py b/app/main/views/broadcast.py index 8d89f3a98..680edc072 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', ) 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
    • 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 %} 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 %} 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) ) }} diff --git a/app/templates/views/broadcast/preview-areas.html b/app/templates/views/broadcast/preview-areas.html index a1317bfbd..923c0f43a 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 ) }} @@ -54,7 +54,7 @@ {% if broadcast_message.areas %} {{ map(broadcast_message) }}
    - {{ page_footer('Continue to preview') }} + {{ page_footer('Preview this alert') }}
    {% endif %} 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 %} 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 diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index 5a447b032..1ba0edceb 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 %}

    @@ -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 %} @@ -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' %} @@ -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 %} 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 %} diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index e25ec1659..5f94acd00 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 [ @@ -1561,15 +1561,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.' ]), @@ -1577,15 +1577,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.' ]), @@ -1593,8 +1593,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, { @@ -1602,8 +1602,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, { @@ -1611,7 +1611,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') @@ -1676,12 +1676,12 @@ def test_view_broadcast_message_page( ), ( 'completed', - 'Previous alerts', + 'Past alerts', '.broadcast_dashboard_previous', ), ( 'cancelled', - 'Previous alerts', + 'Past alerts', '.broadcast_dashboard_previous', ), ( @@ -2030,7 +2030,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, @@ -2094,7 +2094,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') @@ -2105,7 +2105,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/main/views/test_templates.py b/tests/app/main/views/test_templates.py index dbf980ab5..af4c6239f 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, 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),