Merge pull request #3019 from alphagov/sign-online

Allow online acceptance of the contract/memorandum of understanding

app/templates/views/agreement/_agreement-choose.html

@@ -1,35 +1,12 @@
 <p>
-  Before you can go live on GOV.UK Notify, your organisation needs to agree to our data sharing and financial agreement.
+  Before you can go live on GOV.UK Notify, your organisation needs to
+  accept to our data sharing and financial agreement.
 </p>
-<h2 class="heading-small">
-  Crown bodies
-</h2>
 <p>
-  Download the <a href="{{ url_for('main.public_download_agreement', variant='crown') }}">crown agreement</a>.
+  There are different agreements for crown and non-crown organisations.
 </p>
-<h2 class="heading-small">
-  Non-crown bodies
-</h2>
 <p>
-  Download the <a href="{{ url_for('main.public_download_agreement', variant='non-crown') }}">non-crown agreement</a>.
-</p>
-<div class="panel panel-border-wide">
-  <p>
-    <a href="{{ url_for('main.support') }}">Contact us</a> if you’re
-    not sure whether your organisation is a crown or non-crown body.
-  </p>
-</div>
-<h2 class="heading-small">
-  Next steps
-</h2>
-<ol class="list list-number">
-  <li>
-    Get the agreement signed by someone who has the authority to do so on behalf of {{ owner or 'your organisation' }}.
-  </li>
-  <li>
-    Return the signed copy to <a href="mailto:notify-support@digital.cabinet-office.gov.uk">notify-support@digital.cabinet-office.gov.uk</a>.
-  </li>
-</ol>
-<p>
-  The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
+  <a href="{{ url_for('main.support') }}">Get in touch</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/_agreement.html

@@ -1,17 +1,17 @@
 <p>
-  Before you can go live on GOV.UK Notify, your organisation needs to agree to our data sharing and financial agreement.
+  To use GOV.UK Notify your organisation (Cabinet Office) must accept the GOV.UK Notify data sharing and financial agreement.
+</p>
+<p>
+  This agreement only needs to be accepted once and will then cover all Notify services from
+  {{ current_service.organisation.name }}.
+</p>
+<p>
+  It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation.
+</p>
+<p>
+  <a href="{{ url_for('main.download_agreement') }}">Download a copy of the agreement</a>.
 </p>
-<ol class="list list-number">
-  <li>
-    <a href="{{ url_for('main.download_agreement') }}">Download the agreement</a>.
-  </li>
-  <li>
-    Get it signed by someone who has the authority to do so on behalf of {{ owner }}.
-  </li>
-  <li>
-    Return the signed copy to <a href="mailto:notify-support@digital.cabinet-office.gov.uk">notify-support@digital.cabinet-office.gov.uk</a>.
-  </li>
-</ol>
 <p>
   The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
 </p>
+<a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>

app/templates/views/agreement/agreement-accept.html

@@ -0,0 +1,42 @@
+{% extends "withnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/radios.html" import radio %}
+{% from "components/select-input.html" import select_wrapper %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
+
+{% block per_page_title %}
+  Accept data sharing and financial agreement
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-five-sixths">
+
+    {{ page_header(
+      'Accept 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) }}
+        {% endfor %}
+      {% endcall %}
+      <div class="conditional-radio-panel js-hidden" id="on-behalf-of">
+        {{ textbox(form.on_behalf_of_name, width='1-1') }}
+        {{ textbox(form.on_behalf_of_email, width='1-1') }}
+      </div>
+      {{ page_footer('Continue') }}
+
+    {% endcall %}
+
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/agreement/agreement-confirm.html

@@ -0,0 +1,39 @@
+{% extends "withnav_template.html" %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
+
+{% block per_page_title %}
+  GOV.UK Notify data sharing and financial agreement
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+  <div class="column-five-sixths">
+
+    {{ page_header(
+      'GOV.UK Notify data sharing and financial agreement',
+      back_link=url_for('main.service_accept_agreement', service_id=current_service.id)
+    ) }}
+
+    {% call form_wrapper(class='top-gutter') %}
+
+      {% if current_service.organisation.agreement_signed_on_behalf_of_name and current_service.organisation.agreement_signed_on_behalf_of_email_address %}
+        <p>
+          I confirm that I have the legal authority to accept the GOV.UK Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it.
+        </p>
+      {% else %}
+        <p>
+          I confirm that I have the legal authority to accept the GOV.UK Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it.
+        </p>
+      {% endif %}
+
+      {{ page_footer('Accept this agreement') }}
+
+    {% endcall %}
+
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/service-settings/request-to-go-live.html

@@ -51,7 +51,7 @@
         {% if show_agreement %}
           {{ task_list_item(
             agreement_signed,
-            'Sign our data sharing and financial agreement',
+            'Accept our data sharing and financial agreement',
             url_for('main.service_agreement', service_id=current_service.id),
           ) }}
         {% endif %}