From 734666ee53a82a52b35526251c5469bb3ea91bf9 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 1 May 2019 08:00:25 +0100
Subject: [PATCH] Refactor agreement pages into includes

So we can re-use the same content in multiple places.
---
 .../views/agreement/_agreement-choose.html    | 35 ++++++++++++++++++
 .../views/agreement/_agreement-signed.html    |  8 ++++
 app/templates/views/agreement/_agreement.html | 17 +++++++++
 .../views/agreement/agreement-choose.html     | 37 +------------------
 .../views/agreement/agreement-signed.html     | 10 +----
 app/templates/views/agreement/agreement.html  | 18 +--------
 6 files changed, 65 insertions(+), 60 deletions(-)
 create mode 100644 app/templates/views/agreement/_agreement-choose.html
 create mode 100644 app/templates/views/agreement/_agreement-signed.html
 create mode 100644 app/templates/views/agreement/_agreement.html

diff --git a/app/templates/views/agreement/_agreement-choose.html b/app/templates/views/agreement/_agreement-choose.html
new file mode 100644
index 000000000..4538dad62
--- /dev/null
+++ b/app/templates/views/agreement/_agreement-choose.html
@@ -0,0 +1,35 @@
+<p>
+  Before you can go live on GOV.UK Notify, your organisation needs to agree 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>.
+</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.
+</p>
diff --git a/app/templates/views/agreement/_agreement-signed.html b/app/templates/views/agreement/_agreement-signed.html
new file mode 100644
index 000000000..35819b126
--- /dev/null
+++ b/app/templates/views/agreement/_agreement-signed.html
@@ -0,0 +1,8 @@
+<p>
+  Your organisation ({{ owner }}) has already accepted the GOV.UK
+  Notify data sharing and financial agreement. You can
+  <a href="{{ url_for('main.download_agreement') }}">download a copy</a>.
+</p>
+<p>
+  The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
+</p>
diff --git a/app/templates/views/agreement/_agreement.html b/app/templates/views/agreement/_agreement.html
new file mode 100644
index 000000000..2e462192a
--- /dev/null
+++ b/app/templates/views/agreement/_agreement.html
@@ -0,0 +1,17 @@
+<p>
+  Before you can go live on GOV.UK Notify, your organisation needs to agree to our data sharing and financial agreement.
+</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>
diff --git a/app/templates/views/agreement/agreement-choose.html b/app/templates/views/agreement/agreement-choose.html
index 592eb9533..9f0d6ae5f 100644
--- a/app/templates/views/agreement/agreement-choose.html
+++ b/app/templates/views/agreement/agreement-choose.html
@@ -17,41 +17,8 @@
       GOV.UK Notify data sharing and financial agreement
     </h1>
 
-    <p>
-      Before you can go live on GOV.UK Notify, your organisation needs to agree 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>.
-    </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.
-    </p>
+    {% include 'views/agreement/_agreement-choose.html'%}
+
   </div>
 </div>
 
diff --git a/app/templates/views/agreement/agreement-signed.html b/app/templates/views/agreement/agreement-signed.html
index b38c76193..4cd1c6946 100644
--- a/app/templates/views/agreement/agreement-signed.html
+++ b/app/templates/views/agreement/agreement-signed.html
@@ -17,14 +17,8 @@
       GOV.UK Notify data sharing and financial agreement
     </h1>
 
-    <p>
-      Your organisation ({{ owner }}) has already accepted the GOV.UK
-      Notify data sharing and financial agreement. You can
-      <a href="{{ url_for('main.download_agreement') }}">download a copy</a>.
-    </p>
-    <p>
-      The agreement contains commercially sensitive information, so don’t share it more widely than you need to.
-    </p>
+    {% include 'views/agreement/_agreement-signed.html' %}
+
   </div>
 </div>
 
diff --git a/app/templates/views/agreement/agreement.html b/app/templates/views/agreement/agreement.html
index 16f72689d..a5fbfcacd 100644
--- a/app/templates/views/agreement/agreement.html
+++ b/app/templates/views/agreement/agreement.html
@@ -17,23 +17,7 @@
       GOV.UK Notify data sharing and financial agreement
     </h1>
 
-    <p>
-      Before you can go live on GOV.UK Notify, your organisation needs to agree to our data sharing and financial agreement.
-    </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>
+    {% include 'views/agreement/_agreement.html'%}
 
   </div>
 </div>