govuk_publishing_components 25.0.0 → 25.2.2

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

@@ -8,29 +8,35 @@
   local_assigns[:margin_bottom] ||= 8
   local_assigns[:margin_bottom] = 8 if local_assigns[:margin_bottom] > 9
 
+  banner_title ||= t("components.notice.banner_title")
+  banner_title_id ||= "govuk-notification-banner-title-#{SecureRandom.hex(4)}"
+  show_banner_title ||= false
+  heading_level = show_banner_title ? "h3" : "h2"
+
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
-  css_classes = %w[gem-c-notice]
+  css_classes = %w[govuk-notification-banner gem-c-notice]
   css_classes << (shared_helper.get_margin_bottom)
 
-  aria_attributes = aria_live ? {label: 'Notice', live: 'polite'} : {label: 'Notice'}
+  aria_attributes = {label: 'Notice'}
+  aria_attributes[:live] = 'polite' if aria_live
+  aria_attributes[:labelledby] = banner_title_id if show_banner_title
 
   description_present = description.present? || description_text.present? || description_govspeak.present?
 %>
 <% if title || description_present %>
   <%= tag.section class: css_classes, aria: aria_attributes, lang: lang, role: "region" do %>
-    <% if title %>
-      <% if description_present %>
-        <%= tag.h2 title, class: "gem-c-notice__title" %>
-      <% else %>
-        <%= tag.span title, class: "gem-c-notice__title" %>
-      <% end %>
-    <% end %>
+    <%= tag.div class: "govuk-notification-banner__header" do %>
+      <%= tag.h2 banner_title, class: "govuk-notification-banner__title", id: banner_title_id %>
+    <% end if show_banner_title %>
+    <%= tag.div class: "govuk-notification-banner__content" do %>
+      <%= content_tag(heading_level, title, class: "gem-c-notice__title govuk-notification-banner__heading") if description_present && title %>
+      <%= tag.span title, class: "gem-c-notice__title govuk-notification-banner__heading" if !description_present && title %>
+      <%= tag.p description_text, class: "gem-c-notice__description" if description_text %>
 
-    <%= tag.p description_text, class: "gem-c-notice__description" if description_text %>
+      <%= description if description %>
 
-    <%= description if description %>
-
-    <%= render 'govuk_publishing_components/components/govspeak', content: description_govspeak if description_govspeak %>
+      <%= render 'govuk_publishing_components/components/govspeak', content: description_govspeak if description_govspeak %>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -15,12 +15,12 @@
   heading_classes = %w(govuk-fieldset__heading)
   heading_classes << "gem-c-radio__heading-text" if heading_level == 'h1'
 
-  if ['s', 'm', 'l', 'xl'].include?(heading_size)
+  if (shared_helper.valid_heading_size?(heading_size))
     size = heading_size
-  elsif heading_level == 'h1'
-    size = 'xl'
+  elsif heading_level == "h1"
+    size = "xl"
   else
-    size = 'm'
+    size = "m"
   end
 
   description ||= nil

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

@@ -4,6 +4,7 @@
   aria_controls ||= nil
   button_text ||= t("components.search_box.search_button")
   id ||= "search-main-" + SecureRandom.hex(4)
+  label_size ||= nil
   label_text ||= t("components.search_box.label")
   name ||= "q"
   no_border ||= false
@@ -13,6 +14,13 @@
   data_attributes ||= {}
   data_attributes[:module] = 'gem-track-click'
 
+  label_classes = []
+  if (shared_helper.valid_heading_size?(label_size))
+    label_classes << "govuk-label govuk-label--#{label_size}"
+  else
+    label_classes << "gem-c-search__label"
+  end
+
   classes = %w[gem-c-search govuk-!-display-none-print]
   classes << (shared_helper.get_margin_top)
   classes << (shared_helper.get_margin_bottom) if local_assigns[:margin_bottom]
@@ -23,13 +31,13 @@
   else
     classes << "gem-c-search--on-white"
   end
-  classes << "gem-c-search--separate-label" if local_assigns.include?(:inline_label)
+  classes << "gem-c-search--separate-label" if local_assigns.include?(:inline_label) or local_assigns.include?(:label_size)
 %>
 
 <div class="<%= classes.join(" ") %>" data-module="gem-toggle-input-class-on-focus">
