From 61eaad9a9fdbff32e962da171721a62f65dd2b0b Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 14 Nov 2019 16:22:06 +0000 Subject: [PATCH 1/6] Update all, but one, `
` to component Includes: - in gulpfile.js: - add details macro to list of those copied from GOVUK Frontend - remove existing details polyfill - convert all, but one,
tags to use GOVUK Frontend details component - add jinja boolean filter to help setting 'open' attribute of
tags Notes on the `
` not included in this: The `
` used for notifications items on the API integration page is not possible to reproduce with the GOV.UK Frontend macro so I'm splitting the resulting work out into it's own commit. --- app/__init__.py | 1 + .../stylesheets/govuk-frontend/_all.scss | 1 + app/templates/views/get-started.html | 32 ++++++++++--------- app/templates/views/platform-admin/index.html | 13 ++++++-- .../views/platform-admin/services.html | 26 +++++++++------ gulpfile.js | 4 +-- 6 files changed, 47 insertions(+), 30 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4c24d5b28..59b918f81 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -743,6 +743,7 @@ def add_template_filters(application): format_phone_number_human_readable, format_thousands, id_safe, + convert_to_boolean, ]: application.add_template_filter(fn) diff --git a/app/assets/stylesheets/govuk-frontend/_all.scss b/app/assets/stylesheets/govuk-frontend/_all.scss index 760d837cc..9ecefd894 100644 --- a/app/assets/stylesheets/govuk-frontend/_all.scss +++ b/app/assets/stylesheets/govuk-frontend/_all.scss @@ -17,6 +17,7 @@ $govuk-assets-path: "/static/"; @import 'components/header/_header'; @import 'components/footer/_footer'; @import 'components/back-link/_back-link'; +@import 'components/details/_details'; @import "utilities/all"; @import "overrides/all"; diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html index 09e165a8d..0d20b17b9 100644 --- a/app/templates/views/get-started.html +++ b/app/templates/views/get-started.html @@ -1,6 +1,7 @@ {% extends "content_template.html" %} {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %} {% from "components/sub-navigation.html" import sub_navigation %} +{% from "components/details/macro.njk" import govukDetails %} {% block per_page_title %} Get started @@ -14,21 +15,22 @@

  • Check if GOV.UK Notify is right for you

    Read about our features, pricing and roadmap.

    -
    - Organisations that can use Notify -
    -

    Notify is available to:

    -
      -
    • central government departments
      • -
    • local authorities
      • -
    • state-funded schools
      • -
    • housing associations
      • -
    • the NHS
      • -
    • companies owned by local or central government that deliver services on their behalf
      • -
    -

    Notify is not currently available to charities.

    -
    -
    + {{ govukDetails({ + "summaryText": "Organisations that can use Notify", + "html": ''' +
    +

    Notify is available to:

    +
      +
    • central government departments
      • +
    • local authorities
      • +
    • state-funded schools
      • +
    • housing associations
      • +
    • the NHS
      • +
    • companies owned by local or central government that deliver services on their behalf
      • +
    +

    Notify is not currently available to charities.

    +
    ''' + }) }}
  • diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html index 6da4e87d2..03fb8a021 100644 --- a/app/templates/views/platform-admin/index.html +++ b/app/templates/views/platform-admin/index.html @@ -4,6 +4,7 @@ {% from "components/message-count-label.html" import message_count_label %} {% from "components/status-box.html" import status_box %} {% from "components/form.html" import form_wrapper %} +{% from "components/details/macro.njk" import govukDetails %} {% block per_page_title %} Platform admin @@ -14,15 +15,21 @@

    Summary

    -
    - Apply filters + + {% set details_content %} {% call form_wrapper(method="get") %} {{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }}
    {% endcall %} -
    + {% endset %} + + {{ govukDetails({ + "summaryText": "Help with nationality", + "html": details_content, + "open": form.errors | convert_to_boolean + }) }}
    {% for noti_type in global_stats %} diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html index c10abb095..c42a76af7 100644 --- a/app/templates/views/platform-admin/services.html +++ b/app/templates/views/platform-admin/services.html @@ -6,6 +6,7 @@ {% from "components/message-count-label.html" import message_count_label %} {% from "components/table.html" import mapping_table, field, stats_fields, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %} {% from "components/form.html" import form_wrapper %} +{% from "components/details/macro.njk" import govukDetails %} {% macro stats_fields(channel, data) -%} @@ -101,16 +102,21 @@ {{ page_title|capitalize }} -
    - Apply filters - {% call form_wrapper(method="get") %} - {{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} - {{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} - {{ checkbox(form.include_from_test_key) }} -
    - - {% endcall %} -
    + + {% set details_content %} + {% call form_wrapper(method="get") %} + {{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} + {{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} + {{ checkbox(form.include_from_test_key) }} +
    + + {% endcall %} + {% endset %} + + {{ govukDetails({ + "summaryText": "Apply filters", + "html": details_content + }) }} {% include "views/platform-admin/_global_stats.html" %} diff --git a/gulpfile.js b/gulpfile.js index bd9f27a5d..454d88395 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -63,7 +63,8 @@ const copy = { 'skip-link', 'header', 'footer', - 'back-link' + 'back-link', + 'details' ]; let done = 0; @@ -143,7 +144,6 @@ const javascripts = () => { paths.src + 'javascripts/govuk/cookie-functions.js', paths.src + 'javascripts/cookieMessage.js', paths.src + 'javascripts/stick-to-window-when-scrolling.js', - paths.src + 'javascripts/detailsPolyfill.js', paths.src + 'javascripts/apiKey.js', paths.src + 'javascripts/autofocus.js', paths.src + 'javascripts/enhancedTextbox.js', From 72b10950c438e30ff75dce73d9a7e389d9246ced Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Tue, 3 Dec 2019 09:47:48 +0000 Subject: [PATCH 2/6] Convert `
    ` on API page to macro HTML The GOV.UK Frontend details component macro wraps its `` text in a ``. We put a `

    ` in the `` (actually valid use, based on the spec) so this breaks when the `` wraps it. This converts the existing `
    ` tag to use all the class names the macro creates, but with all the `` contents in the `

    `. Also adds font-smoothing to the messages on the API page. This was previously set globally for all fonts in the GOV.UK Template CSS but is now just set for the New Transport 'nta' font. Included because the messages use the monospace font so don't have it by default. --- app/assets/stylesheets/views/api.scss | 73 ++++++++++++++++++--------- app/templates/views/api/index.html | 46 +++++++++-------- 2 files changed, 72 insertions(+), 47 deletions(-) diff --git a/app/assets/stylesheets/views/api.scss b/app/assets/stylesheets/views/api.scss index 98e21685e..4049c43c5 100644 --- a/app/assets/stylesheets/views/api.scss +++ b/app/assets/stylesheets/views/api.scss @@ -1,6 +1,8 @@ .api-notifications { font-family: monospace; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; border-bottom: 1px solid $border-colour; &-item { @@ -8,38 +10,59 @@ border-top: 1px solid $border-colour; padding: 10px 0 0 0; - &-title { - color: $link-colour; + &__heading, + &__data, + &__view { + font-family: monospace; + } + + &__heading { + display: block; + margin-bottom: $gutter-half; + + &::before { + top: -1.3em; + } + } + + &__meta { + + display: block; + color: $secondary-text-colour; text-decoration: none; - display: block; + + &-key, + &-time { + color: $secondary-text-colour; + display: inline-block; + width: auto; + } + + @include govuk-media-query($from: tablet) { + &-key, + &-time { + width: 50%; + } + + &-time { + text-align: right; + } + } + } - &-recipient { - display: inline; - } + &__data { - &-meta { - display: block; - color: $secondary-text-colour; - } + border-left: none; + padding-left: 25px; - &-time { - text-align: right; - } + &-name { + color: $secondary-text-colour; + } - &-key { - display: inline-block; - padding-left: 46px; - } - - &-data { - - padding-left: 31px; - color: $secondary-text-colour; - - &-item { - padding-bottom: 15px; + &-value { color: $text-colour; + padding-bottom: 15px; } } diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index 9397a97b5..cebb5442d 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -39,43 +39,45 @@
    {% if not api_notifications.notifications %}
    -

    +

    When you send messages via the API they’ll appear here.

    -

    +

    Notify deletes messages after 7 days.

    {% endif %} {% for notification in api_notifications.notifications %} -
    - -

    +
    + +

    + {{ notification.to }} + + + + {{notification.key_name}} + + + + +

    - - - {{notification.key_name}} - - - - -     -
    -
    +
    +
    {% for key in [ 'id', 'client_reference', 'notification_type', 'created_at', 'updated_at', 'sent_at', 'status' ] %} {% if notification[key] %} -
    {{ key }}:
    -
    {{ notification[key] }}
    +
    {{ key }}:
    +
    {{ notification[key] }}
    {% endif %} {% endfor %} {% if notification.status not in ('pending-virus-check', 'virus-scan-failed') %} - View {{ message_count_label(1, notification.template.template_type, suffix='') }} + View {{ message_count_label(1, notification.template.template_type, suffix='') }} {% endif %}
    @@ -84,11 +86,11 @@ {% if api_notifications.notifications %}
    {% if api_notifications.notifications|length == 50 %} -

    +

    Only showing the first 50 messages.

    {% endif %} -

    +

    Notify deletes messages after 7 days.

    From db3bcee236afc96f3836fa4760a63446b48a9942 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 29 Nov 2019 17:40:45 +0000 Subject: [PATCH 3/6] Fix test broken by HTML changes on API page I moved the meta for each message into the `

    ` in each `` to make the heading unique. This broke the test. --- .../app/main/views/.test_api_integration.py.swp | Bin 0 -> 40960 bytes tests/app/main/views/test_api_integration.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tests/app/main/views/.test_api_integration.py.swp diff --git a/tests/app/main/views/.test_api_integration.py.swp b/tests/app/main/views/.test_api_integration.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..c69e5d355326c622365a82d812e846dd51134b20 GIT binary patch literal 40960 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 P8wJ~{A{VLtIPL!cQo^mI literal 0 HcmV?d00001 diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py index 326f68d1e..5ba9a68c1 100644 --- a/tests/app/main/views/test_api_integration.py +++ b/tests/app/main/views/test_api_integration.py @@ -37,7 +37,7 @@ def test_should_show_api_page( rows = page.find_all('details') assert len(rows) == 5 for row in rows: - assert row.find('h3').string.strip() == '07123456789' + assert row.select('h3 .govuk-details__summary-text')[0].string.strip() == '07123456789' def test_should_show_api_page_with_lots_of_notifications( From d0a492988da48103143a8f8b9fae4103f4ef601c Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Mon, 9 Dec 2019 16:24:48 +0000 Subject: [PATCH 4/6] Remove mistakenly added .swp file --- .../app/main/views/.test_api_integration.py.swp | Bin 40960 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/app/main/views/.test_api_integration.py.swp diff --git a/tests/app/main/views/.test_api_integration.py.swp b/tests/app/main/views/.test_api_integration.py.swp deleted file mode 100644 index c69e5d355326c622365a82d812e846dd51134b20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40960 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 P8wJ~{A{VLtIPL!cQo^mI From fba4c173ffbfec11a1fa95c9a2eae1339747ad5b Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 13 Dec 2019 09:41:34 +0000 Subject: [PATCH 5/6] Correct platform admin details summary text --- app/templates/views/platform-admin/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html index 03fb8a021..c404f78c3 100644 --- a/app/templates/views/platform-admin/index.html +++ b/app/templates/views/platform-admin/index.html @@ -26,7 +26,7 @@ {% endset %} {{ govukDetails({ - "summaryText": "Help with nationality", + "summaryText": "Apply filters", "html": details_content, "open": form.errors | convert_to_boolean }) }} From 96bc4d2fd7b00f53af6c02b252d8a14592567b01 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 13 Dec 2019 09:50:04 +0000 Subject: [PATCH 6/6] Remove redundant details polyfill We're now using the GOV.UK Frontend one. --- app/assets/javascripts/detailsPolyfill.js | 196 ---------------------- 1 file changed, 196 deletions(-) delete mode 100644 app/assets/javascripts/detailsPolyfill.js diff --git a/app/assets/javascripts/detailsPolyfill.js b/app/assets/javascripts/detailsPolyfill.js deleted file mode 100644 index ce0692195..000000000 --- a/app/assets/javascripts/detailsPolyfill.js +++ /dev/null @@ -1,196 +0,0 @@ -// From -// https://github.com/alphagov/govuk_elements/blob/4926897dc7734db2fc5e5ebb6acdc97f86e22e50/public/javascripts/vendor/details.polyfill.js -// -// --- -// -//
    polyfill -// http://caniuse.com/#feat=details - -// FF Support for HTML5's
    and -// https://bugzilla.mozilla.org/show_bug.cgi?id=591737 - -// http://www.sitepoint.com/fixing-the-details-element/ - -(function () { - 'use strict'; - - var NATIVE_DETAILS = typeof document.createElement('details').open === 'boolean'; - - // Add event construct for modern browsers or IE - // which fires the callback with a pre-converted target reference - function addEvent(node, type, callback) { - if (node.addEventListener) { - node.addEventListener(type, function (e) { - callback(e, e.target); - }, false); - } else if (node.attachEvent) { - node.attachEvent('on' + type, function (e) { - callback(e, e.srcElement); - }); - } - } - - // Handle cross-modal click events - function addClickEvent(node, callback) { - // Prevent space(32) from scrolling the page - addEvent(node, 'keypress', function (e, target) { - if (target.nodeName === 'SUMMARY') { - if (e.keyCode === 32) { - if (e.preventDefault) { - e.preventDefault(); - } else { - e.returnValue = false; - } - } - } - }); - // When the key comes up - check if it is enter(13) or space(32) - addEvent(node, 'keyup', function (e, target) { - if (e.keyCode === 13 || e.keyCode === 32) { callback(e, target); } - }); - addEvent(node, 'mouseup', function (e, target) { - callback(e, target); - }); - } - - // Get the nearest ancestor element of a node that matches a given tag name - function getAncestor(node, match) { - do { - if (!node || node.nodeName.toLowerCase() === match) { - break; - } - } while ((node = node.parentNode)); - - return node; - } - - // Create a started flag so we can prevent the initialisation - // function firing from both DOMContentLoaded and window.onload - var started = false; - - // Initialisation function - function addDetailsPolyfill(list) { - - // If this has already happened, just return - // else set the flag so it doesn't happen again - if (started) { - return; - } - started = true; - - // Get the collection of details elements, but if that's empty - // then we don't need to bother with the rest of the scripting - if ((list = document.getElementsByTagName('details')).length === 0) { - return; - } - - // else iterate through them to apply their initial state - var n = list.length, i = 0; - for (i; i < n; i++) { - var details = list[i]; - - // Save shortcuts to the inner summary and content elements - details.__summary = details.getElementsByTagName('summary').item(0); - details.__content = details.getElementsByTagName('div').item(0); - - // If the content doesn't have an ID, assign it one now - // which we'll need for the summary's aria-controls assignment - if (!details.__content.id) { - details.__content.id = 'details-content-' + i; - } - - // Add ARIA role="group" to details - details.setAttribute('role', 'group'); - - // Add role=button to summary - details.__summary.setAttribute('role', 'button'); - - // Add aria-controls - details.__summary.setAttribute('aria-controls', details.__content.id); - - // Set tabIndex so the summary is keyboard accessible for non-native elements - // http://www.saliences.com/browserBugs/tabIndex.html - if (!NATIVE_DETAILS) { - details.__summary.tabIndex = 0; - } - - // Detect initial open state - var openAttr = details.getAttribute('open') !== null; - if (openAttr === true) { - details.__summary.setAttribute('aria-expanded', 'true'); - details.__content.setAttribute('aria-hidden', 'false'); - } else { - details.__summary.setAttribute('aria-expanded', 'false'); - details.__content.setAttribute('aria-hidden', 'true'); - if (!NATIVE_DETAILS) { - details.__content.style.display = 'none'; - } - } - - // Create a circular reference from the summary back to its - // parent details element, for convenience in the click handler - details.__summary.__details = details; - - // If this is not a native implementation, create an arrow - // inside the summary - - var twisty = document.createElement('i'); - - if (openAttr === true) { - twisty.className = 'arrow arrow-open'; - twisty.appendChild(document.createTextNode('\u25bc')); - } else { - twisty.className = 'arrow arrow-closed'; - twisty.appendChild(document.createTextNode('\u25ba')); - } - - details.__summary.__twisty = details.__summary.insertBefore(twisty, details.__summary.firstChild); - details.__summary.__twisty.setAttribute('aria-hidden', 'true'); - - } - - // Define a statechange function that updates aria-expanded and style.display - // Also update the arrow position - function statechange(summary) { - - var expanded = summary.__details.__summary.getAttribute('aria-expanded') === 'true'; - var hidden = summary.__details.__content.getAttribute('aria-hidden') === 'true'; - - summary.__details.__summary.setAttribute('aria-expanded', (expanded ? 'false' : 'true')); - summary.__details.__content.setAttribute('aria-hidden', (hidden ? 'false' : 'true')); - - if (!NATIVE_DETAILS) { - summary.__details.__content.style.display = (expanded ? 'none' : ''); - - var hasOpenAttr = summary.__details.getAttribute('open') !== null; - if (!hasOpenAttr) { - summary.__details.setAttribute('open', 'open'); - } else { - summary.__details.removeAttribute('open'); - } - } - - if (summary.__twisty) { - summary.__twisty.firstChild.nodeValue = (expanded ? '\u25ba' : '\u25bc'); - summary.__twisty.setAttribute('class', (expanded ? 'arrow arrow-closed' : 'arrow arrow-open')); - } - - return true; - } - - // Bind a click event to handle summary elements - addClickEvent(document, function(e, summary) { - if (!(summary = getAncestor(summary, 'summary'))) { - return true; - } - return statechange(summary); - }); - } - - // Bind two load events for modern and older browsers - // If the first one fires it will set a flag to block the second one - // but if it's not supported then the second one will fire - addEvent(document, 'DOMContentLoaded', addDetailsPolyfill); - addEvent(window, 'load', addDetailsPolyfill); - -})();