From b98b328d9b7fc6c2238342e679bb61e9c02afafa Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 1 Sep 2016 11:07:00 +0100 Subject: [PATCH] Upgrade diffDOM dependency Features: - Expose Diff object Fixes: - Reverse actions for modifyComment/Text - Simplify diff on some text only diffs - Simplify diff on single element removal --- app/templates/views/dashboard/_upcoming.html | 68 ++++++++++---------- package.json | 2 +- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/templates/views/dashboard/_upcoming.html b/app/templates/views/dashboard/_upcoming.html index 0f7babb99..4589b20a3 100644 --- a/app/templates/views/dashboard/_upcoming.html +++ b/app/templates/views/dashboard/_upcoming.html @@ -2,37 +2,39 @@ {% from "components/big-number.html" import big_number %} {% from "components/show-more.html" import show_more %} -{% if scheduled_jobs %} -
-

- In the next 24 hours -

- {% call(item, row_number) list_table( - scheduled_jobs, - caption="In the next 24 hours", - caption_visible=False, - empty_message='Nothing to see here', - field_headings=[ - 'File', - 'Messages to be sent' - ], - field_headings_visible=True - ) %} - {% call row_heading() %} -
- {{ item.original_file_name }} - - Sending at {{ item.scheduled_for|format_time }} - -
+
+ {% if scheduled_jobs %} +
+

+ In the next 24 hours +

+ {% call(item, row_number) list_table( + scheduled_jobs, + caption="In the next 24 hours", + caption_visible=False, + empty_message='Nothing to see here', + field_headings=[ + 'File', + 'Messages to be sent' + ], + field_headings_visible=True + ) %} + {% call row_heading() %} +
+ {{ item.original_file_name }} + + Sending at {{ item.scheduled_for|format_time }} + +
+ {% endcall %} + {% call field() %} + {{ big_number( + item.notification_count, + smallest=True + ) }} + {% endcall %} {% endcall %} - {% call field() %} - {{ big_number( - item.notification_count, - smallest=True - ) }} - {% endcall %} - {% endcall %} - {{ show_more() }} -
-{% endif %} + {{ show_more() }} +
+ {% endif %} +
diff --git a/package.json b/package.json index c3f8fd139..ffcc530fc 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "babel-core": "6.3.26", "babel-preset-es2015": "6.3.13", - "diff-dom": "2.0.3", + "diff-dom": "2.1.0", "govuk-elements-sass": "1.1.1", "govuk_frontend_toolkit": "4.6.0", "govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.18.0/jinja_govuk_template-0.18.0.tgz",