govuk_publishing_components 24.9.2 → 24.10.2

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

@@ -1,7 +1,7 @@
 <%
   environment ||= nil
   full_width ||= false
-  navigation_aria_label ||= "Top level"
+  navigation_aria_label ||= t("components.layout_header.top_level")
   navigation_items ||= []
   product_name ||= nil
   remove_bottom_border ||= false

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

@@ -18,34 +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("govuk_component.metadata.from", default: "From") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.from", default: "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("govuk_component.metadata.part_of", default: "Part of") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.part_of", default: "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("govuk_component.metadata.history", default: "History") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.history", default: "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("govuk_component.metadata.published", default: "Published") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.published", default: "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("govuk_component.metadata.last_updated", default: "Last updated") %>:</dt>
+      <dt class="gem-c-metadata__term"><%= t("components.metadata.last_updated", default: "Last updated") %></dt>
       <dd class="gem-c-metadata__definition">
-        <%= last_updated %><% if local_assigns.include?(:see_updates_link) %>,
-          <a href="#history" class="gem-c-metadata__definition-link"
+        <%= last_updated %>
+        <% if local_assigns.include?(:see_updates_link) %>
+          &#8212; <a href="#history" class="gem-c-metadata__definition-link"
                              data-track-category="content-history"
                              data-track-action="see-all-updates-link-clicked"
                              data-track-label="history">
-            <%= t("govuk_component.metadata.see_all_updates", default: "see all updates") %>
+            <%= t("components.metadata.see_all_updates", default: "see all updates") %>
           </a>
         <% end %>
       </dd>

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

@@ -10,7 +10,7 @@
 
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
-  css_classes = %w(gem-c-notice)
+  css_classes = %w[gem-c-notice]
   css_classes << (shared_helper.get_margin_bottom)
 
   aria_attributes = aria_live ? {label: 'Notice', live: 'polite'} : {label: 'Notice'}

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

@@ -2,7 +2,7 @@
 <nav
   class="gem-c-pagination"
   role="navigation"
-  aria-label="<%= t("govuk_component.previous_and_next_navigation.pagination", default: "Pagination") %>"
+  aria-label="<%= t("components.previous_and_next_navigation.pagination", default: "Pagination") %>"
 >
   <ul class="gem-c-pagination__list" data-module="gem-track-click">
     <% if local_assigns.include?(:previous_page) %>

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

@@ -11,6 +11,9 @@
   small ||= false
   inline ||= false
   is_page_heading ||= false
+  heading_level = is_page_heading ? 'h1' : shared_helper.get_heading_level
+  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)
     size = heading_size
@@ -46,20 +49,12 @@
 %>
 <%= tag.div id: id, class: form_group_css_classes do %>
   <%= tag.fieldset class: "govuk-fieldset", "aria-describedby": aria do %>
-
     <% if heading.present? %>
-      <% if is_page_heading %>
-        <%= tag.legend class: legend_classes do %>
-          <%= tag.span(heading_caption, class: "govuk-caption-#{size}") if heading_caption.present? %>
-          <%= tag.h1 heading, class: "gem-c-radio__heading-text govuk-fieldset__heading" %>
-        <% end %>
-      <% else %>
-        <%= tag.legend class: legend_classes do %>
-          <%= content_tag(shared_helper.get_heading_level, heading, class: "govuk-fieldset__heading") %>
-        <% end %>
+      <%= tag.legend class: legend_classes do %>
+        <%= tag.span(heading_caption, class: "govuk-caption-#{size}") if heading_caption.present? %>
+        <%= content_tag(heading_level, heading, class: heading_classes) %>
       <% end %>
     <% end %>
-
     <% if description.present? %>
       <%= tag.div description, class: "govuk-body" %>
     <% end %>

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

@@ -9,6 +9,7 @@
   hint ||= nil
   error_message ||= nil
   error_items ||= nil
+  data ||= nil
 
   if !label
     raise ArgumentError, "This component requires a label"
@@ -37,6 +38,7 @@
         error_items: error_items,
         type: "password",
         autocomplete: autocomplete,
+        data: data,
       } %>
   <% end %>
 <% end %>

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

@@ -22,10 +22,10 @@
     class="gem-c-step-nav js-hidden <% unless small %>gem-c-step-nav--large<% end %>"
     <%= "data-remember" if remember_last_step %>
     <%= "data-id=#{tracking_id}" if tracking_id %>
