govuk_publishing_components 26.0.0 → 27.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c3fd9e474526fc795f4e36972c920118b87ea55a36296a4b5ed63e5e6fdc116
-  data.tar.gz: 84373dc03aa19d36852a9d7766924a42c2a1e97704f23f0829b1723d1bf46e33
+  metadata.gz: 57832f873fbcb6c9c245858ca1626b8fe4548ee312a96597e0e2ef06ce776ddd
+  data.tar.gz: ca662dd2ac3a84e232942628613a5e2f36aeab7a5b6b21f4227d727d514ab0ed
 SHA512:
-  metadata.gz: e997a780198073f264b340747df742bf7b9540e2f8106f9f29afb16028ea95533a22d4bf1403aa2b027785a9298585ac7700865ede41d7ab42dd1c00c6fcee70
-  data.tar.gz: 1d38aaaff509242556aebea94b66fe42001345f93f15513ee42c27f1f71d105e8a2f49e7b2e110f1ca317f5ffbf769e4cc4bc3fb00113a9ca88a00eb1fb28cad
+  metadata.gz: 73096c4cec16fc95e026911ae54503935ca718b7f0935892412c299f1ed1f5ae7b78db6e555c0256a326126db75673a4027a62840d584bdf185c67bf3c13fda9
+  data.tar.gz: b482b8fa029539c6c7bc1f196165f75c1d48d8891188cd2fff978b7fdee96cff9a8c74b74736acaa1092caba2a1469b0bbb05743e7dbce567eff433f42fddc60

data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss

@@ -27,6 +27,7 @@ $govuk-new-link-styles: true;
 @import "components/copy-to-clipboard";
 @import "components/date-input";
 @import "components/details";
+@import "components/devolved-nations";
 @import "components/document-list";
 @import "components/error-alert";
 @import "components/error-message";

data/app/assets/stylesheets/govuk_publishing_components/components/_devolved-nations.scss

