govuk_publishing_components 21.60.0 → 21.62.0

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

@@ -0,0 +1,29 @@
+name: Public layout
+description: A layout to be used by public-facing applications
+body: |
+  Because it is an entire HTML document, this component can only be [previewed on a separate page](/public).
+
+display_preview: false
+display_html: true
+accessibility_criteria: |
+  The layout template must:
+
+    * have a `lang` attribute
+    * contain a [skip link](/component-guide/skip_link)
+    * have a sensible page `<title>`
+examples:
+  default:
+    data:
+      title: 'Example layout'
+      block: |
+        <h1>Page content goes here</h1>
+  full_width:
+    description: By default, the layout applies the `govuk-width-container` class to the main element. We can remove this class by setting `full_width` to `true`
+    data:
+      full_width: true
+      block: |
+        <h1>Page content goes here</h1>
+  omit_header:
+    description: This allows the header to be omitted which is currently used when rendering CSV previews from Whitehall
+    data:
+      omit_header: true

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

@@ -7,6 +7,10 @@ govuk_frontend_components:
   - header
 accessibility_excluded_rules:
   - landmark-banner-is-top-level # The header element can not be top level in the examples
+  - duplicate-id-aria # IDs will be duplicated in component examples list
+  - form-field-multiple-labels # Form labels will be ambiguous in component examples list
+  - landmark-no-duplicate-banner # banners will be duplicated in component examples list
+  - landmark-unique # aria-label attributes will be duplicated in component examples list
 examples:
   default:
     data:
@@ -36,12 +40,42 @@ examples:
       - text: Hidden on desktop
         href: "item-3"
         show_only_in_collapsed_menu: true