-    data-show-text="<%= t("govuk_component.step_by_step_nav.show", default: "show") %>"
-    data-hide-text="<%= t("govuk_component.step_by_step_nav.hide", default: "hide") %>"
-    data-show-all-text="<%= t("govuk_component.step_by_step_nav.show_all", default: "Show all steps") %>"
-    data-hide-all-text="<%= t("govuk_component.step_by_step_nav.hide_all", default: "Hide all steps") %>"
+    data-show-text="<%= t("components.step_by_step_nav.show", default: "show") %>"
+    data-hide-text="<%= t("components.step_by_step_nav.hide", default: "hide") %>"
+    data-show-all-text="<%= t("components.step_by_step_nav.show_all", default: "Show all steps") %>"
+    data-hide-all-text="<%= t("components.step_by_step_nav.hide_all", default: "Hide all steps") %>"
   >
     <ol class="gem-c-step-nav__steps">
       <% steps.each_with_index do |step, step_index| %>

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

@@ -1,6 +1,6 @@
 <%
   links ||= []
-  pretitle ||= t("govuk_component.step_by_step_nav_related.part_of", default: "Part of")
+  pretitle ||= t("components.step_by_step_nav_related.part_of", default: "Part of")
   always_display_as_list ||= false
 %>
 <% if links.any? %>

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

@@ -23,7 +23,7 @@
 <% if sl_helper.component_data_is_valid? %>
   <%= tag.section class: css_classes, data: data do %>
     <% unless hide_heading %>
-      <h2 class="gem-c-subscription-links__hidden-header visuallyhidden"><%= t("govuk_component.subscription_links.subscriptions", default: "Subscriptions") %></h2>
+      <h2 class="gem-c-subscription-links__hidden-header visuallyhidden"><%= t("components.subscription_links.subscriptions", default: "Subscriptions") %></h2>
     <% end %>
     <ul
       class="gem-c-subscription-links__list<%= ' gem-c-subscription-links__list--small' if local_assigns[:small_form] == true %>"

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

@@ -13,7 +13,7 @@
     module: "initial-focus",
   } do %>
   <div class="govuk-notification-banner__header">
-    <%= tag.h2 t("govuk_component.success_alert.success", default: "Success"), class: "govuk-notification-banner__title", id: title_id %>
+    <%= tag.h2 t("components.success_alert.success", default: "Success"), class: "govuk-notification-banner__title", id: title_id %>
   </div>
   <div class="govuk-notification-banner__content">
     <% if description.present? %>

data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb

@@ -11,31 +11,13 @@
   "track-dimension-index": "29",
 } %>
 
-<%= link_to link_path,
-    class: "govuk-link gem-c-contextual-sidebar__brexit-cta",
-    data: data_attributes,
-    aria: { label: "#{t("components.related_navigation.take_action_list.aria_label")} #{link_text}" },
-    lang: shared_helper.t_locale("components.related_navigation.transition.title") do %>
-  <h2 class="gem-c-contextual-sidebar__brexit-heading govuk-heading-s"><%= t("components.related_navigation.transition.title") %></h2>
-  <ul class="govuk-list gem-c-contextual-sidebar__take-action-traffic-lights">
-    <li>
-      <%= image_tag 'govuk_publishing_components/take-action-red.svg', class: "gem-c-contextual-sidebar__take-action-traffic-lists-icon", alt: "" %>
-      <span class="gem-c-contextual-sidebar__take-action-traffic-lists-text">
-        <%= t("components.related_navigation.take_action_list.red") %>
-      </span>
-    </li>
-    <li>
-      <%= image_tag 'govuk_publishing_components/take-action-amber.svg', class: "gem-c-contextual-sidebar__take-action-traffic-lists-icon", alt: "" %>
-      <span class="gem-c-contextual-sidebar__take-action-traffic-lists-text">
-        <%= t("components.related_navigation.take_action_list.amber") %>
-      </span>
-    </li>
-    <li>
-      <%= image_tag 'govuk_publishing_components/take-action-green.svg', class: "gem-c-contextual-sidebar__take-action-traffic-lists-icon", alt: "" %>
-      <span class="gem-c-contextual-sidebar__take-action-traffic-lists-text">
-        <%= t("components.related_navigation.take_action_list.green") %>
-      </span>
-    </li>
-  </ul>
-  <p class="gem-c-contextual-sidebar__brexit-text"><%= link_text %></p>
+<%= tag.div class: "gem-c-contextual-sidebar__brexit-cta" do %>
+  <%= tag.h2 t("components.related_navigation.transition.title"), class: "gem-c-contextual-sidebar__brexit-heading govuk-heading-s" %>
+  <%= tag.p class: "gem-c-contextual-sidebar__brexit-text govuk-body" do %>
+    <%= link_to link_text,
+      link_path,
+      class: "govuk-link",
+      data: data_attributes,
+      lang: shared_helper.t_locale("components.related_navigation.transition.title") %>
+  <% end %>
 <% end %>

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

