govuk_publishing_components 16.20.1 → 16.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b578c023ba499b8cd0c8021144fabaf4514f6ffa9ffcb49682b984dadc471a1c
-  data.tar.gz: c1d8829238aa38adb6f4b434158867b978f10040b4a856f67f270114adbfead2
+  metadata.gz: b0e66c510f47947195c29e3e559334f23976da49f7b0d88aa4decb9312448089
+  data.tar.gz: 6f45aed161c2c129fc255648cb5718484a1043f0dd9234fd5bfa221b43606385
 SHA512:
-  metadata.gz: 20518ee81485fe5df7f6fd510f8d28f742a5ea3f706cece20a0a709771b6e3f332680969f6acbd5c9950a3f359896df25f02c3db4bb3527c43a2f3cab7847c1c
-  data.tar.gz: 3aca611de7fc01c47452c8c61d3439819f589fd3e0b21c3ed191e3d15ed4e938eae61571d901f51835f56981a77551e1a768ade7aa502b9eae31a2c9ef92dd19
+  metadata.gz: 5bae4ba11805b6e66728e492e42bcab8b02192cd24680bebcc9793901a266d8ed211159791a164cedacc3f11ce2f5455c143eedd4b3b69e0a5452ea0fd1984c8
+  data.tar.gz: 3cda7c4c005d472a7966c3842f93f4fb70cd1e0f262cf04390331b7c03b594839d0f41660219e2b3dd2b48added11bac93df4c84fa2c5a9903851a9dbb50ac9b

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -10,17 +10,24 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$module.showConfirmationMessage = this.showConfirmationMessage.bind(this)
     this.$module.setCookieConsent = this.setCookieConsent.bind(this)
 
-    this.$hideLink = this.$module.querySelector('a[data-hide-cookie-banner], button[data-hide-cookie-banner]')
-    if (this.$hideLink) {
-      this.$hideLink.addEventListener('click', this.$module.hideCookieMessage)
-    }
+    var newCookieBanner = document.querySelector('.gem-c-cookie-banner--new')
 
