Merge branch 'master' into platform-admin

app/templates/views/dashboard/jobs.html

@@ -4,7 +4,7 @@
   jobs,
   caption="Recent batch jobs",
   empty_message='You haven’t sent any text messages yet',
-  field_headings=['File', 'Started', right_aligned_field_heading('Rows'), right_aligned_field_heading('Sent')]
+  field_headings=['File', 'Started', right_aligned_field_heading('Rows')]
 ) %}
   {% call field() %}
     <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
@@ -15,9 +15,6 @@
   {% call field(align='right') %}
     {{ item.notification_count }}
   {% endcall %}
-  {% call field(align='right') %}
-    {{ item.notifications_sent }}
-  {% endcall %}
 {% endcall %}
 {% if more_jobs_to_show %}
   {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}

app/templates/views/help.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
 {% block page_title %}
-  Cookies – GOV.UK Notify
+  Help – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/service-settings.html

@@ -27,12 +27,7 @@
       } if not service.active else {
         'title': 'Reactivate API keys',
         'link': url_for('.service_status_change', service_id=service_id)
-      },
-      {
-        'title': 'Delete this service from GOV.UK Notify',
-        'link': url_for('.service_delete', service_id=service_id),
-        'destructive': True
-      },
+      }
     ]) }}
 
 {% endblock %}