Merge pull request #3060 from alphagov/agreement-new-content

Data sharing and financial agreement content

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?',
+        'Who are you accepting the agreement for?',
         choices=(
             (
                 'me',
-                'I’m accepting the agreement',
+                'Yourself',
             ),
             (
                 'someone-else',
-                'I’m accepting the agreement on behalf of someone else',
+                '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(

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 @@
   <div class="column-five-sixths">
 
     {{ page_header(
-      'Accept data sharing and financial agreement',
+      'Accept the data sharing and financial 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') }}
       </div>
+      {{ textbox(form.version, width='1-3', hint='The version number is on the front page, for example ‘3.6’') }}
+
       {{ page_footer('Continue') }}
 
     {% endcall %}

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 @@
   <div class="column-five-sixths">
 
     {{ 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)
     ) }}
 

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,19 +11,24 @@
   <div class="column-five-sixths">
 
     {{ 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)
     )}}
 
     <p>
-      Before you can go live on GOV.UK Notify, your organisation needs to
+      Before you can use GOV.UK Notify, you need to accept our data sharing and financial agreement.
-      accept to our data sharing and financial agreement.
+    </p>
+    <p>
+      This must be done by, or on behalf of, someone with the authority to sign contracts for your organisation.
+    </p>
+    <p>
+      Once accepted, the agreement covers all Notify services from your organisation.
     </p>
     <p>
       There are different agreements for crown and non-crown organisations.
     </p>
     <p>
-      <a href="{{ url_for('main.support') }}">Get in touch</a> to tell us
+      <a href="{{ url_for('main.support') }}">Contact us</a> to tell us
       whether or not you work for a crown organisation. If you’re not sure
       we’ll help you work it out.
     </p>

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,17 +11,18 @@
   <div class="column-five-sixths">
 
     {{ 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)
     )}}
 
     <p>
-      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. You can
+      Notify data sharing and financial agreement.
-      <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy</a>.
+    </p>
+    <p>For more information, you can <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy of the agreement</a>.
     </p>
     <p>
-      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.
     </p>
 
   </div>

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 @@
   <div class="column-five-sixths">
 
     {{ 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)
     )}}
 
     <p>
-      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.
     </p>
     <p>
-      This agreement only needs to be accepted once and will then cover all Notify services from
+      This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}.
-      {{ current_service.organisation.name }}.
     </p>
     <p>
-      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 }}.
     </p>
     <p>
-      <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">Download a copy of the agreement</a>.
+      <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">Download a copy of the data sharing and financial agreement</a>.
     </p>
     <p>
-      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.
     </p>
     <a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>
 

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',
         ],
     ),
     (