-    this.$acceptCookiesLink = this.$module.querySelector('button[data-accept-cookies]')
-    if (this.$acceptCookiesLink) {
-      this.$acceptCookiesLink.addEventListener('click', this.$module.setCookieConsent)
-    }
+    // Hide the cookie banner on the cookie settings page, to avoid circular journeys
+    if (newCookieBanner && window.location.pathname === '/help/cookies') {
+      this.$module.style.display = 'none'
+    } else {
+      this.$hideLink = this.$module.querySelector('a[data-hide-cookie-banner], button[data-hide-cookie-banner]')
+      if (this.$hideLink) {
+        this.$hideLink.addEventListener('click', this.$module.hideCookieMessage)
+      }
+
+      this.$acceptCookiesLink = this.$module.querySelector('button[data-accept-cookies]')
+      if (this.$acceptCookiesLink) {
+        this.$acceptCookiesLink.addEventListener('click', this.$module.setCookieConsent)
+      }
 
-    this.showCookieMessage()
+      this.showCookieMessage()
+    }
   }
 
   CookieBanner.prototype.showCookieMessage = function () {

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js

@@ -5,9 +5,9 @@
   var root = this
   var defaultCookieConsent = {
     'essential': true,
-    'settings': false,
-    'usage': false,
-    'campaigns': false
+    'settings': true,
+    'usage': true,
+    'campaigns': true
   }
 
   if (typeof root.GOVUK === 'undefined') { root.GOVUK = {} }

data/app/assets/stylesheets/govuk_publishing_components/components/_attachment.scss

@@ -10,6 +10,11 @@ $thumbnail-icon-border-colour: govuk-colour("grey-3");
 .gem-c-attachment {
   @include govuk-font(19);
   @include govuk-clearfix;
+  position: relative;
+
+  .govuk-details__summary {
+    @include govuk-font($size: 14);
+  }
 }
 
 .gem-c-attachment__thumbnail {
@@ -34,6 +39,10 @@ $thumbnail-icon-border-colour: govuk-colour("grey-3");
   stroke: $thumbnail-icon-border-colour;
 }
 
+.gem-c-attachment__details {
+  padding-left: $thumbnail-width + $thumbnail-border-width * 2 + govuk-spacing(5);
+}
+
 .gem-c-attachment__title {
   @include govuk-font($size: 27);
   margin: 0 0 govuk-spacing(3);
@@ -42,6 +51,10 @@ $thumbnail-icon-border-colour: govuk-colour("grey-3");
 .gem-c-attachment__metadata {
   @include govuk-font($size: 14);
   margin: 0 0 govuk-spacing(3);
+
+  &:last-of-type {
+    margin-bottom: 0;
+  }
 }
 
 .gem-c-attachment__abbr {

data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss

@@ -65,7 +65,7 @@ $govuk-cookie-banner-background-new: govuk-colour("white");
 }
 
 .gem-c-cookie-banner__hide-button {
-  @include govuk-font($size: 16);
+  @include govuk-font($size: 19);
   outline: 0;
   border: 0;
   background: none;
@@ -99,7 +99,7 @@ $govuk-cookie-banner-background-new: govuk-colour("white");
   .gem-c-cookie-banner__buttons,
   .gem-c-cookie-banner__confirmation,
   .gem-c-cookie-banner__confirmation-message {
-    @include core-19;
+    @include govuk-font($size: 19);
   }
 
   p {

data/app/views/govuk_publishing_components/components/_attachment.html.erb

@@ -1,7 +1,7 @@
 <%
   attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
   target ||= "_self"
-  hide_help_text ||= false
+  hide_opendocument_metadata ||= false
   attributes = []
 
   if attachment.content_type_name
@@ -46,20 +46,31 @@
     <% end %>
   <% end %>
 
-  <%= tag.h2 class: "gem-c-attachment__title" do %>
-    <%= link_to attachment.title, attachment.url,
-          class: "govuk-link",
-          target: target %>
-  <% end %>
+  <%= tag.div class: "gem-c-attachment__details" do %>
+    <%= tag.h2 class: "gem-c-attachment__title" do %>
+      <%= link_to attachment.title, attachment.url,
+            class: "govuk-link",
+            target: target %>
+    <% end %>
 
-  <% if attributes.any? %>
-    <%= tag.p raw(attributes.join(', ')), class: "gem-c-attachment__metadata" %>
-  <% end %>
+    <% if attributes.any? %>
+      <%= tag.p raw(attributes.join(', ')), class: "gem-c-attachment__metadata" %>
+    <% end %>
+
+    <% unless hide_opendocument_metadata %>
+      <% if attachment.opendocument? %>
+        <%= tag.p class: "gem-c-attachment__metadata" do %>
+          <%= t("components.attachment.opendocument_html", target: target) %>
+        <% end %>
+      <% end %>
+    <% end %>
 
-  <% unless hide_help_text %>
-    <% if attachment.opendocument? %>
-      <%= tag.p class: "gem-c-attachment__metadata" do %>
-        <%= t("components.attachment.opendocument_html", target: target) %>
+    <% if attachment.alternative_format_contact_email %>
+      <%= tag.p t("components.attachment.request_format_text"), class: "gem-c-attachment__metadata" %>
+      <%= render "govuk_publishing_components/components/details", {
+        title: t("components.attachment.request_format_cta")
+      } do %>
+        <%= t("components.attachment.request_format_details_html", alternative_format_contact_email: attachment.alternative_format_contact_email) %>
       <% end %>
     <% end %>
   <% end %>

data/app/views/govuk_publishing_components/components/_attachment_link.html.erb

@@ -8,7 +8,7 @@
                              title: attachment.content_type_name,
                              class: "gem-c-attachment-link__abbr")
               else
-                attachment.readable_content_type
+                attachment.content_type_name
               end
 
     attributes << tag.span(content, class: "gem-c-attachment-link__attribute")

data/app/views/govuk_publishing_components/components/docs/attachment.yml

@@ -53,7 +53,7 @@ examples:
         filename: 20130110_Iraq_wave01.txt
         content_type: text/plain
         file_size: 108515
-      hide_help_text: true
+      hide_opendocument_metadata: true
   embedded_in_govspeak:
     description: |
       This component can be embedded in Govspeak with the `[Attachment:]` code.
@@ -69,3 +69,12 @@ examples:
         filename: BEIS_Information_Asset_Register_.ods
         content_type: application/vnd.oasis.opendocument.spreadsheet
         file_size: 20000
+  with_contact_email:
+    data:
+      attachment:
+        title: "Department for Transport information asset register"
+        url: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/747661/department-for-transport-information-asset-register.csv
+        filename: department-for-transport-information-asset-register.csv
+        content_type: application/pdf
+        file_size: 20000
+        alternative_format_contact_email: defra.helpline@defra.gsi.gov.uk

data/config/locales/en.yml

@@ -25,6 +25,9 @@ en:
   components:
     attachment:
       opendocument_html: "This file is in an <a href='https://www.gov.uk/guidance/open-document-format-odf-guidance-for-uk-government/overview-of-productivity-software' target=%{target} class='govuk-link'>OpenDocument</a> format"
+      request_format_text: "This file may not be suitable for users of assistive technology."
+      request_format_cta: "Request a different format"
+      request_format_details_html: "If you use assistive technology and need a version of this document in a more accessible format, please email <a href='mailto:%{alternative_format_contact_email}' target='_blank' class='govuk-link'>%{alternative_format_contact_email}</a>. Please tell us what format you need. It will help us if you say what assistive technology you use."
     autocomplete:
       multiselect: "To select multiple items in a list, hold down Ctrl (PC) or Cmd (Mac) key."
     back_link:

data/lib/govuk_publishing_components/presenters/attachment.rb

@@ -7,7 +7,7 @@ module GovukPublishingComponents
 
       # Expects a hash of attachment data
       # * title and url are required
-      # * content_type, filename, file_size, number of pages can be provided
+      # * content_type, filename, file_size, number of pages, alternative_format_contact_email can be provided
       def initialize(attachment_data)
         @attachment_data = attachment_data.with_indifferent_access
       end
@@ -43,6 +43,10 @@ module GovukPublishingComponents
         attachment_data[:number_of_pages]
       end
 
+      def alternative_format_contact_email
+        attachment_data[:alternative_format_contact_email]
+      end
+
       class SupportedContentType
         attr_reader :content_type_data
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '16.20.1'.freeze
+  VERSION = '16.21.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#0c518b4fa79b9a95b544410858486ed9e6403c84",
-  "_shasum": "758be0437fab0bfff95fe7f440dee86ecb743279",
+  "_shasum": "8ca719f4ef20cf30d77527b29470f727a8fbbeb9",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 16.20.1
+  version: 16.21.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters