diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 768a08a42..6553a876e 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -34,8 +34,7 @@ def confirm_name_change(): if request.method == 'GET': return render_template( 'views/service-settings/confirm.html', - heading='Rename service', - submit_button_text='Confirm' + heading='Change your service name' ) elif request.method == 'POST': return redirect(url_for('.service_settings')) @@ -68,8 +67,7 @@ def confirm_status_change(): if request.method == 'GET': return render_template( 'views/service-settings/confirm.html', - heading='Turn off outgoing messages', - submit_button_text='Confirm', + heading='Turn off all outgoing notifications', destructive=True ) elif request.method == 'POST': @@ -92,8 +90,7 @@ def confirm_delete(): if request.method == 'GET': return render_template( 'views/service-settings/confirm.html', - heading='Delete service', - submit_button_text='Confirm', + heading='Delete this service from Notify', destructive=True ) elif request.method == 'POST': diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 9327617a2..305db1da1 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -13,7 +13,7 @@ { 'title': 'Change your service name', 'link': url_for('.name'), - 'hint': 'Your service name (‘{}’) is included in every sent notification'.format(service.name) + 'hint': 'Your service name ({}) is included in every sent notification'.format(service.name) }, { 'title': 'Request to go live and turn off sending restrictions', diff --git a/app/templates/views/service-settings/confirm.html b/app/templates/views/service-settings/confirm.html index a6a08441a..fe0cd05c9 100644 --- a/app/templates/views/service-settings/confirm.html +++ b/app/templates/views/service-settings/confirm.html @@ -16,7 +16,7 @@ GOV.UK Notify | Service settings
{{ textbox('new_name', 'Enter your password', password=True) }} {{ page_footer( - submit_button_text, + 'Confirm', destructive=destructive, back_link=url_for('.service_settings') ) }} diff --git a/app/templates/views/service-settings/delete.html b/app/templates/views/service-settings/delete.html index c40950a37..e00a5a344 100644 --- a/app/templates/views/service-settings/delete.html +++ b/app/templates/views/service-settings/delete.html @@ -7,9 +7,10 @@ {% block maincolumn_content %} +

Delete this service from Notify

+
-

Delete service

This can’t be undone. You will lose: diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html index da427bf08..a86fdba2d 100644 --- a/app/templates/views/service-settings/name.html +++ b/app/templates/views/service-settings/name.html @@ -8,13 +8,13 @@ GOV.UK Notify | Service settings {% block maincolumn_content %} +

Change your service name

+
-

Rename service

-

- Users will see this name where? + Your service name ({{ service.name }}) is included in every sent notification

diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index b87d4dbab..49b9cc31c 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -7,7 +7,7 @@ {% block maincolumn_content %} -

Request to make service live

+

Request to go live

@@ -38,7 +38,7 @@ {{ page_footer( - 'Request to make service live', + 'Send request', back_link=url_for('.service_settings') ) }} diff --git a/app/templates/views/service-settings/status.html b/app/templates/views/service-settings/status.html index 545e02ddf..014a61902 100644 --- a/app/templates/views/service-settings/status.html +++ b/app/templates/views/service-settings/status.html @@ -7,23 +7,23 @@ GOV.UK Notify | Service settings {% block maincolumn_content %} -

Turn off outgoing messages

+

Turn off all outgoing notifications

- You’ll still be able to send messages to yourself by uploading a CSV - file. + You’ll still be able to send notifications to yourself by uploading a + CSV file.

- You can start sending messages again when you’re ready. + You can start sending notifications again when you’re ready.

{{ page_footer( - 'Turn off outgoing messages', + 'Turn off all outgoing notifications', destructive=True, back_link=url_for('.service_settings') ) }} diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 3ae1f284b..0628cb159 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -9,7 +9,7 @@ def test_should_show_service_name(notifications_admin): response = notifications_admin.test_client().get('/service-settings/name') assert response.status_code == 200 - assert 'Rename service' in response.get_data(as_text=True) + assert 'Change your service name' in response.get_data(as_text=True) def test_should_redirect_after_change_service_name(notifications_admin): @@ -23,7 +23,7 @@ def test_should_show_service_name_confirmation(notifications_admin): response = notifications_admin.test_client().get('/service-settings/name/confirm') assert response.status_code == 200 - assert 'Rename service' in response.get_data(as_text=True) + assert 'Change your service name' in response.get_data(as_text=True) def test_should_redirect_after_service_name_confirmation(notifications_admin): @@ -37,7 +37,7 @@ def test_should_show_request_to_go_live(notifications_admin): response = notifications_admin.test_client().get('/service-settings/request-to-go-live') assert response.status_code == 200 - assert 'Request to make service live' in response.get_data(as_text=True) + assert 'Request to go live' in response.get_data(as_text=True) def test_should_redirect_after_request_to_go_live(notifications_admin): @@ -51,7 +51,7 @@ def test_should_show_status_page(notifications_admin): response = notifications_admin.test_client().get('/service-settings/status') assert response.status_code == 200 - assert 'Turn off outgoing messages' in response.get_data(as_text=True) + assert 'Turn off all outgoing notifications' in response.get_data(as_text=True) def test_should_show_redirect_after_status_change(notifications_admin): @@ -65,7 +65,7 @@ def test_should_show_status_confirmation(notifications_admin): response = notifications_admin.test_client().get('/service-settings/status/confirm') assert response.status_code == 200 - assert 'Turn off outgoing messages' in response.get_data(as_text=True) + assert 'Turn off all outgoing notifications' in response.get_data(as_text=True) def test_should_redirect_after_status_confirmation(notifications_admin): @@ -79,7 +79,7 @@ def test_should_show_delete_page(notifications_admin): response = notifications_admin.test_client().get('/service-settings/delete') assert response.status_code == 200 - assert 'Delete service' in response.get_data(as_text=True) + assert 'Delete this service from Notify' in response.get_data(as_text=True) def test_should_show_redirect_after_deleting_service(notifications_admin): @@ -93,7 +93,7 @@ def test_should_show_delete_confirmation(notifications_admin): response = notifications_admin.test_client().get('/service-settings/delete/confirm') assert response.status_code == 200 - assert 'Delete service' in response.get_data(as_text=True) + assert 'Delete this service from Notify' in response.get_data(as_text=True) def test_should_redirect_delete_confirmation(notifications_admin):