govuk_publishing_components 24.10.2 → 24.13.0

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

@@ -5,6 +5,6 @@
 <%= link_to(
   text,
   href,
-  class: %w(gem-c-back-link govuk-back-link),
+  class: %w(gem-c-back-link govuk-back-link govuk-!-display-none-print),
   data: data_attributes
 ) %>

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

@@ -7,7 +7,7 @@
 
 <% start_button_text = capture do %>
   <%= button.text %>
-  <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">
+  <svg class="govuk-button__start-icon govuk-!-display-none-print" 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" />
   </svg>
 <% end %>

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

@@ -18,7 +18,7 @@
     <%= render "govuk_publishing_components/components/textarea", { id: id, character_count: true }.merge(textarea.symbolize_keys) %>
 
     <span id="<%= id %>-info" class="govuk-hint govuk-character-count__message" aria-live="polite">
-      You can enter up to <%= maxlength || maxwords %> <%= maxwords ? 'words' : 'characters' %>
+      <%= t("components.character_count", number: maxlength || maxwords, type: maxwords ? t("components.character_count.type.words") : t("components.character_count.type.characters")) %>
     </span>
   <% end %>
 <% end %>

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

@@ -1,12 +1,19 @@
 <%-
   cl_helper = GovukPublishingComponents::Presenters::ContentsListHelper.new(local_assigns)
+  underline_links ||= false
   aria_label ||= t("components.contents_list.contents")
   format_numbers ||= false
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   title_fallback = t("components.contents_list.contents", locale: I18n.locale, fallback: false, default: "en")
-  classes = cl_helper.classes
+  classes = %w[gem-c-contents-list]
   classes << brand_helper.brand_class