-  <label for="<%= id %>" class="gem-c-search__label">
+  <%= tag.label({ for: id, class: label_classes }) do %>
     <%= label_text %>
-  </label>
+  <% end %>
   <div class="gem-c-search__item-wrapper">
     <%= tag.input(
       aria: {

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

@@ -1,11 +1,13 @@
 <%
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
   options ||= []
   id ||= false
   label ||= false
   full_width ||= false
   name ||= id
   is_page_heading ||= false
-  heading_size = false unless ['s', 'm', 'l', 'xl'].include?(heading_size)
+  heading_size = false unless shared_helper.valid_heading_size?(heading_size)
   error_message ||= nil
   error_id ||= nil
 

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

@@ -1,7 +1,7 @@
 <%
   local_assigns[:heading_level] ||= 3
-  heading_size = 'm' unless ['s', 'm', 'l', 'xl'].include?(heading_size)
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+  heading_size = "m" unless shared_helper.valid_heading_size?(heading_size)
 
   id ||= nil
   title ||= nil

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

@@ -3,6 +3,7 @@
 
   context ||= false
   context_locale ||= false
+  context_inside ||= false
 
   inverse ||= false
   local_assigns[:margin_top] ||= 8
@@ -18,13 +19,22 @@
   heading_classes = %w[gem-c-title__text]
   heading_classes << (average_title_length.present? ? 'govuk-heading-l' : 'govuk-heading-xl')
 %>
+
+<% @context_block = capture do %>
+  <span class="govuk-caption-xl gem-c-title__context" <%= "lang=#{context_locale}" if context_locale.present? %>>
+    <%= context %>
+  </span>
+<% end %>
+
 <%= content_tag(:div, class: classes) do %>
-  <% if context %>
-    <span class="govuk-caption-xl gem-c-title__context" <%= "lang=#{context_locale}" if context_locale.present? %>>
-      <%= context %>
-    </span>
+  <% if context && !context_inside %>
+    <%= @context_block %>
   <% end %>
+  
   <h1 class="<%= heading_classes.join(" ") %>">
+    <% if context && context_inside %>
+      <%= @context_block %>
+    <% end %>
     <%= title %>
   </h1>
 <% end %>

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

@@ -50,3 +50,18 @@ examples:
       title: 'This publication was withdrawn on 30 September 2015'
       description_govspeak: <p>This document is no longer current. We published a new version on 30 September 2015.</p>
       lang: 'en'
+  with_banner_title:
+    description: |
+      By default, the notice component renders with a banner title of "Important" if `show_banner_title` is `true`.
+    data:
+      title: 'This publication was withdrawn on 30 September 2015'
+      description_govspeak: <p>This document is no longer current. We published a new version on 30 September 2015.</p>
+      show_banner_title: true
+  with_custom_banner_title:
+    description: |
+      The default banner title can be overruled by specifying a `banner_title` option.
+    data:
+      title: 'This publication was withdrawn on 30 September 2015'
+      description_govspeak: <p>This document is no longer current. We published a new version on 30 September 2015.</p>
+      show_banner_title: true
+      banner_title: "Information"

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

@@ -64,3 +64,8 @@ examples:
       This is visually hidden text -- to check for changes use a screen reader or inspect the button element.
     data:
       button_text: "Search absolutely everywhere"
+  with_set_label_size:
+    description: |
+      Allows the label text size to be set to `xl`, `l`, `m`, or `s`. If this is set, then `inline_label` is automatically set to `false`.
+    data:
+      label_size: "xl"

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

@@ -24,6 +24,13 @@ examples:
     data:
       context: Publication
       title: My page title
+  with_context_inside:
+    description: |
+      If the context should be considered part of the page heading, you can nest the context within the <code><h1></code>.
+    data:
+      context: Publication
+      title: My page title
+      context_inside: true
   with_context_language_labelled:
     description: |
       Sometimes this component appears on a page that has been translated. The title will naturally be supplied in the required language but the context string may fall back to the default. In these instances we need to label the language so the page remains semantic and screenreaders can handle the switch.

data/config/locales/ar.yml

@@ -82,11 +82,13 @@ ar:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/az.yml

@@ -82,11 +82,13 @@ az:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/be.yml

@@ -82,11 +82,13 @@ be:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/bg.yml

@@ -82,11 +82,13 @@ bg:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/bn.yml

@@ -82,11 +82,13 @@ bn:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/cs.yml

@@ -82,11 +82,13 @@ cs:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/cy.yml

@@ -82,11 +82,13 @@ cy:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:
@@ -124,12 +126,12 @@ cy:
       topical_events:
       topics: Archwilio’r pwnc
       transition:
-        link_path: "/brexit.cy"
-        link_text: Cael rhestr bersonol o gamau gweithredu
-        title: Brexit
         hub_page_link_path:
         hub_page_link_text:
         hub_page_title: Gwiriwr Brexit
+        link_path: "/brexit.cy"
+        link_text: Cael rhestr bersonol o gamau gweithredu
+        title: Brexit
       world_locations:
     search_box:
       input_title:

data/config/locales/da.yml

@@ -82,11 +82,13 @@ da:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/de.yml

@@ -82,11 +82,13 @@ de:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/dr.yml

@@ -82,11 +82,13 @@ dr:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/el.yml

@@ -82,11 +82,13 @@ el:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      navigation_links:
       navigation_menu_heading:
-      search_text:
-      popular_links_heading:
+      navigation_search_heading:
+      navigation_search_subheading:
       popular_links:
-      navigation_links:
+      popular_links_heading:
+      search_text:
     metadata:
       from:
       history:

data/config/locales/en.yml

@@ -90,88 +90,92 @@ en:
     layout_super_navigation_header:
       logo_link_title: Go to the GOV.UK homepage
       logo_text: GOV.UK
+      menu_toggle_label:
+        hide: Hide %{label} menu
+        show: Show %{label} menu
+      navigation_links:
+      - label: Topics
+        href: "/browse"
+        description: Find information and services
+        menu_contents:
+        - label: Benefits
+          href: "/browse/benefits"
+        - label: Births, death, marriages and care
+          href: "/browse/births-deaths-marriages"
+        - label: Brexit
+          href: "/brexit"
+        - label: Business and self-employed
+          href: "/browse/business"
+        - label: Childcare and parenting
+          href: "/browse/childcare-parenting"
+        - label: Citizenship and living in the UK
+          href: "/browse/citizenship"
+        - label: Coronavirus (COVID‑19)
+          href: "/coronavirus"
+        - label: Crime, justice and the law
+          href: "/browse/justice"
+        - label: Disabled people
+          href: "/browse/disabilities"
+        - label: Driving and transport
+          href: "/browse/driving"
+        - label: Education and learning
+          href: "/browse/education"
+        - label: Employing people
+          href: "/browse/employing-people"
+        - label: Environment and countryside
+          href: "/browse/environment-countryside"
+        - label: Housing and local services
+          href: "/browse/housing-local-services"
+        - label: Money and tax
+          href: "/browse/tax"
+        - label: Passports, travel and living abroad
+          href: "/browse/abroad"
+        - label: Visas and immigration
+          href: "/browse/visas-immigration"
+        - label: Working, jobs and pensions
+          href: "/browse/working"
+      - label: Departments
+        href: "/government/organisations"
+      - label: Government activity
+        href: "/search/news-and-communications"
+        description: Find out what the government is doing
+        menu_contents:
+        - label: News
+          href: "/search/news-and-communications"
+          description: News stories, speeches, letters and notices
+        - label: Guidance and regulation
+          href: "/search/guidance-and-regulation"
+          description: Detailed guidance, regulations and rules
+        - label: Research and statistics
+          href: "/search/research-and-statistics"
+          description: Reports, analysis and official statistics
+        - label: Policy papers and consultation
+          href: "/search/policy-papers-and-consultations"
+          description: Consultations and strategy
+        - label: Transparency
+          href: "/search/transparency-and-freedom-of-information-releases"
+          description: Government data, Freedom of Information releases and corporate reports
+        footer_links:
+        - label: How government works
+          href: "/government/how-government-works"
+        - label: Get involved
+          href: "/government/get-involved"
       navigation_menu_heading: Navigation menu
-      search_text: Search GOV.UK
-      popular_links_heading: Popular on GOV.UK
+      navigation_search_heading: Search and popular pages
+      navigation_search_subheading: Search
       popular_links:
-        - label: 'Coronavirus (COVID-19): rules'
-          href: /guidance/covid-19-coronavirus-restrictions-what-you-can-and-cannot-do
-        - label: 'Brexit: check what you need to do'
-          href: /brexit
-        - label: Sign in to your personal tax account
-          href: /personal-tax-account
-        - label: Find a job
-          href: /find-a-job
-        - label: Sign in to your Universal Credit account
-          href: /sign-in-universal-credit
-      navigation_links:
-        - label: Topics
-          href: /browse
-          description: Find information and services
-          show: true
-          menu_contents:
-            - label: Benefits
-              href: /browse/benefits
-            - label: Births, death, marriages and care
-              href: /browse/births-deaths-marriages
-            - label: Brexit
-              href: /brexit
-            - label: Business and self-employed
-              href: /browse/business
-            - label: Childcare and parenting
-              href: /browse/childcare-parenting
-            - label: Citizenship and living in the UK
-              href: /browse/citizenship
-            - label: Coronavirus (COVID‑19)
-              href: /coronavirus
-            - label: Crime, justice and the law
-              href: /browse/justice
-            - label: Disabled people
-              href: /browse/disabilities
-            - label: Driving and transport
-              href: /browse/driving
-            - label: Education and learning
-              href: /browse/education
-            - label: Employing people
-              href: /browse/employing-people
-            - label: Environment and countryside
-              href: /browse/environment-countryside
-            - label: Housing and local services
-              href: /browse/housing-local-services
-            - label: Money and tax
-              href: /browse/tax
-            - label: Passports, travel and living abroad
-              href: /browse/abroad
-            - label: Visas and immigration
-              href: /browse/visas-immigration
-            - label: Working, jobs and pensions
-              href: /browse/working
-        - label: Departments
-          href: /government/organisations
-        - label: Government activity
-          href: /search/news-and-communications
-          description: Find out what the government is doing
-          menu_contents:
-            - label: News
-              href: /search/news-and-communications
-              description: News stories, speeches, letters and notices
-            - label: Guidance and regulation
-              href: /search/guidance-and-regulation
-              description: Detailed guidance, regulations and rules
-            - label: Research and statistics
-              href: /search/research-and-statistics
-              description: Reports, analysis and official statistics
-            - label: Policy papers and consultation
-              href: /search/policy-papers-and-consultations
-              description: Consultations and strategy
-            - label: Transparency
-              href: /search/transparency-and-freedom-of-information-releases
-              description: Government data, freedom of information releases and corporate reports
-          footer_links:
-            - label: How government works
-              href: /government/how-government-works
-            - label: Get involved
-              href: /government/get-involved
+      - label: 'Coronavirus (COVID-19): guidance'
+        href: "/guidance/covid-19-coronavirus-restrictions-what-you-can-and-cannot-do"
+      - label: 'Brexit: check what you need to do'
+        href: "/brexit"
+      - label: Sign in to your personal tax account
+        href: "/personal-tax-account"
+      - label: Find a job
+        href: "/find-a-job"
+      - label: Sign in to your Universal Credit account
+        href: "/sign-in-universal-credit"
+      popular_links_heading: Popular on GOV.UK
+      search_text: Search GOV.UK
     metadata:
       from: From
       history: History
@@ -183,6 +187,8 @@ en:
       toggle_more: "+ %{number} more"
     modal_dialogue:
       close_modal: Close modal dialogue
+    notice:
+      banner_title: Important
     organisation_schema:
       all_content_search_description: Find all content from %{organisation}
     previous_and_next_navigation:
@@ -209,12 +215,12 @@ en:
       topical_events: Topical event
       topics: Explore the topic
       transition:
-        link_path: "/brexit"
-        link_text: Check what you need to do
-        title: Brexit
         hub_page_link_path: "/transition-check/questions"
         hub_page_link_text: Get a personalised list of actions
         hub_page_title: Brexit checker
+        link_path: "/brexit"
+        link_text: Check what you need to do
+        title: Brexit
       world_locations: World locations
     search_box:
       input_title: Search