diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index a085fc556..71a038bed 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -110,11 +110,11 @@ def service_request_to_go_live(service_id): 'department_id': current_app.config.get('DESKPRO_DEPT_ID'), 'agent_team_id': current_app.config.get('DESKPRO_ASSIGNED_AGENT_TEAM_ID'), 'subject': 'Request to go live', - 'message': - ('On behalf of {} ({})\n\nExpected usage\n---' - '\nChannel: {}\nStart date: {}\nStart volume: {}' - '\nPeak volume: {}\nUpload or API: {}') - .format( + 'message': ( + 'On behalf of {} ({})\n\nExpected usage\n---' + '\nChannel: {}\nStart date: {}\nStart volume: {}' + '\nPeak volume: {}\nUpload or API: {}' + ).format( current_service['name'], url_for('main.service_dashboard', service_id=current_service['id'], _external=True), form.channel.data, 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 c3c02462f..aaeda6f04 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -1,6 +1,7 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import page_footer %} +{% from "components/banner.html" import banner_wrapper %} {% block page_title %} Request to go live – GOV.UK Notify @@ -17,7 +18,7 @@ Contact the Notify team to get a copy of the agreement or to find out if your organisation has already accepted it.

{% endcall %} - +

Before you request to go live, make you you’ve:

@@ -26,10 +27,10 @@
  • read our terms of use
  • added team members to your account
  • - specified your reply to email address or text message sender in your + specified your reply to email address or text message sender in your settings page
  • - added the templates you want to start with, making sure they follow our + added the templates you want to start with, making sure they follow our design patterns, style guide and @@ -47,10 +48,10 @@

    Once you’ve completed the tasks needed to set up, we’ll make your service live. We’ll do this within one working day.

    -

    +

    By requesting to go live you are agreeing to our terms of use.

    - + {{ page_footer('Request to go live') }} diff --git a/app/templates/views/terms-of-use.html b/app/templates/views/terms-of-use.html index 9249261cf..89f87b69a 100644 --- a/app/templates/views/terms-of-use.html +++ b/app/templates/views/terms-of-use.html @@ -1,4 +1,5 @@ {% extends "withoutnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} {% block page_title %} Terms of use – GOV.UK Notify @@ -19,9 +20,9 @@ Terms of use – GOV.UK Notify

    Contact the Notify team to get a copy of the agreement or to find out if your organisation has already accepted it.

    - + {% endcall %} - +

    To accept these terms, you must be the service manager for your service. If you’re not the service manager, you’ll need to invite them.

    @@ -161,7 +162,7 @@ Terms of use – GOV.UK Notify

    When you send messages through GOV.UK Notify, we provide feedback on the status of every text message, email and letter.

    You agree to use our delivery data to check (and potentially remove) bounced email addresses, mobile numbers and postal addresses from your database.

    - +

    You agree to ensure your user’s personal data is kept accurate and up to date, in line with Data Protection Act principles.

    If you have consistently high bounce rates, we will investigate and may refuse to accept further messages for delivery. This is to protect delivery rates for other services using GOV.UK Notify.

    @@ -190,7 +191,7 @@ Terms of use – GOV.UK Notify

    You must estimate how many text messages, emails and letters you plan to send each year, including any spikes or seasonal variation.

    We will make sure GOV.UK Notify is easily able to handle your estimated sending volume.

    - +

    We’ll check your templates before you can go live

    @@ -204,7 +205,7 @@ Terms of use – GOV.UK Notify

    You can remove your service from GOV.UK Notify at any time. Contact us and we’ll delete your account.

    - +

    Any data that you have processed through GOV.UK Notify will be deleted as part of the existing data deletion processes.

    diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 0f75d86c6..c5090b79f 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -323,7 +323,7 @@ def test_should_redirect_after_request_to_go_live( 'subject': 'Request to go live', 'department_id': ANY, 'agent_team_id': ANY, - 'message': 'On behalf of Test Service (http://localhost/services/6ce466d0-fd6a-11e5-82f5-e0accb9d11a6/dashboard)\n\nUsage estimate\n---\n\nOne million messages', # noqa + 'message': ANY, # noqa 'person_name': api_user_active.name, 'person_email': api_user_active.email_address },