Re-integrate partials

Now that the content in these partials is only used on one page per
partial they no longer need to be partials. This commit re-integrates
them into the pages that were including them, making the content easier
to manage.

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

@@ -1,12 +0,0 @@
-<p>
-  Before you can go live on GOV.UK Notify, your organisation needs to
-  accept to our data sharing and financial agreement.
-</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
-  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-signed.html

@@ -1,8 +0,0 @@
-<p>
-  Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK
-  Notify data sharing and financial agreement. You can
-  <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy</a>.
-</p>
-<p>
-  The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
-</p>

app/templates/views/agreement/_agreement.html

@@ -1,17 +0,0 @@
-<p>
-  To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) 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.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.
-</p>
-<a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>

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

@@ -1,25 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/sub-navigation.html" import sub_navigation %}
-
-{% block per_page_title %}
-  GOV.UK Notify data sharing and financial agreement
-{% endblock %}
-
-{% block maincolumn_content %}
-
-<div class="grid-row">
-  <div class="column-one-third">
-    {{ sub_navigation(navigation_links) }}
-  </div>
-  <div class="column-two-thirds">
-
-    <h1 class="heading-large">
-      GOV.UK Notify data sharing and financial agreement
-    </h1>
-
-    {% include 'views/agreement/_agreement-choose.html'%}
-
-  </div>
-</div>
-
-{% endblock %}

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

@@ -1,25 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/sub-navigation.html" import sub_navigation %}
-
-{% block per_page_title %}
-  GOV.UK Notify data sharing and financial agreement
-{% endblock %}
-
-{% block maincolumn_content %}
-
-<div class="grid-row">
-  <div class="column-one-third">
-    {{ sub_navigation(navigation_links) }}
-  </div>
-  <div class="column-two-thirds">
-
-    <h1 class="heading-large">
-      GOV.UK Notify data sharing and financial agreement
-    </h1>
-
-    {% include 'views/agreement/_agreement-signed.html' %}
-
-  </div>
-</div>
-
-{% endblock %}

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

@@ -15,7 +15,18 @@
       back_link=url_for('main.request_to_go_live', service_id=current_service.id)
     )}}
 
-    {% include 'views/agreement/_agreement-choose.html'%}
+    <p>
+      Before you can go live on GOV.UK Notify, your organisation needs to
+      accept to our data sharing and financial agreement.
+    </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
+      whether or not you work for a crown organisation. If you’re not sure
+      we’ll help you work it out.
+    </p>
 
   </div>
 </div>

app/templates/views/agreement/service-agreement-signed.html

@@ -15,7 +15,14 @@
       back_link=url_for('main.request_to_go_live', service_id=current_service.id)
     )}}
 
-    {% include 'views/agreement/_agreement-signed.html' %}
+    <p>
+      Your organisation ({{ current_service.organisation.name }}) has already accepted the GOV.UK
+      Notify data sharing and financial agreement. You can
+      <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy</a>.
+    </p>
+    <p>
+      The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
+    </p>
 
   </div>
 </div>

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

@@ -15,7 +15,23 @@
       back_link=url_for('main.request_to_go_live', service_id=current_service.id)
     )}}
 
-    {% include 'views/agreement/_agreement.html'%}
+    <p>
+      To use GOV.UK Notify your organisation ({{ current_service.organisation.name }}) 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.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.
+    </p>
+    <a href="{{ url_for('main.service_accept_agreement', service_id=current_service.id) }}" class="button">Continue</a>
 
   </div>
 </div>