govuk_publishing_components 23.9.0 → 23.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f3f7a062896026a1d879ee8e13d35d6e123e5deb428e085eb54450494e8e354
-  data.tar.gz: 4efbc1f947779c1f589b07aaf93022459d6376963c477cd054f76c0a78bc074b
+  metadata.gz: 737265f42ca1a81cb1a854d9858c053b36da1dd49096d4ab271880e40a0d265a
+  data.tar.gz: 53e08f6b824be9665c54eb1e421463d63d8a761cc0aa8b432fdea43025fe173f
 SHA512:
-  metadata.gz: b8b9bb9042fd8c8091b66d68f47a2a19baf9bda42f4b7d381113aaa33028f6a3c6e4374b65f53647e61e5280a387fa1f02355ac3c78110092cc28a9faf98d85d
-  data.tar.gz: b148efd5a2ef726a1d9dc26a478fe43c229b9066a8a96a2bd0cf2eb1ffe6b9d3654cfba6f1f02de4ee25ecccb33a2d2473837a686535cd701075f3bdfd4abc16
+  metadata.gz: d668236b7496da22426217927da594ff3dc3da9a903fafe647ca9ab47cc7877d779aef7dd841dde4b1f514571155a149a8d81bc40ff0b4e506ec8d90eeb6b80b
+  data.tar.gz: 5ea78e25ed6a8ca39346ce90b46262b96c793ebd0fcc84a83715378099f029aa2c72bc29f758ba1b414d81fc7a73a3b21e7bd35603313d621d8c7fb112b1364f

data/app/assets/javascripts/govuk_publishing_components/analytics.js

@@ -14,3 +14,4 @@
 //= require ./analytics/ecommerce
 //= require ./analytics/init
 //= require ./analytics/scroll-tracker
+//= require ./analytics/explicit-cross-domain-links

data/app/assets/javascripts/govuk_publishing_components/analytics/explicit-cross-domain-links.js

@@ -0,0 +1,34 @@
+;(function (global) {
+  'use strict'
+
+  var GOVUK = global.GOVUK || {}
+  GOVUK.Modules = GOVUK.Modules || {}
+
+  GOVUK.Modules.ExplicitCrossDomainLinks = function () {
+    this.start = function ($module) {
+      var element = $module[0]
+
+      if (!global.ga) { return }
+
+      global.ga(function () {
+        var trackers = global.ga.getAll()
+
+        if (!trackers.length) { return }
+
+        var linker = new global.gaplugins.Linker(trackers[0])
+
+        var attrAction = element.getAttribute('action')
+        if (attrAction) {
+          element.setAttribute('action', linker.decorate(attrAction))
+        }
+
+        var attrHref = element.getAttribute('href')
+        if (attrHref) {
+          element.href = linker.decorate(attrHref)
+        }
+      })
+    }
+  }
+
+  global.GOVUK = GOVUK
+})(window)

data/app/assets/javascripts/govuk_publishing_components/components/show-password.js

@@ -26,6 +26,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.showHide = document.createElement('button')
     this.showHide.className = 'gem-c-show-password__toggle'
     this.showHide.setAttribute('aria-controls', this.input.getAttribute('id'))
+    this.showHide.setAttribute('type', 'button')
     this.showHide.innerHTML = this.showPasswordText
     this.wrapper.insertBefore(this.showHide, this.input.nextSibling)
 

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js