+  with_left_search_and_navigation:
+    description: This supports pages where the search appears on the left with multiple navigation links on the right, such as the [How government works](https://www.gov.uk/government/how-government-works) page
+    data:
+      search_left: true
+      environment: public
+      navigation_items:
+      - text: Departments
+        href: "item-1"
+      - text: Worldwide
+        href: "item-2"
+      - text: How government works
+        href: "item-3"
+      - text: Get involved
+        href: "item-4"
+      - text: Consultations
+        href: "item-4"
+      - text: Statistics
+        href: "item-5"
+      - text: News and communications
+        href: "item-6"
+        active: true
   full_width:
     description: |
       This is difficult to preview because the preview windows are constrained, but the header will stretch to the size of its container.
     data:
       environment: production
       full_width: true
+  no_bottom_border:
+    description: This is useful for pages where a large full-width banner is the first thing to appear on the page, for example, the [GOV.UK homepage](https://www.gov.uk)
+    data:
+      remove_bottom_border: true
+      environment: 'public'
+  with_search_bar:
+    data:
+      environment: 'public'
+      search: true
 
 accessibility_criteria: |
   The component must:

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

@@ -24,6 +24,12 @@ examples:
   stop_the_label_appearing_inline:
     data:
       inline_label: false
+  no_border:
+    description: Sometimes we don't need the grey border surrounding the input field, such as when the component is used on a black background
+    data:
+      no_border: true
+    context:
+      black_background: true
   for_use_on_govuk_blue_background:
     data:
       on_govuk_blue: true

data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb

@@ -0,0 +1,23 @@
+<div class="govuk-header__logo gem-c-header__logo">
+  <a href="/" class="govuk-header__link govuk-header__link--homepage" data-module="track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
+    <span class="govuk-header__logotype">
+      <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
+        <path fill="currentColor" fill-rule="evenodd"
+          d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
+        <%# Deliberate use of image tag as a fallback method https://lynn.ru/examples/svg/en.html %>
+        <image src="<%= asset_path('govuk-logotype-crown.png') %>" class="govuk-header__logotype-crown-fallback-image"></image>
+      </svg>
+      <span class="govuk-header__logotype-text">
+        GOV.UK
+      </span>
+    </span>
+    <% unless public_environment %>
+      <span class="govuk-header__product-name gem-c-header__product-name">
+        <%= product_name %>
+      </span>
+      <span class="gem-c-environment-tag govuk-tag gem-c-environment-tag--<%= environment %>">
+        <%= environment %>
+      </span>
+    <% end %>
+  </a>
+</div>

data/app/views/govuk_publishing_components/components/layout_header/_navigation_items.html.erb

@@ -0,0 +1,17 @@
+<% if navigation_items.any? %>
+  <button role="button" class="govuk-header__menu-button gem-c-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="Show or hide Top Level Navigation">Menu</button>
+  <nav class="gem-c-header__nav">
+    <ul id="navigation" class="govuk-header__navigation govuk-header__navigation--end" aria-label="Top Level Navigation">
+      <% navigation_items.each_with_index do |item, index| %>
+        <li class="govuk-header__navigation-item <%= "govuk-header__navigation-item--active" if item[:active] %>
+          <%= "govuk-header__navigation-item--collapsed-menu-only" if item[:show_only_in_collapsed_menu] %>">
+          <%= link_to(
+            item[:text],
+            item[:href],
+            class: 'govuk-header__link',
+          ) %>
+        </li>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/govuk_publishing_components/components/layout_header/_search.html.erb

@@ -0,0 +1,9 @@
+<a href="#search" class="search-toggle js-header-toggle">Search</a>
+<form id="search" class="gem-c-layout-header__search-form govuk-clearfix" action="/search" method="get" role="search">
+  <%= render "govuk_publishing_components/components/search", {
+    id: "site-search-text",
+    label_text: "Search",
+    no_border: true,
+    margin_bottom: 0
+  } %>
+</form>

data/config/initializers/assets.rb

@@ -8,6 +8,7 @@ Rails.application.config.assets.precompile += %w[
   component_guide/visual-regression.js
   component_guide/print.css
   govuk_publishing_components/all_components.js
+  govuk_publishing_components/ie.js
   govuk_publishing_components/modules.js
   govuk_publishing_components/vendor/modernizr.js
   govuk_publishing_components/component_guide.css
@@ -30,6 +31,13 @@ Rails.application.config.assets.precompile += %w[
 # GOV.UK Frontend assets
 Rails.application.config.assets.precompile += %w[
   govuk-logotype-crown.png
+  favicon.ico
+  govuk-opengraph-image.png
+  govuk-mask-icon.svg
+  govuk-apple-touch-icon-180x180.png
+  govuk-apple-touch-icon-167x167.png
+  govuk-apple-touch-icon-152x152.png
+  govuk-apple-touch-icon.png
 ]
 
 Rails.application.config.assets.paths += %W[

data/lib/govuk_publishing_components.rb

@@ -12,6 +12,7 @@ require "govuk_publishing_components/presenters/contextual_navigation"
 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"
+require "govuk_publishing_components/presenters/public_layout_helper"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -8,6 +8,7 @@ module GovukPublishingComponents
         education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
         worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
         business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
+        transition_period: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
       }.freeze
 
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -4,7 +4,7 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :href, :href_data_attributes, :extra_links, :large, :extra_links_no_indent, :heading_text, :metadata
+      attr_reader :href, :href_data_attributes, :extra_links, :large, :extra_links_no_indent, :heading_text, :metadata, :lang
 
       def initialize(local_assigns)
         @href = local_assigns[:href]
@@ -18,6 +18,7 @@ module GovukPublishingComponents
         @heading_text = local_assigns[:heading_text]
         @extra_links_no_indent = local_assigns[:extra_links_no_indent]
         @metadata = local_assigns[:metadata]
+        @lang = local_assigns[:lang]
       end
 
       def is_tracking?
@@ -44,7 +45,7 @@ module GovukPublishingComponents
 
         content_tag(:p, class: "gem-c-image-card__context") do
           if @context[:date]
-            date = content_tag(:time, l(@context[:date], format: "%e %B %Y"), datetime: @context[:date].iso8601)
+            date = content_tag(:time, l(@context[:date], format: "%e %B %Y"), datetime: @context[:date].iso8601, lang: "en")
             dash = content_tag(:span, " — ", 'aria-hidden': true)
 
             if @context[:text]

data/lib/govuk_publishing_components/presenters/public_layout_helper.rb

@@ -0,0 +1,380 @@
+module GovukPublishingComponents
+  module Presenters
+    class PublicLayoutHelper
+      FOOTER_NAV = [
+        {
+          title: "Prepare for Brexit",
+          columns: 2,
+          items: [
+            {
+              href: "/business-uk-leaving-eu",
+              text: "Prepare your business or organisation for Brexit",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "brexitLinks",
+                  track_label: "Prepare your business or organisation for the UK leaving the EU",
+                },
+              },
+            },
+            {
+              href: "/prepare-eu-exit",
+              text: "Prepare for Brexit if you live in the UK",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "brexitLinks",
+                  track_label: "Prepare for Brexit if you live in the UK",
+                },
+              },
+            },
+            {
+              href: "/uk-nationals-living-eu",
+              text: "Living in Europe after Brexit",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "brexitLinks",
+                  track_label: "Living in Europe after Brexit",
+                },
+              },
+            },
+            {
+              href: "/staying-uk-eu-citizen",
+              text: "Continue to live in the UK after Brexit",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "brexitLinks",
+                  track_label: "Continue to live in the UK after Brexit",
+                },
+              },
+            },
+          ],
+        },
+        {
+          title: "Services and information",
+          columns: 2,
+          items: [
+            {
+              href: "/browse/benefits",
+              text: "Benefits",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Benefits",
+                },
+              },
+            },
+            {
+              href: "/browse/births-deaths-marriages",
+              text: "Births, deaths, marriages and care",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Births, deaths, marriages and care",
+                },
+              },
+            },
+            {
+              href: "/browse/business",
+              text: "Business and self-employed",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Business and self-employed",
+                },
+              },
+            },
+            {
+              href: "/browse/childcare-parenting",
+              text: "Childcare and parenting",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Childcare and parenting",
+                },
+              },
+            },
+            {
+              href: "/browse/citizenship",
+              text: "Citizenship and living in the UK",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Citizenship and living in the UK",
+                },
+              },
+            },
+            {
+              href: "/browse/justice",
+              text: "Crime, justice and the law",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Crime, justice and the law",
+                },
+              },
+            },
+            {
+              href: "/browse/disabilities",
+              text: "Disabled people",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Disabled people",
+                },
+              },
+            },
+            {
+              href: "/browse/driving",
+              text: "Driving and transport",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Driving and transport",
+                },
+              },
+            },
+            {
+              href: "/browse/education",
+              text: "Education and learning",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Education and learning",
+                },
+              },
+            },
+            {
+              href: "/browse/employing-people",
+              text: "Employing people",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Employing people",
+                },
+              },
+            },
+            {
+              href: "/browse/environment-countryside",
+              text: "Environment and countryside",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Environment and countryside",
+                },
+              },
+            },
+            {
+              href: "/browse/housing-local-services",
+              text: "Housing and local services",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Housing and local services",
+                },
+              },
+            },
+            {
+              href: "/browse/tax",
+              text: "Money and tax",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Money and tax",
+                },
+              },
+            },
+            {
+              href: "/browse/abroad",
+              text: "Passports, travel and living abroad",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Passports, travel and living abroad",
+                },
+              },
+            },
+            {
+              href: "/browse/visas-immigration",
+              text: "Visas and immigration",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Visas and immigration",
+                },
+              },
+            },
+            {
+              href: "/browse/working",
+              text: "Working, jobs and pensions",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Working, jobs and pensions",
+                },
+              },
+            },
+          ],
+        },
+        {
+          title: "Departments and policy",
+          items: [
+            {
+              href: "/government/how-government-works",
+              text: "How government works",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "How government works",
+                },
+              },
+            },
+            {
+              href: "/government/organisations",
+              text: "Departments",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Departments",
+                },
+              },
+            },
+            {
+              href: "/world",
+              text: "Worldwide",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Worldwide",
+                },
+              },
+            },
+            {
+              href: "/search/services",
+              text: "Services",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Services",
+                },
+              },
+            },
+            {
+              href: "/search/guidance-and-regulation",
+              text: "Guidance and regulation",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Guidance and regulation",
+                },
+              },
+            },
+            {
+              href: "/search/news-and-communications",
+              text: "News and communications",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "News and communications",
+                },
+              },
+            },
+            {
+              href: "/search/research-and-statistics",
+              text: "Research and statistics",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Research and statistics",
+                },
+              },
+            },
+            {
+              href: "/search/policy-papers-and-consultations",
+              text: "Policy papers and consultations",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Policy papers and consultations",
+                },
+              },
+            },
+            {
+              href: "/search/transparency-and-freedom-of-information-releases",
+              text: "Transparency and freedom of information releases",
+              attributes: {
+                data: {
+                  track_category: "footerClicked",
+                  track_action: "footerLinks",
+                  track_label: "Transparency and freedom of information releases",
+                },
+              },
+            },
+          ],
+        },
+      ].freeze
+
+      FOOTER_META = {
+        items: [
+          {
+            href: "/help",
+            text: "Help",
+          },
+          {
+            href: "/help/cookies",
+            text: "Cookies",
+          },
+          {
+            href: "/contact",
+            text: "Contact",
+          },
+          {
+            href: "/help/terms-conditions",
+            text: "Terms and conditions",
+          },
+          {
+            href: "/cymraeg",
+            text: "Rhestr o Wasanaethau Cymraeg",
+          },
+          {
+            href: "/government/organisations/government-digital-service",
+            text: "Government Digital Service",
+          },
+        ],
+      }.freeze
+
+      attr_reader :footer_navigation, :footer_meta
+
+      def initialize(local_assigns)
+        @footer_navigation = local_assigns[:footer_navigation] || FOOTER_NAV
+        @footer_meta = local_assigns[:footer_meta] || FOOTER_META
+      end
+    end
+  end
+end