+  link_classes = %w[
+    gem-c-contents-list__link
+    govuk-link
+  ]
+  link_classes << brand_helper.color_class
+  link_classes << "govuk-link--no-underline" unless underline_links
 -%>
 <% if cl_helper.contents.any? %>
   <%= content_tag(
@@ -31,7 +38,7 @@
         <li class="<%= cl_helper.list_item_classes(contents_item, false) %>" <%= "aria-current=true" if contents_item[:active] %>>
           <% link_text = format_numbers ? cl_helper.wrap_numbers_with_spans(contents_item[:text]) : contents_item[:text] %>
           <%= link_to_if !contents_item[:active], link_text, contents_item[:href],
-            class: "gem-c-contents-list__link govuk-link #{brand_helper.color_class}",
+            class:  link_classes,
             data: {
               track_category: 'contentsClicked',
               track_action: "content_item #{position}",
@@ -47,7 +54,7 @@
               <% contents_item[:items].each.with_index(1) do |nested_contents_item, nested_position| %>
                 <li class="<%= cl_helper.list_item_classes(nested_contents_item, true) %>" <%= "aria-current=true" if nested_contents_item[:active] %>>
                   <%= link_to_if !nested_contents_item[:active], nested_contents_item[:text], nested_contents_item[:href],
-                    class: "gem-c-contents-list__link govuk-link #{brand_helper.color_class}",
+                    class: link_classes,
                     data: {
                       track_category: 'contentsClicked',
                       track_action: "nested_content_item #{position}:#{nested_position}",

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

@@ -18,7 +18,7 @@
   <% if navigation.content_tagged_to_other_step_by_steps? %>
     <%# Rendering step by step related items because there are a few but not too many of them %>
     <%= render 'govuk_publishing_components/components/step_by_step_nav_related', {
-      pretitle: "Also part of",
+      pretitle: t("components.contextual_sidebar.pretitle"),
       links: navigation.step_nav_helper.also_part_of_step_nav,
       always_display_as_list: true
     } %>

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

@@ -1,7 +1,7 @@
 <%
   id ||= 'global-cookie-message'
-  title ||= "Cookies on GOV.UK"
-  text ||= ["We use some essential cookies to make this website work.", "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 ||= t("components.cookie_banner.title")
+  text ||= t("components.cookie_banner.text")
   if text.kind_of?(Array)
     newtext = ""
     text.each do |t|
@@ -14,7 +14,17 @@
   text = raw(text)
 
   cookie_preferences_href ||= "/help/cookies"
-  confirmation_message ||= raw("You can <a class='govuk-link' href='#{cookie_preferences_href}' data-module='gem-track-click' data-track-category='cookieBanner' data-track-action='Cookie banner settings clicked from confirmation'>change your cookie settings</a> at any time.")
+  confirmation_message ||= raw(t("components.cookie_banner.confirmation_message",
+                                link: link_to(
+                                  t("components.cookie_banner.confirmation_message_link"),
+                                  cookie_preferences_href,
+                                  class: "govuk-link",
+                                  data: {
+                                    module: "gem-track-click",
+                                    'track-category': "cookieBanner",
+                                    'track-action': "Cookie banner settings clicked from confirmation",
+                                  },
+                                )))
   services_cookies ||= nil
   css_classes = %w(gem-c-cookie-banner govuk-clearfix)
   css_classes << "gem-c-cookie-banner--services" if services_cookies
@@ -50,7 +60,7 @@
           <div class="govuk-button-group">
             <%= render "govuk_publishing_components/components/button", {
                 name: "cookies",
-                text: "Accept additional cookies",
+                text: t("components.cookie_banner.buttons.accept_cookies"),
                 data_attributes: {
                   module: "gem-track-click",
                   "accept-cookies": "true",
@@ -61,7 +71,7 @@
             } %>
             <%= render "govuk_publishing_components/components/button", {
                 name: "cookies",
-                text: "Reject additional cookies",
+                text: t("components.cookie_banner.buttons.reject_cookies"),
                 data_attributes: {
                   module: "gem-track-click",
                   "reject-cookies": "true",
@@ -77,7 +87,7 @@
   <div class="gem-c-cookie-banner__confirmation govuk-width-container" tabindex="-1" hidden>
     <p class="gem-c-cookie-banner__confirmation-message" role="alert"><%= confirmation_message %></p>
     <div class="govuk-button-group">
-      <button class="gem-c-cookie-banner__hide-button govuk-button" data-hide-cookie-banner="true" data-module="gem-track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide this message</button>
+      <button class="gem-c-cookie-banner__hide-button govuk-button" data-hide-cookie-banner="true" data-module="gem-track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner"><%= t("components.cookie_banner.hide") %></button>
     </div>
   </div>
 </div>

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

@@ -8,7 +8,7 @@
   path_without_pii = utf_encode(request.fullpath.gsub(email_regex, '[email]'))
 %>
 
-<div class="gem-c-feedback" data-module="feedback">
+<div class="gem-c-feedback govuk-!-display-none-print" data-module="feedback">
   <%= render "govuk_publishing_components/components/feedback/yes_no_banner" %>
   <%= render "govuk_publishing_components/components/feedback/problem_form", url_without_pii: url_without_pii %>
   <%= render "govuk_publishing_components/components/feedback/survey_signup_form", path_without_pii: path_without_pii %>

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

@@ -5,38 +5,38 @@
 <nav id="proposition-menu" class="no-proposition-name gem-c-government-navigation" aria-label="Departments and policy navigation">
   <ul id="proposition-links">
     <li>
-      <a class="<%= 'active' if active == 'departments' %>" href="/government/organisations">
-        <%= t("components.government_navigation.departments", default: "Departments") %>
+      <a class="<%= 'active' if active == 'departments' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/organisations">
+        <%= t("components.government_navigation.departments") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'worldwide' %>" href="/government/world">
-        <%= t("components.government_navigation.worldwide", default: "Worldwide") %>
+      <a class="<%= 'active' if active == 'worldwide' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/world">
+        <%= t("components.government_navigation.worldwide") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'how-government-works' %>" href="/government/how-government-works">
-        <%= t("components.government_navigation.how-government-works", default: "How government works") %>
+      <a class="<%= 'active' if active == 'how-government-works' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/how-government-works">
+        <%= t("components.government_navigation.how-government-works") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'get-involved' %>" href="/government/get-involved">
-        <%= t("components.government_navigation.get-involved", default: "Get involved") %>
+      <a class="<%= 'active' if active == 'get-involved' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/get-involved">
+        <%= t("components.government_navigation.get-involved") %>
       </a>
     </li>
     <li class="clear-child">
-      <a class="<%= 'active' if active == 'consultations' %>" href="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>">
-        <%= t("components.government_navigation.consultations", default: "Consultations") %>
+      <a class="<%= 'active' if active == 'consultations' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>">
+        <%= t("components.government_navigation.consultations") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'statistics' %>" href="/search/research-and-statistics">
-        <%= t("components.government_navigation.statistics", default: "Statistics") %>
+      <a class="<%= 'active' if active == 'statistics' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/search/research-and-statistics">
+        <%= t("components.government_navigation.statistics") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'announcements' %>" href="/news-and-communications">
-        <%= t("components.government_navigation.news_and_communications", default: "News and communications") %>
+      <a class="<%= 'active' if active == 'announcements' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/news-and-communications">
+        <%= t("components.government_navigation.news_and_communications") %>
       </a>
     </li>
   </ul>

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

@@ -10,6 +10,19 @@
   font_size ||= card_helper.large ? 'm' : 's'
   heading_class = %w[gem-c-image-card__title]
   heading_class << shared_helper.get_heading_size(font_size, 's')
+
+  heading_link_classes = %w[
+    gem-c-image-card__title-link
+    govuk-link
+    govuk-link--no-underline
+  ] 
+  heading_link_classes << brand_helper.color_class
+  extra_link_classes = %w[
+    gem-c-image-card__list-item-link
+    govuk-link
+  ]
+  extra_link_classes << brand_helper.color_class
+
 %>
 <% if card_helper.href || card_helper.extra_links.any? %>
   <div class="<%= classes %> <%= brand_helper.brand_class %>"
@@ -21,7 +34,7 @@
           <%= content_tag(shared_helper.get_heading_level, class: heading_class) do %>
             <% if card_helper.href %>
               <%= link_to card_helper.heading_text, card_helper.href,
-                class: "gem-c-image-card__title-link govuk-link #{brand_helper.color_class}",
+                class: heading_link_classes,
                 data: card_helper.href_data_attributes
               %>
             <% else %>
@@ -37,7 +50,7 @@
           <% card_helper.extra_links.each do |link| %>
             <li class="gem-c-image-card__list-item">
               <%= link_to link[:text], link[:href],
-                class: "gem-c-image-card__list-item-link govuk-link #{brand_helper.color_class}",
+                class: extra_link_classes,
                 data: link[:data_attributes]
               %>
             </li>

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

@@ -29,7 +29,7 @@
               list_classes = %w[govuk-footer__list]
               list_classes << "govuk-footer__list--columns-#{item[:columns]}" if item[:columns] unless single_item_list
             %>
-            <div class="<%= width_class %>">
+            <div class="<%= width_class %> govuk-!-display-none-print">
               <h2 class="govuk-footer__heading govuk-heading-m"><%= item[:title] %></h2>
                 <ul class="<%= list_classes.join(' ') %>">
                   <% item[:items].each do |item| %>
@@ -38,7 +38,9 @@
                         <%
                           attributes = {
                             class: "govuk-footer__link",
-                            "data-track-category": "footerClicked"
+                            data: {
+                              "track-category": "footerClicked"
+                            }
                           }.merge(item.fetch(:attributes, {}))
                           attributes[:rel] = "noopener" if attributes[:target] == "_blank" && !attributes[:rel]
                         %>
@@ -57,8 +59,8 @@
     <div class="govuk-footer__meta">
       <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
         <% if meta.any? %>
-          <h2 class="govuk-visually-hidden">Support links</h2>
-          <ul class="govuk-footer__inline-list">
+          <h2 class="govuk-visually-hidden"><%= t("components.layout_footer.support_links") %></h2>
+          <ul class="govuk-footer__inline-list govuk-!-display-none-print">
             <% meta[:items].each do |item| %>
               <li class="govuk-footer__inline-list-item">
                 <%
@@ -77,16 +79,11 @@
           />
         </svg>
         <span class="govuk-footer__licence-description">
-          All content is available under the
-          <a
-            class="govuk-footer__link"
-            href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
-            rel="license"
-          >Open Government Licence v3.0</a>, except where otherwise stated
+          <%= t("components.layout_footer.licence_html") %>
         </span>
       </div>
       <div class="govuk-footer__meta-item">
-        <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
+        <%= t("components.layout_footer.copyright_html") %>
       </div>
     </div>
   </div>

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

@@ -17,7 +17,7 @@
 <meta property="og:site_name" content="GOV.UK" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="<%= page.canonical_url %>" />
-<meta property="og:title" content="<%= page.title %>" />
+<meta property="og:title" content="<% if page.withdrawn? %>[Withdrawn] <% end %><%= page.title %>" />
 <meta property="og:description" content="<%= strip_tags(page.description) %>" />
 
 <% if page.has_image? %>

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

@@ -18,35 +18,35 @@
 <%= content_tag :div, class: classes, data: { module: "gem-toggle" } do %>
   <dl data-module="gem-track-click">
     <% if from.any? %>
-      <dt class="gem-c-metadata__term"><%= t("components.metadata.from", default: "From") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.from") %>:</dt>
       <dd class="gem-c-metadata__definition">
         <%= render 'govuk_publishing_components/components/metadata/sentence', items: from, toggle_id: "from-#{SecureRandom.hex(4)}" %>
       </dd>
     <% end %>
     <% if part_of.any? %>
-      <dt class="gem-c-metadata__term"><%= t("components.metadata.part_of", default: "Part of") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.part_of") %>:</dt>
       <dd class="gem-c-metadata__definition">
         <%= render 'govuk_publishing_components/components/metadata/sentence', items: part_of, toggle_id: "part-of-#{SecureRandom.hex(4)}" %>
       </dd>
     <% end %>
     <% if local_assigns.include?(:history) %>
-      <dt class="gem-c-metadata__term"><%= t("components.metadata.history", default: "History") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.history") %>:</dt>
       <dd class="gem-c-metadata__definition"><%= history %></dd>
     <% end %>
     <% if local_assigns.include?(:first_published) && first_published %>
-      <dt class="gem-c-metadata__term"><%= t("components.metadata.published", default: "Published") %></dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.published") %></dt>
       <dd class="gem-c-metadata__definition"><%= first_published %></dd>
     <% end %>
     <% if local_assigns.include?(:last_updated) && last_updated %>
-      <dt class="gem-c-metadata__term"><%= t("components.metadata.last_updated", default: "Last updated") %></dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.last_updated") %></dt>
       <dd class="gem-c-metadata__definition">
         <%= last_updated %>
         <% if local_assigns.include?(:see_updates_link) %>
-          &#8212; <a href="#history" class="gem-c-metadata__definition-link"
+          &#8212; <a href="#history" class="gem-c-metadata__definition-link govuk-!-display-none-print"
                              data-track-category="content-history"
                              data-track-action="see-all-updates-link-clicked"
                              data-track-label="history">
-            <%= t("components.metadata.see_all_updates", default: "see all updates") %>
+            <%= t("components.metadata.see_all_updates") %>
           </a>
         <% end %>
       </dd>

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

@@ -18,6 +18,6 @@
       </svg>
     <% end %>
     <%= tag.div yield, class: "gem-c-modal-dialogue__content" %>
-    <%= tag.button "×", class: "gem-c-modal-dialogue__close-button", aria: { label: "Close modal dialogue" } %>
+    <%= tag.button "×", class: "gem-c-modal-dialogue__close-button", aria: { label: t("components.modal_dialogue.close_modal") } %>
   <% end %>
 <% end %>

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

@@ -6,16 +6,13 @@
   heading_level ||= false
   inline ||= false
 
-  # Check if `heading_level` is a number; if so, check if it's an appropriate
-  # number.
-  use_heading = heading_level.is_a?(Integer) ?
-                  (heading_level >= 1 && heading_level <= 6) :
-                  false
+  # Check if `heading_level` is an appropriate number:
+  use_heading = [*1..6].include?(heading_level)
 
-  # Set the wrapping element to be a heading or a `div`
-  wrapping_element = use_heading ? "h#{heading_level}" : "div"
+  # Set the wrapping element to be a heading or a `div`:
+  wrapping_element = (use_heading ? "h#{heading_level}" : "div").to_sym
 
-  wrapper_classes = %w(gem-c-organisation-logo)
+  wrapper_classes = %w[gem-c-organisation-logo]
   wrapper_classes << brand_helper.brand_class
 
   container_classes = [
@@ -24,10 +21,13 @@
   ]
   container_classes << "gem-c-organisation-logo__container--inline" if inline
 %>
-<<%= wrapping_element %>
-  class="<%= wrapper_classes.join(" ") %>"
-  <%= "data-module=gem-track-click" if organisation[:data_attributes] %>
->
+
+<%= content_tag(wrapping_element, {
+    class: wrapper_classes,
+    data: {
+      module: ("gem-track-click" if organisation[:data_attributes])
+    }
+  }) do %>
   <% if organisation[:url] %>
     <%= link_to organisation[:url],
       class: container_classes.join(" "),
@@ -39,4 +39,4 @@
       <%= logo_helper.logo_content %>
     </div>
   <% end %>
-</<%= wrapping_element %>>
+<% end %>

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

@@ -4,10 +4,6 @@ phase ||= nil
 message ||= nil
 inverse ||= false
 
-unless phase.in?(%w[alpha beta])
-  raise ArgumentError, "The phase banner component expects a `phase` (`beta` or `alpha`), #{phase.inspect} given"
-end
-
 unless message.present?
   if phase == "beta"
     message = raw("This part of GOV.UK is being rebuilt &ndash; <a class=\"govuk-link\" href=\"/help/beta\">find out what beta means</a>")
@@ -23,7 +19,7 @@ container_css_classes << "gem-c-phase-banner--inverse" if inverse
 <%= tag.div class: container_css_classes do %>
   <%= tag.p class: "govuk-phase-banner__content" do %>
     <%= tag.strong app_name, class: "govuk-phase-banner__content__app-name" if app_name %>
-    <%= tag.strong phase, class: "govuk-tag govuk-phase-banner__content__tag" %>
+    <%= tag.strong phase, class: "govuk-tag govuk-phase-banner__content__tag" if phase %>
     <%= tag.span message, class: "govuk-phase-banner__text" if message %>
   <% end %>
 <% end %>

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

@@ -2,10 +2,14 @@
 <nav
   class="gem-c-pagination"
   role="navigation"
-  aria-label="<%= t("components.previous_and_next_navigation.pagination", default: "Pagination") %>"
+  aria-label="<%= t("components.previous_and_next_navigation.pagination") %>"
 >
   <ul class="gem-c-pagination__list" data-module="gem-track-click">
     <% if local_assigns.include?(:previous_page) %>
+      <%
+        link_text_classes = %w[gem-c-pagination__link-text]
+        link_text_classes << "gem-c-pagination__link-text--decorated" unless previous_page[:label].present?
+      %>
       <li class="gem-c-pagination__item gem-c-pagination__item--previous">
         <a href="<%= previous_page[:url] %>"
           class="govuk-link gem-c-pagination__link"
@@ -20,9 +24,7 @@
             <svg class="gem-c-pagination__link-icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17" viewBox="0 0 17 13">
               <path d="m6.5938-0.0078125-6.7266 6.7266 6.7441 6.4062 1.377-1.449-4.1856-3.9768h12.896v-2h-12.984l4.2931-4.293-1.414-1.414z"/>
             </svg>
-            <span class="gem-c-pagination__link-text">
-              <%= previous_page[:title] %>
-            </span>
+            <%= tag.span(previous_page[:title], class: link_text_classes) %>
           </span>
           <% if previous_page[:label].present? %>
             <span class="gem-c-pagination__link-divider visually-hidden">:</span>
@@ -32,6 +34,10 @@
       </li>
     <% end %>
     <% if local_assigns.include?(:next_page) %>
+      <%
+        link_text_classes = %w[gem-c-pagination__link-text]
+        link_text_classes << "gem-c-pagination__link-text--decorated" unless next_page[:label].present?
+      %>
       <li class="gem-c-pagination__item gem-c-pagination__item--next">
         <a href="<%= next_page[:url] %>"
           class="govuk-link gem-c-pagination__link"
@@ -46,9 +52,7 @@
             <svg class="gem-c-pagination__link-icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17" viewBox="0 0 17 13">
               <path d="m10.107-0.0078125-1.4136 1.414 4.2926 4.293h-12.986v2h12.896l-4.1855 3.9766 1.377 1.4492 6.7441-6.4062-6.7246-6.7266z"/>
             </svg>
-            <span class="gem-c-pagination__link-text">
-              <%= next_page[:title] %>
-            </span>
+            <%= tag.span(next_page[:title], class: link_text_classes) %>
           </span>
           <% if next_page[:label].present? %>
             <span class="gem-c-pagination__link-divider visually-hidden">:</span>