govuk_publishing_components 27.4.0 → 27.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701cdbaae0e829d529cf36553c1fa9a0856b552d1933700c1789276209bc131f
-  data.tar.gz: c2418c0148dfbf76fa3a689f50089d0f797216b68979a1056b3a08b84f56da98
+  metadata.gz: a177d643883dea8f63ce0c6931e9170ab46e4d50e3499b430c9a67ddb84cb2ca
+  data.tar.gz: e9b25ea90b6d0fd6269df2acf19a8d724884635ad0dbd84b4279e574737a30ac
 SHA512:
-  metadata.gz: 6658563042e32a3a4f9f6bf2d8f883b4f9bfae2c4fdbc7148e3878dbbd0d993e13263af5f7510167467777aac84e225673be2eb29e14dc3474d32046494093a4
-  data.tar.gz: 864f25f602249724ce5476e06918a9eb181edc0e9fb57ba394e578f0a95faa6790bab96733cc77d4bb69508b1b159dfc203412d7935ccb247b9938928c6fd4b9
+  metadata.gz: b1279ab602818802cf978a9742a8ba40ccdeef9478307c8f724dfa9d8b024ba33945b7dd8eaaa1f758f48c6a70d61957a3b1936db692d04b4c5fb439a7d7bc2d
+  data.tar.gz: 81a267c76307c65fc8a0cca680d82421e18e9e494a1d3a31b252563a05d6b88b38c3d1bb60c1b66bac958f7be668b918b2b9aab53b19f94ab599512e7bd6a5e8

data/README.md

@@ -47,6 +47,7 @@ bin/rake app:jasmine:ci
 - [Code documentation on rubydoc.info](http://www.rubydoc.info/gems/govuk_publishing_components)
 - [Component conventions](docs/component_conventions.md)
 - [Component principles](docs/component_principles.md)
+- [Component auditing](docs/auditing.md)
 
 ## Licence
 

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

@@ -8,6 +8,24 @@
     this.start = function ($module) {
       var element = $module[0]
 
+      var cookieBannerEngaged = GOVUK.cookie('cookies_preferences_set')
+
+      // If not engaged, append only ?cookie-consent=not-engaged
+      // If engaged and rejected, append only ?cookie-consent=reject
+      // If engaged and accepted usage, append ?_ga=clientid if available and cookie-consent=accept
+
+      if (cookieBannerEngaged === 'false') {
+        this.decorate(element, 'cookie_consent=not-engaged')
+        return
+      }
+      var cookieConsent = GOVUK.getConsentCookie()
+      if (cookieConsent.usage === false) {
+        this.decorate(element, 'cookie_consent=reject')
+        return
+      }
+
+      this.decorate(element, 'cookie_consent=accept')
+
       if (!global.ga) { return }
 
       global.ga(function () {
@@ -28,6 +46,26 @@
         }
       })
     }
+
+    this.decorate = function (element, param) {
+      var attribute = 'href'
+      var attributeValue = element.getAttribute(attribute)
+
+      if (!attributeValue) {
+        attribute = 'action'
+        attributeValue = element.getAttribute(attribute)
+      }
+
+      if (!attributeValue) { return }
+
+      if (attributeValue.includes('?')) {
+        attributeValue += '&' + param
+        element.setAttribute(attribute, attributeValue)
+      } else {
+        attributeValue += '?' + param
+        element.setAttribute(attribute, attributeValue)
+      }
+    }
   }
 
   global.GOVUK = GOVUK

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

@@ -8,6 +8,25 @@ var analyticsInit = function () {
     var linkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
   }
 