@@ -79,3 +79,13 @@ examples:
       error_items:
       - text: Look I keep telling you
       - text: This isn't your password
+  with_data_attributes:
+    description: Data attributes can be passed to add to the input element. If the data attribute starts with `data-button-` this attribute will be applied to the show/hide button, instead of the input. Note that if JS is disabled, all attributes are added to the input.
+    data:
+      label:
+        text: Your password
+      data:
+        example_1: value
+        example_2: thing
+        button_example_1: wotsit
+        button_example_2: doodad

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

@@ -24,6 +24,11 @@ examples:
     data:
       message: Message to alert the user to a successful action goes here
       title_id: my-custom-success-id
+  with_styled_link:
+    description: If you need to include a link in your success alert, you need to specify the `govuk-link` and `govuk-notification-banner__link` classes on that link element. This is in line with Design System guidance that the colour of the link in success notification banners can look jarring if any links are a different colour to the principal colour used by the success banner.
+    data:
+      message: Message to alert the user to a successful action goes here
+      description: <p class="govuk-body">A further description with <a href="/a-cool-page" class="govuk-link govuk-notification-banner__link">a link</a></p>
   long_example:
     data:
       message: |

data/app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb

@@ -28,7 +28,7 @@
   </div>
   <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-questions--something-is-wrong js-prompt-questions">
     <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong" data-track-category="Onsite Feedback" data-track-action="GOV-UK Open Form" aria-controls="something-is-wrong" aria-expanded="false">
-      <%= t("components.feedback.something_wrong", default: "There is something wrong with this page") %>
+      <%= t("components.feedback.something_wrong", default: "Report a problem with this page") %>
     </button>
   </div>
 </div>

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

@@ -7,7 +7,7 @@
     class="govuk-header__menu-button govuk-js-header-toggle gem-c-header__menu-button"
     type="button"
   >
-    Menu
+    <%= t("components.layout_header.menu") %>
   </button>
   <%= tag.nav class: "gem-c-header__nav", aria: { label: navigation_aria_label } do %>
     <ul id="navigation" class="govuk-header__navigation govuk-header__navigation--end">

data/app/views/govuk_publishing_components/components/metadata/_sentence.html.erb

@@ -13,8 +13,8 @@
        class="gem-c-metadata__definition-link"
        data-controls="toggle-<%= toggle_id %>"
        data-expanded="false"
-       data-toggled-text="<%= t("govuk_component.metadata.toggle_less", default: "Show fewer") %>">
-        <%= t("govuk_component.metadata.toggle_more", number: remaining.length, default: "+ #{remaining.length} more") %>
+       data-toggled-text="<%= t("components.metadata.toggle_less", default: "Show fewer") %>">
+        <%= t("components.metadata.toggle_more", number: remaining.length, default: "+ #{remaining.length} more") %>
     </a>
   </div>
   <span id="toggle-<%= toggle_id %>" class="gem-c-metadata__toggle-items js-hidden"><%= remaining.to_sentence.html_safe %></span>

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -23,10 +23,11 @@
 
     <% links.each.with_index(1) do |link, index| %>
       <%
