From 505c17f5f0c28d2cabaf6f5314f10d621e340298 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 10:34:34 +0100 Subject: [PATCH 01/14] Update content --- .../views/agreement/service-agreement.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/templates/views/agreement/service-agreement.html b/app/templates/views/agreement/service-agreement.html index ee6ad6f22..51d3d9063 100644 --- a/app/templates/views/agreement/service-agreement.html +++ b/app/templates/views/agreement/service-agreement.html @@ -2,7 +2,7 @@ {% from "components/page-header.html" import page_header %} {% block service_page_title %} - GOV.UK Notify data sharing and financial agreement + Accept the data sharing and financial agreement {% endblock %} {% block maincolumn_content %} @@ -11,25 +11,24 @@
{{ page_header( - 'GOV.UK Notify data sharing and financial agreement', + 'Accept the data sharing and financial agreement', back_link=url_for('main.request_to_go_live', service_id=current_service.id) )}}

- To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) must accept the GOV.UK Notify data sharing and financial agreement. + Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement.

- This agreement only needs to be accepted once and will then cover all Notify services from - {{ current_service.organisation.name }}. + This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}.

- It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation. + Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.

- Download a copy of the agreement. + Download a copy of the data sharing and financial agreement.

- The agreement contains commercially sensitive information, so don’t share it more widely than you need to. + The agreement is confidential and should not be shared outside your organisation.