+  window.GOVUK.Analytics.checkDigitalIdentityConsent = function (location) {
+    if (!location || !location.search) return
+    // this checks for the presence of the Digital Identity cookie consent query parameter and updates our consent cookie accordingly
+    // This is so that users don't see multiple cookie banners when they move between the different account management pages, as some will be on GOV.UK and others will be on the DI domain.
+    var digitalIdentityConsent = /([?&]cookie_consent=)(accept|reject)/.exec(location.search)
+    if (digitalIdentityConsent) {
+      if (digitalIdentityConsent[2] === 'accept') {
+        window.GOVUK.setConsentCookie({ usage: true })
+        // set cookies_preferences_set to true to prevent cookie banner showing
+        window.GOVUK.cookie('cookies_preferences_set', 'true')
+      } else if (digitalIdentityConsent[2] === 'reject') {
+        window.GOVUK.setConsentCookie({ usage: false })
+        window.GOVUK.cookie('cookies_preferences_set', 'true')
+      }
+    }
+  }
+
+  window.GOVUK.Analytics.checkDigitalIdentityConsent(window.location)
+
   var consentCookie = window.GOVUK.getConsentCookie()
   var dummyAnalytics = {
     addLinkedTrackerDomain: function () {},

data/app/assets/javascripts/govuk_publishing_components/analytics/scroll-tracker.js

@@ -15,7 +15,6 @@
 
   var CONFIG = {
     '/brexit': percentages,
-    '/guidance/coronavirus-covid-19-information-for-the-public': percentages,
     '/government/publications/the-essential-trustee-what-you-need-to-know-cc3/the-essential-trustee-what-you-need-to-know-what-you-need-to-do': [
       ['Heading', '1. About this guidance'],
       ['Heading', '2. Trustees’ duties at a glance'],
@@ -59,13 +58,6 @@
     '/guidance/foreign-travel-insurance': [
       ['Heading', 'What your travel insurance policy should cover']
     ],
-    '/guidance/social-security-contributions-for-uk-and-eu-workers-if-the-uk-leaves-the-eu-with-no-deal': [
-      ['Heading', 'UK employers'],
-      ['Heading', 'UK employees and self-employed']
-    ],
-    '/guidance/student-finance-arrangements-in-a-no-deal-scenario': [
-      ['Heading', 'Other overseas study placements']
-    ],
     '/guidance/living-in-france': [
       ['Heading', 'Passports and travel']
     ],
@@ -75,12 +67,6 @@
     '/guidance/healthcare-for-eu-and-efta-citizens-visiting-the-uk': [
       ['Heading', 'Travel insurance']
     ],
-    '/guidance/driving-in-the-eu-after-brexit': [
-      ['Heading', 'GB stickers and number plates']
-    ],
-    '/guidance/driving-in-the-eu-after-brexit#insurance-for-your-vehicle-caravan-or-trailer': [
-      ['Heading', 'Trailer registration']
-    ],
     '/driving-abroad': [
       ['Heading', 'Check your insurance if you’re taking your own vehicle']
     ],
@@ -90,64 +76,21 @@
     '/driving-abroad/international-driving-permit': [
       ['Heading', 'Check which IDP you need']
     ],
-    '/guidance/driving-in-the-eu-after-brexit#gb-stickers-and-number-plates': [
-      ['Heading', 'GB stickers and number plates']
-    ],
     '/guidance/guidance-for-suppliers-of-cattle-sheep-and-goat-ear-tags': [
       ['Heading', 'Tagging information for livestock keepers']
     ],
-    '/guidance/wine-trade-regulations': [
-      ['Heading', 'Rules for transporting wine into the UK']
-    ],
-    '/guidance/the-chemicals-sector-and-preparing-for-eu-exit': [
-      ['Heading', 'Energy and climate']
-    ],
     '/guidance/how-to-move-goods-between-or-through-common-transit-countries-including-the-eu': [
       ['Heading', 'Start moving your goods']
     ],
     '/guidance/ecmt-international-road-haulage-permits': [
       ['Heading', 'Apply for permits']
     ],
-    '/guidance/prepare-to-drive-in-the-eu-after-brexit-lorry-and-goods-vehicle-drivers': [
-      ['Heading', 'Driver CPC for lorry drivers']
-    ],
-    '/guidance/run-international-bus-or-coach-services-after-brexit': [
-      ['Heading', 'Run regular international services']
-    ],
-    '/guidance/vehicle-type-approval-if-theres-no-brexit-deal': [
-      ['Heading', 'Existing vehicle and component type-approvals']
-    ],
-    '/guidance/the-retail-sector-and-preparing-for-eu-exit': [
-      ['Heading', 'Importing and exporting']
-    ],
-    '/guidance/the-consumer-goods-sector-and-preparing-for-eu-exit': [
-      ['Heading', 'Importing and exporting']
-    ],
-    '/government/publications/banking-insurance-and-other-financial-services-if-theres-no-brexit-deal/banking-insurance-and-other-financial-services-if-theres-no-brexit-deal-information-for-financial-services-institutions': [
-      ['Heading', '3. Action taken by the UK']
-    ],
-    '/government/publications/further-guidance-note-on-the-regulation-of-medicines-medical-devices-and-clinical-trials-if-theres-no-brexit-deal/further-guidance-note-on-the-regulation-of-medicines-medical-devices-and-clinical-trials-if-theres-no-brexit-deal': [
-      ['Heading', '1.4 Orphan medicines']
-    ],
-    '/guidance/check-temporary-rates-of-customs-duty-on-imports-after-eu-exit': [
-      ['Heading', 'Tariff-rate quotas (TRQ)']
-    ],
-    '/guidance/construction-products-regulation-if-there-is-no-brexit-deal': [
-      ['Heading', 'UK manufacturers exporting to the EU']
-    ],
-    '/guidance/european-and-domestic-funding-after-brexit': [
-      ['Heading', 'What you need to do']
-    ],
-    '/guidance/guidance-on-substantial-amendments-to-a-clinical-trial-if-the-uk-leaves-the-eu-with-no-deal': [
-      ['Heading', 'Investigational medicinal product (IMP) certification and importation']
-    ],
     '/taking-goods-out-uk-temporarily/get-an-ata-carnet': [
       ['Heading', 'Using an ATA Carnet']
     ],
     '/wood-packaging-import-export': [
       ['Heading', 'Export solid wood packaging']
     ],
-    '/guidance/answers-to-the-most-common-topics-asked-about-by-the-public-for-the-coronavirus-press-conference': percentages,
     '/coronavirus': percentages,
     '/coronavirus/education-and-childcare': percentages,
     '/coronavirus/worker-support': percentages,
@@ -164,21 +107,6 @@
     '/guidance/brexit-guidance-for-individuals-and-families': percentages,
     '/guidance/brexit-guidance-for-individuals-and-families.cy': percentages,
     '/guidance/import-and-export-goods-using-preference-agreements': percentages,
-    '/guidance/red-amber-and-green-list-rules-for-entering-england': [
-      ['Heading', 'Stay up-to-date'],
-      ['Heading', 'Red list of countries and territories'],
-      ['Heading', 'Amber list of countries and territories'],
-      ['Heading', 'Amber list rules if you are fully UK vaccinated'],
-      ['Heading', 'Amber list rules if you are not fully UK vaccinated'],
-      ['Heading', 'Green list countries and territories'],
-      ['Heading', 'Green list rules'],
-      ['Heading', 'Ireland, the UK, the Channel Islands and the Isle of Man'],
-      ['Heading', 'Transit stops in amber or red list countries'],
-      ['Heading', 'Job and medical exemptions'],
-      ['Heading', 'Travelling abroad from England'],
-      ['Heading', 'Demonstrating your COVID-19 vaccination status when travelling abroad'],
-      ['Heading', 'Foreign, Commonwealth & Development Office travel advice']
-    ],
     '/guidance/travel-abroad-from-england-during-coronavirus-covid-19': [
       ['Heading', 'Before you travel abroad'],
       ['Heading', '1. Check the rules for the country you’re going to'],

data/app/assets/javascripts/govuk_publishing_components/lib/primary-links.js

@@ -2,15 +2,14 @@
 ;(function (global) {
   'use strict'
 
-  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
 
   // Only show the first {n} items in a list, documentation is in the README.md
   var PrimaryList = function (el, selector) {
-    this.$el = $(el)
-    this.$extraLinks = this.$el.find('li:not(' + selector + ')')
+    this.el = el
+    this.extraLinks = this.el.querySelectorAll('li:not(' + selector + ')')
     // only hide more than one extra link
-    if (this.$extraLinks.length > 1) {
+    if (this.extraLinks.length > 1) {
       this.addToggleLink()
       this.hideExtraLinks()
     }
@@ -18,29 +17,35 @@
 
   PrimaryList.prototype = {
     toggleText: function () {
-      if (this.$extraLinks.length > 1) {
-        return '+' + this.$extraLinks.length + ' others'
+      if (this.extraLinks.length > 1) {
+        return '+' + this.extraLinks.length + ' others'
       } else {
-        return '+' + this.$extraLinks.length + ' other'
+        return '+' + this.extraLinks.length + ' other'
       }
     },
     addToggleLink: function () {
-      this.$toggleLink = $('<a href="#">' + this.toggleText() + '</a>')
-      this.$toggleLink.click($.proxy(this.toggleLinks, this))
-      this.$toggleLink.insertAfter(this.$el)
+      this.toggleLink = document.createElement('a')
+      this.toggleLink.href = '#'
+      this.toggleLink.setAttribute('aria-expanded', 'false')
+      this.toggleLink.innerText = this.toggleText()
+
+      this.el.parentNode.insertBefore(this.toggleLink, this.el.nextSibling)
+      this.toggleLink.addEventListener('click', this.toggleLinks.bind(this))
     },
     toggleLinks: function (e) {
       e.preventDefault()
-      this.$toggleLink.remove()
+      this.toggleLink.remove()
       this.showExtraLinks()
     },
     hideExtraLinks: function () {
-      this.$extraLinks.addClass('visuallyhidden')
-      $(window).trigger('govuk.pageSizeChanged')
+      for (var i = 0; i < this.extraLinks.length; i++) {
+        this.extraLinks[i].className = 'primary-links--display-none'
+      }
     },
     showExtraLinks: function () {
-      this.$extraLinks.removeClass('visuallyhidden')
-      $(window).trigger('govuk.pageSizeChanged')
+      for (var i = 0; i < this.extraLinks.length; i++) {
+        this.extraLinks[i].className = ''
+      }
     }
   }
 
@@ -48,7 +53,18 @@
 
   GOVUK.primaryLinks = {
     init: function (selector) {
-      $(selector).parent().each(function (i, el) {
+      var allListItems = document.querySelectorAll(selector)
+      var AllLists = []
+
+      for (var i = 0; i < allListItems.length; i++) {
+        var parent = allListItems[i].parentNode
+
+        if (AllLists.indexOf(parent) < 0) {
+          AllLists.push(parent)
+        }
+      }
+
+      AllLists.forEach(function (el, i) {
         new GOVUK.PrimaryList(el, selector) // eslint-disable-line no-new
       })
     }

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -94,13 +94,19 @@
 
 .gem-c-action-link--blue-arrow {
   &:before {
-    width: 35px;
-    height: 30px;
+    width: 36px;
+    height: 28px;
     background: image-url("govuk_publishing_components/action-link-arrow--blue.png");
     background: image-url("govuk_publishing_components/action-link-arrow--blue.svg"), linear-gradient(transparent, transparent);
     background-repeat: no-repeat;
-    background-size: 25px auto;
-    background-position: 0 2px;
+    background-size: 28px auto;
+    background-position: 0 0;
+
+    @include govuk-media-query($from: tablet) {
+      width: 45px;
+      height: 35px;
+      background-size: 35px auto;
+    }
   }
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_big-number.scss

@@ -38,4 +38,12 @@
       @include govuk-link-hover-decoration;
     }
   }
+
+  &:focus,
+  &:focus:hover {
+    .gem-c-big-number__label,
+    .gem-c-big-number__value--decorated {
+      text-decoration: none;
+    }
+  }
 }

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

@@ -1,8 +1,18 @@
 @import "govuk/components/input/input";
+$search-icon-size: 40px;
 
-.gem-c-input--search-icon {
-  background: govuk-colour("white") url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='currentColor'%3E%3C/path%3E%3C/svg%3E") no-repeat -5px -3px;
-  padding-left: govuk-spacing(6);
+.gem-c-input__search-icon {
+  display: block;
+  position: relative;
+  margin-bottom: -$search-icon-size;
+  z-index: 1;
+  width: $search-icon-size;
+  height: $search-icon-size;
+  @if $govuk-typography-use-rem {
+    margin-bottom: -(govuk-px-to-rem($search-icon-size));
+    height: govuk-px-to-rem($search-icon-size);
+  }
+  background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='currentColor'%3E%3C/path%3E%3C/svg%3E") no-repeat -3px center;
 }
 
 // this overrides styles from static that break the look of the component
@@ -14,7 +24,7 @@
   padding: govuk-spacing(1);
   box-sizing: border-box;
 
-  &.gem-c-input--search-icon {
+  &.gem-c-input--with-search-icon {
     padding-left: govuk-spacing(6);
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -108,3 +108,11 @@
     @include govuk-link-style-inverse;
   }
 }
+
+// This helper class is for use by the primary links js module
+// We have this custom helper here with a single rule over using the design system helper class govuk-!-display-none
+// because jasmine tests don't like the "!" in the distributed helper class
+
+.primary-links--display-none {
+  display: none;
+}

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -31,9 +31,14 @@ module GovukPublishingComponents
 
       gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
       gem_path = Dir.pwd if ENV["MAIN_COMPONENT_GUIDE"]
+      host_dir = File.expand_path("..")
+      path = File.expand_path("..", gem_path)
+
+      @in_application = false
+      @in_application = true unless path.to_s == host_dir.to_s
 
       components = AuditComponents.new(gem_path, false)
-      applications = analyse_applications(File.expand_path("..", gem_path), application_dirs)
+      applications = analyse_applications(host_dir, application_dirs)
       compared_data = AuditComparer.new(components.data, applications, false)
 
       @applications = compared_data.applications_data || []
@@ -44,15 +49,18 @@ module GovukPublishingComponents
 
     def analyse_applications(path, application_dirs)
       results = []
-      @applications_found = false
+      applications_found = 0
 
       application_dirs.each do |application|
         application_path = [path, application].join("/")
         app = AuditApplications.new(application_path, application)
-        @applications_found = true if app.data[:application_found]
+        applications_found += 1 if app.data[:application_found]
         results << app.data
       end
 
+      @other_applications = false
+      @other_applications = true if applications_found > 1
+
       results
     end
   end

data/app/views/govuk_publishing_components/audit/_components.html.erb

@@ -1,4 +1,4 @@
-<% if @applications_found %>
+<% if @other_applications %>
   <%= render "govuk_publishing_components/components/heading", {
     text: "Components",
     font_size: "l",
@@ -101,7 +101,7 @@
     }
   %>
 
-  <% if @applications_found %>
+  <% if @other_applications %>
     <% components_by_application = capture do %>
       <% if @components[:components_by_application].any? %>
         <dl class="govuk-summary-list">

data/app/views/govuk_publishing_components/audit/show.html.erb

@@ -10,7 +10,7 @@
   <%= render "components" %>
 <% end %>
 
-<% if @applications_found %>
+<% if @in_application or @other_applications %>
   <%= render "govuk_publishing_components/components/tabs", {
     tabs: [
       {

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

@@ -4,6 +4,7 @@
   label ||= nil
   href ||= nil
   data_attributes ||= nil
+  aria ||= nil
   classes = ["gem-c-big-number__value"]
   
   if label.nil? && href
@@ -25,7 +26,7 @@
     <% end %>
   <% end %>
   
-  <%= tag.div class: "gem-c-big-number" do %>
+  <%= tag.div class: "gem-c-big-number", aria: aria do %>
     <% unless href.nil? %>
       <%= link_to big_number_value, href, class: "govuk-link gem-c-big-number__link", data: data_attributes %>
     <% else %>

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

@@ -2,7 +2,7 @@
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   devolved_nations_helper = GovukPublishingComponents::Presenters::DevolvedNationsHelper.new(local_assigns)
 
-  applies_to ||= t('components.devolved_nations.applies_to')
+  applies_to ||= t("components.devolved_nations.applies_to")
   heading_level ||= 2
 %>
 
@@ -15,7 +15,7 @@
     <% if devolved_nations_helper.nations_with_urls.any? %>
       <%= content_tag :ul, class: "govuk-list govuk-!-margin-top-1 govuk-!-margin-bottom-0" do -%>
         <% devolved_nations_helper.nations_with_urls.each do |k, v| %>
-          <%= content_tag(:li, link_to("Guidance for #{t("components.devolved_nations.#{k}")}", v[:alternative_url], class: "govuk-link")) %>
+          <%= content_tag(:li, link_to(devolved_nations_helper.alternative_content_text(k), v[:alternative_url], class: "govuk-link")) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -31,7 +31,7 @@
   css_classes = %w(gem-c-input govuk-input)
   css_classes << "govuk-input--error" if has_error
   css_classes << "govuk-input--width-#{width}" if [2, 3, 4, 5, 10, 20, 30].include?(width)
-  css_classes << "gem-c-input--search-icon" if search_icon
+  css_classes << "gem-c-input--with-search-icon" if search_icon
   form_group_css_classes = %w(govuk-form-group)
   form_group_css_classes << "govuk-form-group--error" if has_error && !grouped
 
@@ -120,6 +120,7 @@
       <%= input_tag %><%= tag.span suffix, class: "govuk-input__suffix", aria: { hidden: true } %>
     <% end %>
   <% else %>
+    <%= tag.span class: "gem-c-input__search-icon" if search_icon %>
     <%= input_tag %>
   <% end %>
 <% end %>

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

@@ -6,10 +6,15 @@
   list_type ||= "unordered"
   visible_counters ||= nil
 
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
   classes = %w[gem-c-list govuk-list]
-  classes << "govuk-list--bullet" if visible_counters && list_type === "unordered"
-  classes << "govuk-list--number" if visible_counters && list_type === "number"
+  classes << "govuk-list--bullet" if visible_counters and list_type === "unordered"
+  classes << "govuk-list--number" if visible_counters and list_type === "number"
   classes << "govuk-list--spaced" if extra_spacing
+  # Setting the  `margin_bottom` to 4 is the same as the default margin - so we
+  # can omit the override class. To do this we leave out `4` from the array:
+  classes << (shared_helper.get_margin_bottom) if [0,1,2,3,5,6,7,8,9].include?(local_assigns[:margin_bottom])
 
   # Default list type is unordered list.
   list_tag = "ul"

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

@@ -54,3 +54,10 @@ examples:
       label: Ministerial departments
       data_attributes:
         department-count: true
+  with_aria_attributes:
+    description: Aria attributes are applied to the whole component instance
+    data:
+      number: 23
+      label: Ministerial departments
+      aria:
+        hidden: true

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

@@ -1,18 +1,18 @@
 name: Devolved Nations (experimental)
-description: A banner for linking to guidance for other nations.
+description: A banner for linking to alternative content for other nations.
 body: |
-  The component replaces uses of the important metadata component for guidance for other nations.
+  The component replaces uses of the important metadata component for alternative content for other nations.
 
   The component can display:
 
-  * nations that the guidance relates to
+  * nations that the alternative content relates to
   * a list of alternative URLs where applicable
 shared_accessibility_criteria:
   - link
 accessibility_criteria: |
   The component must:
 
-  - Provide context for link text to highlight guidance is available.
+  - Provide context for link text to highlight alternative content is available.
 examples:
   default:
     data:
@@ -35,18 +35,22 @@ examples:
           applicable: true
         wales:
           applicable: true
-  applies_to_one_nation_individual_guidance_available:
+  applies_to_one_nation_individual_publication_available:
+    description: If no content type, or an invalid type, is specified then the default alternative content type is displayed as "Publication" e.g. "Publication for Northern Ireland"
     data:
       national_applicability:
         england:
           applicable: true
+        northern_ireland:
+          applicable: false
+          alternative_url: /
         scotland:
           applicable: false
           alternative_url: /
         wales:
           applicable: false
           alternative_url: /
-  applies_to_one_nation_individual_guidance_available:
+  applies_to_three_nations_individual_publication_available:
     data:
       national_applicability:
         england:
@@ -55,12 +59,21 @@ examples:
           applicable: false
           alternative_url: /
         scotland:
-          applicable: false
-          alternative_url: /
+          applicable: true
         wales:
+          applicable: true
+  applies_to_one_nation_individual_consultation_available:
+    description: Specify alternative type for the content e.g. Consultation
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        northern_ireland:
           applicable: false
           alternative_url: /
-  applies_to_three_nations_individual_guidance_available:
+      type: consultation
+  applies_to_one_nation_individual_guidance_available:
+    description: Specify alternative type for the content e.g. Guidance
     data:
       national_applicability:
         england:
@@ -68,12 +81,9 @@ examples:
         northern_ireland:
           applicable: false
           alternative_url: /
-        scotland:
-          applicable: true
-        wales:
-          applicable: true
+      type: detailed_guide
   specific_heading level:
-    description: Use a different heading level for the main link title. Defaults to H2 if not passed.
+    description: Use a different heading level for the main link title. Defaults to `H2` if not passed.
     data:
       heading_level: 3
       national_applicability:

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

@@ -439,16 +439,16 @@ examples:
   statistic_headlines:
     data:
       block: |
-        <aside class="stat-headline">
+        <div class="stat-headline">
           <p><em>£6bn</em>
           Total Departmental Expenditure Limit (<abbr title="Departmental Expenditure Limit">DEL</abbr>) in financial year 2015 to 2016</p>
-        </aside>
+        </div>
         <p>This includes £5.8 billion Resource <abbr title="Departmental Expenditure Limit">DEL</abbr> and £0.2 billion Capital <abbr title="Departmental Expenditure Limit">DEL</abbr>. In addition, <abbr title="Department for Work and Pensions">DWP</abbr> Annually Managed Expenditure (<abbr title="Annually Managed Expenditure">AME</abbr>) in financial year 2015 to 2016 is £170.5 billion, as forecast by the Office for Budget Responsibility.</p>
-        <aside class="stat-headline">
+        <div class="stat-headline">
           <p>UK employment rate
           <em>74.1%</em>
           between October and December 2015</p>
-        </aside>
+        </div>
   specialist_content:
     data:
       block: |

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

@@ -62,3 +62,11 @@ examples:
     data:
       id: 'super-fantastic-chocolate-list'
       <<: *default-example-data
+  with_margin:
+    description: |
+      Sets the margin on the bottom of the list element.
+
+      The component accepts a number for margin bottom from 0 to 9 (0px to 60px) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to having a 20px margin.
+    data:
+      margin_bottom: 9
+      <<: *default-example-data

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

@@ -11,7 +11,7 @@ accessibility_criteria: |
   - be focusable with a keyboard
   - be usable with a keyboard
   - indicate when they have focus
-  - change in appearance when touched (in the touch-down state)
+  - change in appearance when active (in the active state)
   - be usable with touch
   - have label with a touch area similar to the input
   - be usable with [voice commands](https://www.w3.org/WAI/perspectives/voice.html)
@@ -53,7 +53,7 @@ examples:
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
   with_bold:
-    description: 'Used to provide better contrast between long labels and hint text, Note that the `:or` option [is documented as a string due to a bug](https://github.com/alphagov/govuk_publishing_components/issues/102)'
+    description: Used to provide better contrast between long labels and hint text, Note that the `:or` option [is documented as a string due to a bug](https://github.com/alphagov/govuk_publishing_components/issues/102)
     data:
       name: "radio-group-bold"
       items:
@@ -66,7 +66,7 @@ examples:
         hint_text: "You'll have an account if you've already proved your identity with a certified company, such as the Post Office."
         bold: true
   with_bottom_margin:
-    description: "The component accepts a number for margin bottom from 0 to 9 (0px to 60px) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to a margin bottom of 30px (6)."
+    description: The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to a margin bottom of `30px` (`6`).
     data:
       name: "radio-group"
       margin_bottom: 9
@@ -85,16 +85,50 @@ examples:
         text: "Use Government Gateway"
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
-  with_heading:
-    description: This adds a legend element containing the text supplied.
+  with_legend:
+    description: |
+      Legend text is automatically wrapped inside a `h2`. To render the text without it, `heading_level` must be set to `0`.
     data:
-      name: "radio-group-heading"
-      heading: "Are you hungry?"
+      name: "radio-group-legend"
+      heading: "What's it to do with?"
+      heading_level: 0
       items:
       - value: "yes"
         text: "Yes"
       - value: "no"
         text: "No"
+  with_heading:
+    description: |
+      By default, text supplied for the `legend` is wrapped inside a `h2`. 
+      
+      The font size of this heading can be changed using the `heading_size` option. Valid options are `s`, `m`, `l`, `xl`, defaulting to `m` if no option is passed.
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      heading_size: "s"
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
+  with_different_heading_level:
+    description: |
+      By default, text supplied for the `legend` is wrapped inside a `h2`. This can be changed using the `heading_level` option.
+        
+      If `heading_level` is `1` and `heading_size` is not set, the text size will be `xl`.
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      heading_level: 1
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
   with_heading_and_hint:
     data:
       name: "radio-group-heading"
@@ -109,9 +143,9 @@ examples:
         text: "Blue"
   with_page_header_and_caption:
     description: |
-      If a caption text is provided with a page heading, it will be displayed above the heading.
-      A caption can only be used with a page heading. If a heading is not provided the caption will not render.
-      The pattern is used across GOV.UK to show a high-level section that this page question falls into.
+      A caption can be added using the `heading_caption` option. Captions will only be displayed if text for the heading option is present.
+      
+      The pattern is used across GOV.UK to show a high-level section that this page belongs to.
     data:
       name: "radio-group-heading"
       heading: "Is it snowing?"
@@ -181,35 +215,6 @@ examples:
         text: "Green"
       - value: "blue"
         text: "Blue"
-  with_custom_heading_size:
-    description: |
-      This allows the size of the legend to be changed. Valid options are s, m, l, xl, defaulting to m if no option is passed.
-
-      If heading_level is 1 and heading_size is not set, the text size will be xl.
-    data:
-      name: "radio-group-description"
-      heading: "What is your favourite colour?"
-      heading_size: "s"
-      items:
-      - value: "red"
-        text: "Red"
-      - value: "green"
-        text: "Green"
-      - value: "blue"
-        text: "Blue"
-  with_custom_heading_level:
-    description: This allows the heading level to be changed. Heading level will default to `h2` if nothing is passed.
-    data:
-      name: "radio-group-description"
-      heading: "What is your favourite colour?"
-      heading_level: 3
-      items:
-      - value: "red"
-        text: "Red"
-      - value: "green"
-        text: "Green"
-      - value: "blue"
-        text: "Blue"
   with_hint_text_on_radios:
     data:
       name: "radio-group-hint-text"
@@ -248,7 +253,7 @@ examples:
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
   with_or_divider:
-    description: "See [related service manual gudiance for this pattern](https://www.gov.uk/service-manual/design/writing-for-user-interfaces#ask-questions-that-users-can-understand)"
+    description: "See [related service manual guidance for this pattern](https://www.gov.uk/service-manual/design/writing-for-user-interfaces#ask-questions-that-users-can-understand)"
     data:
       name: "radio-group-or-divider"
       items:

data/app/views/govuk_publishing_components/components/layout_for_public/_account-navigation.html.erb

@@ -16,6 +16,7 @@
         GovukPersonalisation::Urls.manage,
         class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
         'aria-current': page_is == "manage" ? "page" : nil,
+        data: { module: "explicit-cross-domain-links" },
       ) %>
     </li>
     <li class="gem-c-layout-for-public-account-menu__item <%= "gem-c-layout-for-public-account-menu__item--current" if page_is == "security" %>">
@@ -24,6 +25,7 @@
         GovukPersonalisation::Urls.security,
         class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
         'aria-current': page_is == "security" ? "page" : nil,
+        data: { module: "explicit-cross-domain-links" },
       ) %>
     </li>
   </ul>

data/config/locales/en.yml

@@ -51,6 +51,11 @@ en:
       connectors:
         last_word: " and "
         two_words: " and "
+      type:
+        consultation: Consultation for %{nation}
+        detailed_guide: Guidance for %{nation} 
+        guidance: Guidance for %{nation}
+        publication: Publication for %{nation}
       england: England
       northern_ireland: Northern Ireland
       scotland: Scotland

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -4,18 +4,12 @@ module GovukPublishingComponents
       # keys are labels, values are the content_ids for the matching taxons
       # Where multiple matching taxons are present, the top most one is the highest priority
       #   and the bottom one the lowest priority
-      BREXIT_TAXONS = {
+      PRIORITY_TAXONS = {
         brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
         brexit_individuals: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
         brexit_taxon: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
       }.freeze
 
-      PRIORITY_TAXONS = {
-        education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
-        worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
-        business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
-      }.merge(BREXIT_TAXONS).freeze
-
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
       def self.call(content_item, query_parameters = nil)
         new(content_item, query_parameters).breadcrumbs
@@ -37,9 +31,9 @@ module GovukPublishingComponents
 
       def priority_brexit_taxon
         if tagged_to_both_brexit_child_taxons?
-          priority_brexit_taxons.find { |t| t["content_id"] == BREXIT_TAXONS[:brexit_taxon] }
+          priority_taxons.find { |t| t["content_id"] == PRIORITY_TAXONS[:brexit_taxon] }
         else
-          priority_brexit_taxons.min_by { |t| BREXIT_TAXONS.values.index(t["content_id"]) }
+          priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
         end
       end
 
@@ -83,10 +77,6 @@ module GovukPublishingComponents
         end
       end
 
-      def priority_brexit_taxons
-        priority_taxons.select { |t| priority_brexit_taxon?(t) }
-      end
-
       def taxon_tree(taxons)
         return [] if taxons.blank?
 
@@ -97,10 +87,6 @@ module GovukPublishingComponents
         PRIORITY_TAXONS.values.include?(taxon["content_id"])
       end
 
-      def priority_brexit_taxon?(taxon)
-        BREXIT_TAXONS.values.include?(taxon["content_id"])
-      end
-
       def brexit_child_taxon?(taxon)
         brexit_child_taxons.include?(taxon["content_id"])
       end

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb

@@ -1,10 +1,11 @@
 module GovukPublishingComponents
   module Presenters
     class DevolvedNationsHelper
-      attr_reader :national_applicability
+      attr_reader :national_applicability, :type
 
       def initialize(local_assigns)
         @national_applicability = local_assigns[:national_applicability]
+        @type = local_assigns[:type] || "publication"
       end
 
       def applicable_nations_title_text
@@ -25,6 +26,16 @@ module GovukPublishingComponents
             .present?
           end
       end
+
+      def alternative_content_text(name)
+        nation = I18n.t("components.devolved_nations.#{name}")
+
+        if I18n.exists?("components.devolved_nations.type.#{@type}")
+          I18n.t("components.devolved_nations.type.#{@type}", nation: nation)
+        else
+          I18n.t("components.devolved_nations.type.publication", nation: nation)
+        end
+      end
     end
   end
 end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.4.0".freeze
+  VERSION = "27.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 27.4.0
+  version: 27.8.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: jasmine_selenium_runner
   requirement: !ruby/object:Gem::Requirement