+        link_class = "govuk-link #{related_nav_helper.section_css_class("govuk-link gem-c-related-navigation__section-link", section_title, link: link, link_is_inline: (index >= section_link_limit))}"
         link_element = link_to(
           link[:text],
           link[:path],
-          class: related_nav_helper.section_css_class("gem-c-related-navigation__section-link", section_title, link: link, link_is_inline: (index >= section_link_limit)),
+          class: link_class,
           rel: link[:rel],
           lang: shared_helper.t_locale_check(link[:locale]),
           data: {
@@ -53,8 +54,8 @@
           class="gem-c-related-navigation__toggle"
           data-controls="toggle_<%= section_title %>"
           data-expanded="false"
-          data-toggled-text="<%= t("govuk_component.metadata.toggle_less", default: "Show fewer") %>">
-          <%= t("govuk_component.metadata.toggle_more",
+          data-toggled-text="<%= t("components.metadata.toggle_less", default: "Show fewer") %>">
+          <%= t("components.metadata.toggle_more",
                 number: related_nav_helper.remaining_link_count(links),
                 default: "+ #{related_nav_helper.remaining_link_count(links)} more") %>
         </a>

data/config/locales/cy.yml

@@ -13,8 +13,3 @@ cy:
         title: "Brexit"
         link_path: "/transition.cy"
         link_text: "Gwiriwch beth sydd angen i chi ei wneud"
-      take_action_list:
-        red: Gwiriwch
-        amber: Newidiwch
-        green: Ewch
-        aria_label: Ymgyrch slogan Brexit, Gwiriwch, Newidiwch, Ewch.

data/config/locales/en.yml

@@ -44,13 +44,13 @@ en:
       contents: "Contents"
     feedback:
       is_this_page_useful: "Is this page useful?"
-      yes: "Yes"
-      no: "No"
+      "yes": "Yes"
+      "no": "No"
       maybe: "Maybe"
       is_useful: "this page is useful"
       is_not_useful: "this page is not useful"
       thank_you_for_feedback: "Thank you for your feedback"
-      something_wrong: "There is something wrong with this page"
+      something_wrong: "Report a problem with this page"
       close: "Close"
       help_us_improve_govuk: "Help us improve GOV.UK"
       more_about_visit: "To help us improve GOV.UK, we’d like to know more about your visit today. We’ll send you a link to a feedback form. It will take only 2 minutes to fill in. Don’t worry we won’t send you spam or share your email address with anyone."
@@ -65,8 +65,16 @@ en:
       show_button: "Show search"
       hide_button: "Hide search"
       top_level: "Top level"
-      nav_items_aria_label: "Show or hide Top Level Navigation"
       menu: "Menu"
+    metadata:
+      from: "From"
+      part_of: "Part of"
+      history: "History"
+      published: "Published"
+      last_updated: "Last updated"
+      see_all_updates: "See all updates"
+      toggle_less: "Show fewer"
+      toggle_more: "+ %{number} more"
     organisation_schema:
       all_content_search_description: "Find all content from %{organisation}"
     radio:
@@ -88,11 +96,6 @@ en:
         title: "Brexit"
         link_path: "/transition"
         link_text: "Check what you need to do"
-      take_action_list:
-        red: "Check"
-        amber: "Change"
-        green: "Go"
-        aria_label: "Brexit campaign slogan, Check, Change, Go."
     related_footer_navigation:
       collections: "Collections"
       policies: "Policies"

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -60,6 +60,11 @@ module GovukPublishingComponents
             step_by_step: false,
             breadcrumbs: navigation.breadcrumbs,
           }
+        elsif navigation.content_is_travel_advice?
+          {
+            step_by_step: false,
+            breadcrumbs: navigation.breadcrumbs,
+          }
         elsif navigation.content_has_a_topic?
           {
             step_by_step: false,

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -16,6 +16,10 @@ module GovukPublishingComponents
         content_item["document_type"] == "simple_smart_answer"
       end
 
+      def content_is_travel_advice?
+        content_item["document_type"] == "travel_advice"
+      end
+
       def html_publication_with_parent?
         (content_item["document_type"] == "html_publication") && parent_api_path
       end

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -67,7 +67,6 @@ module GovukPublishingComponents
 
       def section_css_class(css_class, section_title, link: {}, link_is_inline: false)
         css_classes = [css_class]
-        css_classes << "govuk-link"
         css_classes << "#{css_class}--#{@context}" unless @context.nil?
         css_classes << "#{css_class}--inline" if link_is_inline
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.9.2".freeze
+  VERSION = "24.10.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.9.2
+  version: 24.10.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: i18n-coverage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -416,7 +430,6 @@ files:
 - app/assets/javascripts/component_guide/filter-components.js
 - app/assets/javascripts/component_guide/vendor/bind-polyfill.js
 - app/assets/javascripts/component_guide/vendor/matches-polyfill.min.js
-- app/assets/javascripts/component_guide/visual-regression.js
 - app/assets/javascripts/govuk_publishing_components/all_components.js
 - app/assets/javascripts/govuk_publishing_components/analytics.js
 - app/assets/javascripts/govuk_publishing_components/analytics/analytics.js
@@ -469,6 +482,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/lib/toggle-input-class-on-focus.js
 - app/assets/javascripts/govuk_publishing_components/lib/toggle.js
 - app/assets/javascripts/govuk_publishing_components/lib/track-click.js
+- app/assets/javascripts/govuk_publishing_components/lib/trigger-event.js
 - app/assets/javascripts/govuk_publishing_components/modules.js
 - app/assets/javascripts/govuk_publishing_components/vendor/html5shiv-printshiv.js
 - app/assets/javascripts/govuk_publishing_components/vendor/json2.js