- {{ big_number_with_status(
- statistics.get('emails_delivered', 0),
- 'email' if statistics.get('emails_delivered') == 1 else 'emails',
- statistics.get('emails_failed'),
- statistics.get('emails_failure_rate', 0.0),
- statistics.get('emails_failure_rate', 0)|float > 3,
- failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='email', status='failed')
- ) }}
-
- {{ big_number_with_status(
- statistics.get('sms_requested', 0),
- 'text message' if statistics.get('sms_requested') == 1 else 'text messages',
- statistics.get('sms_failed'),
- statistics.get('sms_failure_rate', 0.0),
- statistics.get('sms_failure_rate', 0)|float > 3,
- failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='sms', status='failed')
- ) }}
+
+
+ In the last 7 days
+
+
+
+ {{ big_number_with_status(
+ statistics.get('emails_delivered', 0),
+ 'email' if statistics.get('emails_delivered') == 1 else 'emails',
+ statistics.get('emails_failed'),
+ statistics.get('emails_failure_rate', 0.0),
+ statistics.get('emails_failure_rate', 0)|float > 3,
+ failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='email', status='failed')
+ ) }}
+
+
+ {{ big_number_with_status(
+ statistics.get('sms_requested', 0),
+ 'text message' if statistics.get('sms_requested') == 1 else 'text messages',
+ statistics.get('sms_failed'),
+ statistics.get('sms_failure_rate', 0.0),
+ statistics.get('sms_failure_rate', 0)|float > 3,
+ failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='sms', status='failed')
+ ) }}
+
+ {% with period = "in the last 7 days" %}
+ {% include 'views/dashboard/template-statistics.html' %}
+ {% endwith %}
+
+ See all templates used this year
+
-{% with period = "in the last 7 days" %}
- {% include 'views/dashboard/template-statistics.html' %}
-{% endwith %}
-
- See all templates used this year
-
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 1781ed70d..befbd0aa4 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -30,40 +30,10 @@
)}}
{% endif %}
- {% if not finished_at %}
-
- {% endif %}
- {% include 'partials/jobs/status.html' %}
- {% if not finished_at %}
-
- {% endif %}
+ {% include 'partials/jobs/status.html' %}
- {% if not finished_at %}
-
- {% endif %}
- {% include 'partials/jobs/count.html' %}
- {% if not finished_at %}
-
- {% endif %}
+ {% include 'partials/jobs/count.html' %}
- {% if not finished_at %}
-
- {% endif %}
- {% include 'partials/jobs/notifications.html' %}
- {% if not finished_at %}
-
- {% endif %}
+ {% include 'partials/jobs/notifications.html' %}
{% endblock %}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index bb1b4b2c6..1794e9961 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -68,7 +68,8 @@ gulp.task('javascripts', () => gulp
.pipe(plugins.uglify())
.pipe(plugins.addSrc.prepend([
paths.npm + 'jquery/dist/jquery.min.js',
- paths.npm + 'query-command-supported/dist/queryCommandSupported.min.js'
+ paths.npm + 'query-command-supported/dist/queryCommandSupported.min.js',
+ paths.npm + 'diff-dom/diffDOM.js'
]))
.pipe(plugins.concat('all.js'))
.pipe(gulp.dest(paths.dist + 'javascripts/'))
diff --git a/package.json b/package.json
index 09bef0a4e..e51d2b135 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"dependencies": {
"babel-core": "6.3.26",
"babel-preset-es2015": "6.3.13",
+ "diff-dom": "2.0.3",
"govuk-elements-sass": "1.1.1",
"govuk_frontend_toolkit": "4.6.0",
"govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.17.1/jinja_govuk_template-0.17.1.tgz",