@@ -105,8 +105,10 @@
         events: {
           onReady: function (event) {
             // update iframe title attribute once video is ready
+            // this is done to let screen reader users know that they are focused on a video
+            // https://github.com/alphagov/govuk_publishing_components/pull/908#discussion_r302913995
             var videoTitle = options.title
-            event.target.f.title = videoTitle + ' (video)'
+            event.target.getIframe().title = videoTitle + ' (video)'
           },
           onStateChange: function (event) {
             var eventData = event.data

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

@@ -36,10 +36,10 @@ $large-input-size: 50px;
 
 .gem-c-search__input[type="search"] { // overly specific to prevent some overrides from outside
   @include govuk-font($size: 19, $line-height: (28 / 19));
-  padding: 6px;
   margin: 0;
   width: 100%;
-  height: em(34, 16);
+  height: em(40, 16);
+  padding: em(6, 16);
   border: $govuk-border-width-form-element solid $govuk-input-border-colour;
   background: govuk-colour("white");
   border-radius: 0; //otherwise iphones apply an automatic border radius
@@ -47,6 +47,10 @@ $large-input-size: 50px;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
+  @include govuk-media-query($from: tablet) {
+    height: em(40, 19);
+    padding: em(6, 19);
+  }
 
   // the .focus class is added by JS and ensures that the input remains above the label once clicked/filled in
   &:focus,

data/app/assets/stylesheets/govuk_publishing_components/components/_show-password.scss

@@ -39,6 +39,8 @@
 
   @include govuk-media-query($from: mobile) {
     margin-left: -2px;
+    margin-top: 0;
+    margin-bottom: 0;
   }
 
   &:hover {

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

@@ -4,7 +4,7 @@
 <div class="gem-c-contextual-sidebar">
   <% if navigation.show_brexit_cta? && navigation.step_by_step_count.zero? %>
     <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta' %>
-  <% elsif navigation.step_by_step_count.zero? %>
+  <% elsif navigation.step_by_step_count.zero? && !navigation.transition_countdown_exception? %>
     <%= render 'govuk_publishing_components/components/transition_countdown', {
       title: t("components.related_navigation.transition.title"),
       url: t("components.related_navigation.transition.link_path"),

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

@@ -144,3 +144,23 @@ examples:
                       - text: Find out what you’ll get
                         href: "/settled-status-eu-citizens-families/what-settled-and-presettled-status-means"
                     optional: false
+  transition_countdown_exception:
+    data:
+      content_item:
+        title: "30 creative teams awarded up to £100,000 each for Festival UK* 2022 R&D project"
+        content_id: "c3752802-f091-43a9-ba90-33568fccf391"
+        links:
+          ordered_related_items:
+          - title: Find an apprenticeship
+            base_path: /apply-apprenticeship
+          - title: Training and study at work
+            base_path: /training-study-work-your-rights
+          - title: Careers helpline for teenagers
+            base_path: /careers-helpline-for-teenagers
+          document_collections:
+          - title: Recruit an apprentice (formerly apprenticeship vacancies)
+            base_path: /government/collections/apprenticeship-vacancies
+            document_type: document_collection
+          - title: The future of jobs and skills
+            base_path: /government/collections/the-future-of-jobs-and-skills
+            document_type: document_collection

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

@@ -70,7 +70,7 @@ examples:
     description: Don't indent the extra links. Used for links to people pages.
     data:
       href: "/government/people/"
-      image_src: "http://placekitten.com/215/140"
+      image_src: "https://assets.publishing.service.gov.uk/government/uploads/system/uploads/feature/image/62756/s300_courts-of-justice.JPG"
       image_alt: "some meaningful alt text please"
       context:
         text: "The Rt Hon"
@@ -85,7 +85,7 @@ examples:
   extra_links_with_no_main_link:
     description: If extra links are included, the main link is not needed. Note that in this configuration the image is not a link as no link has been supplied.
     data:
-      image_src: "http://placekitten.com/215/140"
+      image_src: "https://assets.publishing.service.gov.uk/government/uploads/system/uploads/feature/image/62756/s300_courts-of-justice.JPG"
       image_alt: "some meaningful alt text please"
       heading_text: "John Whiskers MP"
       extra_links: [
@@ -151,7 +151,7 @@ examples:
     data:
       large: true
       href: "/still-not-a-page"
-      image_src: "https://assets.publishing.service.gov.uk/frontend/homepage/uk-leaves-the-eu-d84d2981a9953d8b1261c9d25016223b0a8af3c096fa2d5e03510d73a78e3c60.jpg"
+      image_src: "https://assets.publishing.service.gov.uk/government/uploads/system/uploads/feature/image/62756/s300_courts-of-justice.JPG"
       image_alt: "some meaningful alt text please"
       context:
         date: 2017-06-14 11:30:00
@@ -208,7 +208,7 @@ examples:
   with_lang:
     description: |
       Pass through an appropriate `lang` to set a HTML lang attribute for the component.
-      
+
       The `lang` attribute **must** be set to a [valid BCP47 string](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang#Language_tag_syntax). A valid code can be the two or three letter language code - for example, English is `en` or `eng`, Korean is `ko` or `kor` - but if in doubt please check.
     data:
       href: "/not-a-page"

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

@@ -1,9 +1,11 @@
-name: Show password input
+name: Show password input (experimental)
 description: A password input field that allows the password to be shown.
 body: |
   Adds a password reveal button to an input that toggles its type from password to text, revealing the password. Does not appear if JavaScript is disabled.
 
   Uses a visually hidden bit of text to inform screen reader users of the state of the input rather than announcing the content of the password input when toggled.
+
+  This component is currently experimental. If you are using it, please feed back any research findings to the Accounts team.
 accessibility_criteria: |
   The component must:
 

data/lib/govuk_publishing_components.rb

@@ -37,15 +37,17 @@ require "govuk_publishing_components/app_helpers/brand_helper"
 require "govuk_publishing_components/app_helpers/countdown_helper"
 require "govuk_publishing_components/app_helpers/environment"
 
-# Add view and i18n paths for usage outside of a Rails app
-ActionController::Base.append_view_path(
-  File.expand_path("app/views", GovukPublishingComponents::Config.gem_directory),
-)
-
+# Add i18n paths and views for usage outside of a Rails app
 I18n.load_path.unshift(
   *Dir.glob(File.expand_path("config/locales/*.yml", GovukPublishingComponents::Config.gem_directory)),
 )
 
+ActiveSupport.on_load(:action_controller) do
+  ActionController::Base.append_view_path(
+    File.expand_path("app/views", GovukPublishingComponents::Config.gem_directory),
+  )
+end
+
 module GovukPublishingComponents
   def self.render(component, options = {})
     I18n.with_locale(options.fetch(:locale, "en")) do

data/lib/govuk_publishing_components/app_helpers/countdown_helper.rb

@@ -1,18 +1,18 @@
 module GovukPublishingComponents
   module AppHelpers
     class CountdownHelper
-      END_OF_TRANSITION_PERIOD = Date.new(2021, 1, 1)
+      DEADLINE = Time.new(2020, 12, 31, 23, 59)
 
       def days_left
-        sprintf "%02d", days_left_integer
+        sprintf "%02d", days_left_until_deadline
       end
 
       def show?
-        days_left_integer.positive?
+        minutes_left_until_deadline >= 30
       end
 
       def days_text
-        if days_left_integer == 1
+        if days_left_until_deadline == 1
           I18n.t!("components.transition_countdown.day_to_go")
         else
           I18n.t!("components.transition_countdown.days_to_go")
@@ -21,12 +21,28 @@ module GovukPublishingComponents
 
     private
 
-      def days_left_integer
-        (END_OF_TRANSITION_PERIOD - today_in_london).to_i
+      def days_left_until_deadline
+        (minutes_left_until_deadline / 60 / 24).ceil
       end
 
-      def today_in_london
-        Time.find_zone("Europe/London").today
+      def minutes_left_until_deadline
+        (seconds_left_until_deadline / 60)
+      end
+
+      def seconds_left_until_deadline
+        end_of_transition_period - now_in_london
+      end
+
+      def end_of_transition_period
+        london_time_zone(DEADLINE)
+      end
+
+      def now_in_london
+        london_time_zone(Time.now)
+      end
+
+      def london_time_zone(time)
+        time.in_time_zone("Europe/London")
       end
     end
   end

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -113,6 +113,10 @@ module GovukPublishingComponents
         tagged_to_brexit? && (page_content_id != brexit_start_page_content_id)
       end
 
+      def transition_countdown_exception?
+        content_item["content_id"] == "c3752802-f091-43a9-ba90-33568fccf391"
+      end
+
       def step_by_step_count
         step_nav_helper.step_navs.count
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "23.9.0".freeze
+  VERSION = "23.10.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 23.9.0
+  version: 23.10.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -404,6 +404,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/analytics/download-link-tracker.js
 - app/assets/javascripts/govuk_publishing_components/analytics/ecommerce.js
 - app/assets/javascripts/govuk_publishing_components/analytics/error-tracking.js
+- app/assets/javascripts/govuk_publishing_components/analytics/explicit-cross-domain-links.js
 - app/assets/javascripts/govuk_publishing_components/analytics/external-link-tracker.js
 - app/assets/javascripts/govuk_publishing_components/analytics/google-analytics-universal-tracker.js
 - app/assets/javascripts/govuk_publishing_components/analytics/init.js