Continue From 95f9215546de03f4c7cd10181a839e4dbda6e593 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 10:46:01 +0100 Subject: [PATCH 02/14] Update agreement form content Update agreement form content --- app/main/forms.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 5eaa400e0..efa51ea7b 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1487,26 +1487,26 @@ class AcceptAgreementForm(StripWhitespaceForm): ) version = StringField( - 'Which version of the agreement are you accepting?' + 'Which version of the agreement do you want to accept?' ) who = RadioField( - 'Who is accepting the agreement?', + 'How do you want to accept the agreement?', choices=( ( 'me', - 'I’m accepting the agreement', + 'In your own name', ), ( 'someone-else', - 'I’m accepting the agreement on behalf of someone else', + 'On behalf of someone else', ), ), validators=[DataRequired()], ) on_behalf_of_name = StringField( - 'Who are you accepting the agreement on behalf of?' + 'What’s their name?' ) on_behalf_of_email = email_address( From becdff214c72b3c62fde710c3b4e355827ca5c9b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 10:47:27 +0100 Subject: [PATCH 03/14] Update content --- app/templates/views/agreement/agreement-accept.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/templates/views/agreement/agreement-accept.html b/app/templates/views/agreement/agreement-accept.html index 4da010ecb..7a3051b97 100644 --- a/app/templates/views/agreement/agreement-accept.html +++ b/app/templates/views/agreement/agreement-accept.html @@ -7,7 +7,7 @@ {% from "components/page-header.html" import page_header %} {% block per_page_title %} - Accept data sharing and financial agreement + Accept the data sharing and financial agreement {% endblock %} {% block maincolumn_content %} @@ -16,13 +16,12 @@
{{ page_header( - 'Accept data sharing and financial agreement', + 'How do you want to accept the agreement?', back_link=url_for('main.service_agreement', service_id=current_service.id) ) }} {% call form_wrapper(class='top-gutter') %} - {{ textbox(form.version, width='1-3', hint='The version number is on the front page, for example ‘3.6’') }} {% call select_wrapper(form.who) %} {% for option in form.who %} {{ radio(option, data_target='on-behalf-of' if option.data == 'someone-else' else None) }} @@ -32,6 +31,8 @@ {{ textbox(form.on_behalf_of_name, width='1-1') }} {{ textbox(form.on_behalf_of_email, width='1-1') }}
+ {{ textbox(form.version, width='1-3', hint='The version number is on the front page, for example ‘3.6’') }} + {{ page_footer('Continue') }} {% endcall %} From cb3b8a40ae7fe928f5876208c34601d196d72ae2 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 10:49:31 +0100 Subject: [PATCH 04/14] Update heading --- app/templates/views/agreement/agreement-confirm.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/agreement/agreement-confirm.html b/app/templates/views/agreement/agreement-confirm.html index 80e0bbad8..9f16c9581 100644 --- a/app/templates/views/agreement/agreement-confirm.html +++ b/app/templates/views/agreement/agreement-confirm.html @@ -4,7 +4,7 @@ {% from "components/page-header.html" import page_header %} {% block per_page_title %} - GOV.UK Notify data sharing and financial agreement + Confirm that you accept the agreement {% endblock %} {% block maincolumn_content %} @@ -13,7 +13,7 @@
{{ page_header( - 'GOV.UK Notify data sharing and financial agreement', + 'Confirm that you accept the agreement', back_link=url_for('main.service_accept_agreement', service_id=current_service.id) ) }} From d771b4ae64446f336f4f163ed0fbe8c2f3f2e1cc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 10:51:14 +0100 Subject: [PATCH 05/14] Update contact link content --- app/templates/views/agreement/service-agreement-choose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 68dc75402..f55787a90 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -23,7 +23,7 @@ There are different agreements for crown and non-crown organisations.

- Get in touch to tell us + Contact us to tell us whether or not you work for a crown organisation. If you’re not sure we’ll help you work it out.

From e0690784597a80cf12f0bc1582c817351f57b7f9 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:03:17 +0100 Subject: [PATCH 06/14] Update content --- .../views/agreement/service-agreement-signed.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 09300bcfe..486363190 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -17,11 +17,12 @@

Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK - Notify data sharing and financial agreement. You can - download a copy. + Notify data sharing and financial agreement. +

+

Download a copy of the agreement.

- The agreement contains commercially sensitive information, so don’t share it more widely than you need to. + The agreement is confidential and should not be shared outside your organisation.

From ecdf784ac8ada93258db902a5a46e628f6195bb0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:13:26 +0100 Subject: [PATCH 07/14] Update headings --- app/templates/views/agreement/service-agreement-signed.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 486363190..dd33cc0cc 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -2,7 +2,7 @@ {% from "components/page-header.html" import page_header %} {% block service_page_title %} - GOV.UK Notify data sharing and financial agreement + Your organisation has already accepted the agreement {% endblock %} {% block maincolumn_content %} @@ -11,12 +11,12 @@
{{ page_header( - 'GOV.UK Notify data sharing and financial agreement', + 'Your organisation has already accepted the agreement', back_link=url_for('main.request_to_go_live', service_id=current_service.id) )}}

- Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK + {{ current_service.organisation.name }} has already accepted the GOV.UK Notify data sharing and financial agreement.

Download a copy of the agreement. From 3b6ac13deea1d72301988dd5b68bebba910c140b Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:15:19 +0100 Subject: [PATCH 08/14] Update heading and content --- .../views/agreement/service-agreement-choose.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index f55787a90..8b85e6889 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -2,7 +2,7 @@ {% from "components/page-header.html" import page_header %} {% block service_page_title %} - GOV.UK Notify data sharing and financial agreement + Accept the data sharing and financial agreement {% endblock %} {% block maincolumn_content %} @@ -11,13 +11,15 @@

{{ page_header( - 'GOV.UK Notify data sharing and financial agreement', + 'Accept the data sharing and financial agreement', back_link=url_for('main.request_to_go_live', service_id=current_service.id) )}}

- Before you can go live on GOV.UK Notify, your organisation needs to - accept to our data sharing and financial agreement. + Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement. +

+

+ This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation.

There are different agreements for crown and non-crown organisations. From 9e1282051ffe085bc88c80eb3c0bbd309e972854 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:17:47 +0100 Subject: [PATCH 09/14] Update content --- app/templates/views/agreement/service-agreement-signed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index dd33cc0cc..379228fd8 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -19,7 +19,7 @@ {{ current_service.organisation.name }} has already accepted the GOV.UK Notify data sharing and financial agreement.

-

Download a copy of the agreement. +

For more information about the agreement, you can download a copy.

The agreement is confidential and should not be shared outside your organisation. From cd08f5c3092d3c21e4ab013f72061b523866ffaf Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:18:57 +0100 Subject: [PATCH 10/14] Update the header --- app/templates/views/agreement/agreement-accept.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/agreement/agreement-accept.html b/app/templates/views/agreement/agreement-accept.html index 7a3051b97..4d1b7e90f 100644 --- a/app/templates/views/agreement/agreement-accept.html +++ b/app/templates/views/agreement/agreement-accept.html @@ -16,7 +16,7 @@

{{ page_header( - 'How do you want to accept the agreement?', + 'Accept the data sharing and financial agreement', back_link=url_for('main.service_agreement', service_id=current_service.id) ) }} From 95d4d0b62451b643b35fe0ff72693515b06dcb33 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:20:29 +0100 Subject: [PATCH 11/14] Update link --- app/templates/views/agreement/service-agreement-signed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/agreement/service-agreement-signed.html b/app/templates/views/agreement/service-agreement-signed.html index 379228fd8..1d0512168 100644 --- a/app/templates/views/agreement/service-agreement-signed.html +++ b/app/templates/views/agreement/service-agreement-signed.html @@ -19,7 +19,7 @@ {{ current_service.organisation.name }} has already accepted the GOV.UK Notify data sharing and financial agreement.

-

For more information about the agreement, you can download a copy. +

For more information, you can download a copy of the agreement.

The agreement is confidential and should not be shared outside your organisation. From 60cc26438b82146b3f4ff8c284c9873f70addd11 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 11:22:55 +0100 Subject: [PATCH 12/14] Add content --- app/templates/views/agreement/service-agreement-choose.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/templates/views/agreement/service-agreement-choose.html b/app/templates/views/agreement/service-agreement-choose.html index 8b85e6889..70f502b96 100644 --- a/app/templates/views/agreement/service-agreement-choose.html +++ b/app/templates/views/agreement/service-agreement-choose.html @@ -21,6 +21,9 @@

This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation.

+

+ Once accepted, the agreement covers all Notify services from your organisation. +

There are different agreements for crown and non-crown organisations.

From 1de8ffc01027a76da828168549ab06f29aa830cd Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 18 Jul 2019 15:58:24 +0100 Subject: [PATCH 13/14] Update agreement form content --- app/main/forms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index efa51ea7b..3257ad84f 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1491,15 +1491,15 @@ class AcceptAgreementForm(StripWhitespaceForm): ) who = RadioField( - 'How do you want to accept the agreement?', + 'Who are you accepting the agreement for?', choices=( ( 'me', - 'In your own name', + 'Yourself', ), ( 'someone-else', - 'On behalf of someone else', + 'Someone else', ), ), validators=[DataRequired()], From 19fd89a2eee448ceb0a5b32b71ed82dc89ba3913 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 19 Jul 2019 16:20:27 +0100 Subject: [PATCH 14/14] Fix tests --- tests/app/main/views/test_agreement.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/app/main/views/test_agreement.py b/tests/app/main/views/test_agreement.py index 9d7193ad9..0206e73e1 100644 --- a/tests/app/main/views/test_agreement.py +++ b/tests/app/main/views/test_agreement.py @@ -169,31 +169,31 @@ def test_show_accept_agreement_page( assert [ (input['type'], input['name'], input.get('id')) for input in page.select('input') ] == [ - ('text', 'version', 'version'), ('radio', 'who', 'who-0'), ('radio', 'who', 'who-1'), ('text', 'on_behalf_of_name', 'on_behalf_of_name'), ('email', 'on_behalf_of_email', 'on_behalf_of_email'), + ('text', 'version', 'version'), ('hidden', 'csrf_token', None), ] assert normalize_spaces(page.select_one('label[for=version]').text) == ( - 'Which version of the agreement are you accepting? ' + 'Which version of the agreement do you want to accept? ' 'The version number is on the front page, for example ‘3.6’' ) assert page.select_one('input[name=version]')['value'] == '' assert normalize_spaces(page.select_one('#who legend').text) == ( - 'Who is accepting the agreement?' + 'Who are you accepting the agreement for?' ) assert normalize_spaces(page.select_one('label[for=who-0]').text) == ( - 'I’m accepting the agreement' + 'Yourself' ) assert page.select('input[name=who]')[0]['value'] == 'me' assert 'checked' not in page.select('input[name=who]')[0] assert 'data-target' not in page.select('.multiple-choice')[0] assert normalize_spaces(page.select_one('label[for=who-1]').text) == ( - 'I’m accepting the agreement on behalf of someone else' + 'Someone else' ) assert page.select('input[name=who]')[1]['value'] == 'someone-else' assert 'checked' not in page.select('input[name=who]')[1] @@ -206,7 +206,7 @@ def test_show_accept_agreement_page( ] assert normalize_spaces(page.select_one('label[for=on_behalf_of_name]').text) == ( - 'Who are you accepting the agreement on behalf of?' + 'What’s their name?' ) assert page.select_one('input[name=on_behalf_of_name]')['value'] == '' @@ -235,9 +235,9 @@ def test_accept_agreement_page_populates( assert [ (field['name'], field['value']) for field in page.select('input[type=text], input[type=email]') ] == [ - ('version', '1.2'), ('on_behalf_of_name', 'Firstname Lastname'), ('on_behalf_of_email', 'test@example.com'), + ('version', '1.2'), ] assert 'checked' not in page.select('input[name=who]')[0] assert page.select('input[name=who]')[1]['checked'] == '' @@ -252,8 +252,8 @@ def test_accept_agreement_page_populates( 'on_behalf_of_email': '', }, [ - 'Must be a number', 'This field is required.', + 'Must be a number', ], ), (