@@ -0,0 +1,10 @@
+.gem-c-devolved-nations {
+  background: govuk-colour("light-grey");
+  margin-bottom: govuk-spacing(3);
+  padding: govuk-spacing(3);
+
+  @include govuk-media-query($from: desktop) {
+    margin-bottom: govuk-spacing(8);
+    padding: govuk-spacing(4) govuk-spacing(6);
+  }
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -107,6 +107,8 @@
 
 .gem-c-document-list__children {
   margin-bottom: 0;
+  padding-left: 0;
+  list-style-type: none;
 
   @include govuk-media-query($from: desktop) {
     margin-left: govuk-spacing(4);

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss

@@ -9,6 +9,7 @@
 
 .js-enabled .gem-c-layout-for-public__global-banner-wrapper {
   margin-top: - govuk-spacing(2);
+  min-height: govuk-spacing(2);
   position: relative;
 }
 

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

@@ -17,6 +17,7 @@
     clear: both;
     overflow: hidden;
     padding: govuk-spacing(2) 0 0;
+    margin: 0;
 
     img {
       display: inline;

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

@@ -0,0 +1,23 @@
+<%
+  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')
+  heading_level ||= 2
+%>
+
+<% if national_applicability.any? { |k,v| v[:applicable] == true } %>
+  <%= tag.section class: "gem-c-devolved-nations" do %>
+    <%= content_tag(shared_helper.get_heading_level, class: "govuk-heading-s govuk-!-margin-bottom-0") do %>
+      <%= applies_to %> <%= devolved_nations_helper.applicable_nations_title_text %>
+    <% end %>
+
+    <% 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")) %>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -92,7 +92,7 @@
         <% end %>
 
         <% if item[:parts] && item[:parts].any? %>
-          <ul class="gem-c-document-list__children govuk-list">
+          <ul class="gem-c-document-list__children">
             <% item[:parts].each do |part| %>
               <li class="gem-c-document-list-child">
                 <%=

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

@@ -23,7 +23,7 @@
   extra_link_classes << brand_helper.color_class
 
 %>
-<% if card_helper.href || card_helper.extra_links.any? %>
+<% if card_helper.href || card_helper.extra_details.any? %>
   <div class="<%= classes %> <%= brand_helper.brand_class %>"
     <%= "data-module=gem-track-click" if card_helper.is_tracking? %>
     <%= "lang=#{card_helper.lang}" if card_helper.lang %>>
@@ -44,9 +44,9 @@
         <%= card_helper.context %>
       </div>
       <%= card_helper.description %>
-      <% if card_helper.extra_links.any? %>
-        <ul class="gem-c-image-card__list <%= "gem-c-image-card__list--indented" if not card_helper.extra_links_no_indent %>">
-          <% card_helper.extra_links.each do |link| %>
+      <% if card_helper.extra_details.any? %>
+        <ul class="gem-c-image-card__list <%= "gem-c-image-card__list--indented" if not card_helper.extra_details_no_indent %>">
+          <% card_helper.extra_details.each do |link| %>
             <li class="gem-c-image-card__list-item <%= "gem-c-image-card__list-item--text" if not link[:href].present? %>">
               <% if link[:href].present? %>
                 <%= link_to link[:text], link[:href],

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

@@ -0,0 +1,81 @@
+name: Devolved Nations (experimental)
+description: A banner for linking to guidance for other nations.
+body: |
+  The component replaces uses of the important metadata component for guidance for other nations.
+
+  The component can display:
+
+  * nations that the guidance 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.
+examples:
+  default:
+    data:
+      national_applicability:
+        england:
+          applicable: true
+  applies_to_two_nations:  
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        wales:
+          applicable: true
+  applies_to_three_nations:  
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        scotland:
+          applicable: true
+        wales:
+          applicable: true
+  applies_to_one_nation_individual_guidance_available:
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        scotland:
+          applicable: false
+          alternative_url: /
+        wales:
+          applicable: false
+          alternative_url: /
+  applies_to_one_nation_individual_guidance_available:
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        northern_ireland:
+          applicable: false
+          alternative_url: /
+        scotland:
+          applicable: false
+          alternative_url: /
+        wales:
+          applicable: false
+          alternative_url: /
+  applies_to_three_nations_individual_guidance_available:
+    data:
+      national_applicability:
+        england:
+          applicable: true
+        northern_ireland:
+          applicable: false
+          alternative_url: /
+        scotland:
+          applicable: true
+        wales:
+          applicable: true
+  specific_heading level:
+    description: Use a different heading level for the main link title. Defaults to H2 if not passed.
+    data:
+      heading_level: 3
+      national_applicability:
+        england:
+          applicable: true

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

@@ -824,3 +824,14 @@ examples:
           <a role="button" class="gem-c-button govuk-button" href="https://gov.uk/random">Button</a>
           <a class="gem-c-button govuk-button govuk-button--start" role="button" href="https://gov.uk/random"> Start button <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" role="presentation" focusable="false"><path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z"></path></svg></a>
         </p>
+  image:
+    data:
+      block: |
+        <figure class="image embedded">
+          <div class="img">
+            <img src="https://assets.publishing.service.gov.uk/government/uploads/system/uploads/image_data/file/40160/Picture2.jpg" alt="Open water with only mangrove stumps showing above the water. Credit: Blue Ventures-Garth Cripps">
+          </div>
+          <figcaption>
+            <p>Deforested area. Credit: Blue Ventures-Garth Cripps</p>
+          </figcaption>
+        </figure>

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

@@ -66,14 +66,14 @@ examples:
         text: "Press release"
       heading_text: "Government does things"
       description: "Following a thorough review of existing procedure, a government body has today announced that further work is necessary."
-  with_extra_links:
+  with_extra_details:
     data:
       href: "/a-page-no-just-kidding"
       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: "Some more links"
       description: "Greater transparency across government is at the heart of our commitment to let you hold politicians and public bodies to account."
-      extra_links: [
+      extra_details: [
         {
           text: "Single departmental plans",
           href: "/1"
@@ -87,7 +87,7 @@ examples:
           href: "/3"
         },
       ]
-  extra_links_without_indent:
+  extra_details_without_indent:
     description: Don't indent the extra links. Used for links to people pages.
     data:
       href: "/government/people/"
@@ -96,21 +96,21 @@ examples:
       context:
         text: "The Rt Hon"
       heading_text: "John Whiskers MP"
-      extra_links: [
+      extra_details: [
         {
           text: "Minister for Cats",
           href: "/government/ministers/"
         }
       ]
-      extra_links_no_indent: true
-  extra_links_with_no_links:
-    description: If `extra_links` are passed to the component without `href` attributes, they are displayed as a simple text list.
+      extra_details_no_indent: true
+  extra_details_with_no_links:
+    description: If `extra_details` are passed to the component without `href` attributes, they are displayed as a simple text list.
     data:
       href: "/government/people/"
       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: [
+      extra_details: [
         {
           text: "Conservative 2010 to 2016",
         },
@@ -118,14 +118,14 @@ examples:
           text: "Labour 2007 to 2010",
         }
       ]
-      extra_links_no_indent: true
-  extra_links_with_no_main_link:
+      extra_details_no_indent: true
+  extra_details_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: "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: [
+      extra_details: [
         {
           text: "Minister for Cats",
           href: "/government/ministers/"
@@ -145,7 +145,7 @@ examples:
       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"
       description: Here are some links to more information about the thing you are reading about.
-      extra_links: [
+      extra_details: [
         {
           text: "More information",
           href: "/1"
@@ -174,7 +174,7 @@ examples:
       image_alt: "some meaningful alt text please"
       heading_text: "Something relating to this"
       description: "Public reform committee consultation vote department interior minister referendum."
-      extra_links: [
+      extra_details: [
         {
           text: "Something",
           href: "/1"
@@ -210,7 +210,7 @@ examples:
       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: "A link with tracking"
-      extra_links: [
+      extra_details: [
         {
           text: "Another link with tracking",
           href: "/1",
@@ -235,13 +235,13 @@ examples:
         text: "The Rt Hon"
       heading_text: "John Whiskers MP"
       metadata: "Unpaid"
-      extra_links: [
+      extra_details: [
         {
           text: "Minister for Cats",
           href: "/government/ministers/"
         }
       ]
-      extra_links_no_indent: true
+      extra_details_no_indent: true
   with_lang:
     description: |
       Pass through an appropriate `lang` to set a HTML lang attribute for the component.

data/config/locales/en.yml

@@ -46,6 +46,12 @@ en:
       - We’d like to set additional cookies to understand how you use GOV.UK, remember your settings and improve government services.
       - We also use cookies set by other sites to help us deliver content from their services.
       title: Cookies on GOV.UK
+    devolved_nations:
+      applies_to: Applies to  
+      england: England
+      northern_ireland: Northern Ireland
+      scotland: Scotland
+      wales: Wales
     feedback:
       close: Close
       dont_include_personal_info: Don’t include personal or financial information like your National Insurance number or credit card details.

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb

@@ -0,0 +1,27 @@
+module GovukPublishingComponents
+  module Presenters
+    class DevolvedNationsHelper
+      attr_reader :national_applicability
+
+      def initialize(local_assigns)
+        @national_applicability = local_assigns[:national_applicability]
+      end
+
+      def applicable_nations_title_text
+        @national_applicability
+          .select { |_, v| v[:applicable] == true }
+          .map { |k, _| I18n.t("components.devolved_nations.#{k}") }
+          .sort
+          .to_sentence(last_word_connector: " and ")
+      end
+
+      def nations_with_urls
+        @national_applicability
+          .select do |_, v|
+            v[:alternative_url]
+            .present?
+          end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -4,12 +4,12 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :href, :href_data_attributes, :extra_links, :large, :extra_links_no_indent, :heading_text, :metadata, :lang, :image_loading
+      attr_reader :href, :href_data_attributes, :extra_details, :large, :extra_details_no_indent, :heading_text, :metadata, :lang, :image_loading
 
       def initialize(local_assigns)
         @href = local_assigns[:href]
         @href_data_attributes = local_assigns[:href_data_attributes]
-        @extra_links = local_assigns[:extra_links] || []
+        @extra_details = local_assigns[:extra_details] || []
         @image_src = local_assigns[:image_src]
         @image_alt = local_assigns[:image_alt] || ""
         @image_loading = local_assigns[:image_loading] || "auto"
@@ -17,7 +17,7 @@ module GovukPublishingComponents
         @description = local_assigns[:description]
         @large = local_assigns[:large]
         @heading_text = local_assigns[:heading_text]
-        @extra_links_no_indent = local_assigns[:extra_links_no_indent]
+        @extra_details_no_indent = local_assigns[:extra_details_no_indent]
         @metadata = local_assigns[:metadata]
         @lang = local_assigns[:lang]
       end
@@ -25,8 +25,8 @@ module GovukPublishingComponents
       def is_tracking?
         return true if @href_data_attributes
 
-        if @extra_links
-          @extra_links.each do |link|
+        if @extra_details
+          @extra_details.each do |link|
             return true if link[:data_attributes]
           end
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "26.0.0".freeze
+  VERSION = "27.0.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -11,6 +11,7 @@ require "govuk_publishing_components/presenters/breadcrumb_selector"
 require "govuk_publishing_components/presenters/brexit_cta_helper"
 require "govuk_publishing_components/presenters/button_helper"
 require "govuk_publishing_components/presenters/contextual_navigation"
+require "govuk_publishing_components/presenters/devolved_nations_helper"
 require "govuk_publishing_components/presenters/related_navigation_helper"
 require "govuk_publishing_components/presenters/step_by_step_nav_helper"
 require "govuk_publishing_components/presenters/page_with_step_by_step_navigation"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 26.0.0
+  version: 27.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -547,6 +547,7 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_copy-to-clipboard.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_details.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_devolved-nations.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_error-alert.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss
@@ -684,6 +685,7 @@ files:
 - app/views/govuk_publishing_components/components/_copy_to_clipboard.html.erb
 - app/views/govuk_publishing_components/components/_date_input.html.erb
 - app/views/govuk_publishing_components/components/_details.html.erb
+- app/views/govuk_publishing_components/components/_devolved_nations.html.erb
 - app/views/govuk_publishing_components/components/_document_list.html.erb
 - app/views/govuk_publishing_components/components/_error_alert.html.erb
 - app/views/govuk_publishing_components/components/_error_message.html.erb
@@ -765,6 +767,7 @@ files:
 - app/views/govuk_publishing_components/components/docs/copy_to_clipboard.yml
 - app/views/govuk_publishing_components/components/docs/date_input.yml
 - app/views/govuk_publishing_components/components/docs/details.yml
+- app/views/govuk_publishing_components/components/docs/devolved_nations.yml
 - app/views/govuk_publishing_components/components/docs/document_list.yml
 - app/views/govuk_publishing_components/components/docs/error_alert.yml
 - app/views/govuk_publishing_components/components/docs/error_message.yml
@@ -929,6 +932,7 @@ files:
 - lib/govuk_publishing_components/presenters/contents_list_helper.rb
 - lib/govuk_publishing_components/presenters/contextual_navigation.rb
 - lib/govuk_publishing_components/presenters/curated_taxonomy_sidebar_links.rb
+- lib/govuk_publishing_components/presenters/devolved_nations_helper.rb
 - lib/govuk_publishing_components/presenters/heading_helper.rb
 - lib/govuk_publishing_components/presenters/highlight_boxes_helper.rb
 - lib/govuk_publishing_components/presenters/image_card_helper.rb