Merge pull request #2327 from alphagov/add-mou-to-checklist

Add line about the data sharing and financial agreement to the checklist

app/templates/components/task-list.html

@@ -1,10 +1,10 @@
-{% macro task_list_item(completed, label) %}
+{% macro task_list_item(completed, label, link) %}
   <li class="task-list-item">
-    {{ label }}
+    <span aria-describedby="{{ label|id_safe }}"><a href="{{ link }}">{{ label }}</a></span>
     {% if completed %}
-      <span class="task-list-indicator-completed">Completed</span>
+      <strong class="task-list-indicator-completed" id="{{ label|id_safe }}">Completed</strong>
     {% else %}
-      <span class="task-list-indicator-not-completed">Not completed</span>
+      <strong class="task-list-indicator-not-completed" id="{{ label|id_safe }}">Not completed</strong>
     {% endif %}
   </li>
 {% endmacro %}

app/templates/views/agreement-choose.html

@@ -2,7 +2,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Download the GOV.UK Notify data sharing and financial agreement
+  GOV.UK Notify data sharing and financial agreement
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -14,7 +14,7 @@
   <div class="column-two-thirds">
 
     <h1 class="heading-large">
-      Download the GOV.UK Notify data sharing and financial agreement
+      GOV.UK Notify data sharing and financial agreement
     </h1>
 
     <p>

app/templates/views/agreement-signed.html

@@ -2,7 +2,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Download the GOV.UK Notify data sharing and financial agreement
+  GOV.UK Notify data sharing and financial agreement
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -14,7 +14,7 @@
   <div class="column-two-thirds">
 
     <h1 class="heading-large">
-      Download the GOV.UK Notify data sharing and financial agreement
+      GOV.UK Notify data sharing and financial agreement
     </h1>
 
     <p>

app/templates/views/agreement.html

@@ -2,7 +2,7 @@
 {% from "components/sub-navigation.html" import sub_navigation %}
 
 {% block per_page_title %}
-  Download the GOV.UK Notify data sharing and financial agreement
+  GOV.UK Notify data sharing and financial agreement
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -14,7 +14,7 @@
   <div class="column-two-thirds">
 
     <h1 class="heading-large">
-      Download the GOV.UK Notify data sharing and financial agreement
+      GOV.UK Notify data sharing and financial agreement
     </h1>
 
     <p>

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

@@ -17,32 +17,33 @@
       {% call task_list_wrapper() %}
         {{ task_list_item(
           current_service.has_team_members,
-          '<a href="{}">Add a team member who can manage settings, team and usage</a>
-'.format(
-            url_for('main.manage_users', service_id=current_service.id)
-          )|safe,
+          'Add a team member who can manage settings, team and usage',
+          url_for('main.manage_users', service_id=current_service.id),
         ) }}
         {{ task_list_item(
           current_service.has_templates,
-          '<a href="{}">Add templates with examples of the content you plan to send
-</a>'.format(
-            url_for('main.choose_template', service_id=current_service.id)
-          )|safe,
+          'Add templates with examples of the content you plan to send',
+          url_for('main.choose_template', service_id=current_service.id),
         ) }}
         {% if current_service.has_email_templates %}
           {{ task_list_item(
             current_service.has_email_reply_to_address,
-            '<a href="{}">Add an email reply-to address</a>'.format(
-              url_for('main.service_email_reply_to', service_id=current_service.id)
-            )|safe,
+            'Add an email reply-to address',
+            url_for('main.service_email_reply_to', service_id=current_service.id),
           ) }}
         {% endif %}
         {% if current_service.has_sms_templates and current_service.shouldnt_use_govuk_as_sms_sender %}
           {{ task_list_item(
             not current_service.sms_sender_is_govuk,
-            '<a href="{}">Change your text message sender name</a>'.format(
-              url_for('main.service_sms_senders', service_id=current_service.id)
-            )|safe
+            'Change your text message sender name',
+            url_for('main.service_sms_senders', service_id=current_service.id),
+          ) }}
+        {% endif %}
+        {% if show_agreement %}
+          {{ task_list_item(
+            agreement_signed,
+            'Sign our data sharing and financial agreement',
+            url_for('main.agreement'),
           ) }}
         {% endif %}
       {% endcall %}