govuk_publishing_components 24.14.1 → 24.16.0

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

@@ -17,6 +17,7 @@
   transparent_icon ||= false
   data ||= nil
   classes ||= nil
+  font_size ||= nil
 
   css_classes = %w(gem-c-action-link)
   css_classes << "gem-c-action-link--light-text" if light_text
@@ -33,6 +34,7 @@
   link_classes = %w(govuk-link gem-c-action-link__link)
   link_classes << shared_helper.classes if classes
   link_classes << "govuk-link--inverse" if light_text
+  link_classes << shared_helper.get_heading_size(font_size, 'm') if font_size
 %>
 <% if text.present? %>
   <div class="<%= css_classes.join(' ') %>">

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

@@ -1,7 +1,9 @@
 <%
+  omit_feedback_form ||= false
   emergency_banner ||= nil
   full_width ||= false
   global_bar ||= nil
+  product_name ||= nil
   html_lang ||= "en"
   layout_helper = GovukPublishingComponents::Presenters::PublicLayoutHelper.new(local_assigns)
   logo_link ||= "/"
@@ -76,6 +78,7 @@
         search: show_search,
         logo_link: logo_link,
         navigation_items: navigation_items,
+        product_name: product_name,
 
         # The (blue) bottom border needs to be underneath the emergency banner -
         # so it has been turned off and added in manually.
@@ -104,9 +107,11 @@
       </main>
     </div>
 
-    <div class="govuk-width-container">
-      <%= render "govuk_publishing_components/components/feedback" %>
-    </div>
+    <% unless omit_feedback_form %>
+      <div class="govuk-width-container">
+        <%= render "govuk_publishing_components/components/feedback" %>
+      </div>
+    <% end %>
 
     <% unless local_assigns[:hide_footer_links] %>
       <%= render "govuk_publishing_components/components/layout_footer", {

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

@@ -101,6 +101,12 @@ examples:
       text: Coronavirus (COVID-19)
       href: "/my-test-page"
       dark_icon: true
+  with_custom_font_size:
+    data:
+      text: Guidance for businesses
+      href: "/guidance-for-businesses"
+      dark_icon: true
+      font_size: m
   with_nhs_icon:
     data:
       text: Something about the NHS

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

@@ -27,6 +27,10 @@ examples:
     description: This allows the header to be omitted which is currently used when rendering CSV previews from Whitehall
     data:
       omit_header: true
+  omit_feedback:
+    description: This allows the feedback form to be omitted
+    data:
+      omit_feedback_form: true
   navigation:
     description: Passes the navigation through to the [header component](/component-guide/layout_header/).
     data:

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

@@ -18,5 +18,10 @@
     id: "site-search-text",
     margin_bottom: 0,
     no_border: true,
+    data_attributes: {
+      track_category: "headerClicked",
+      track_action: "searchSubmitted",
+      track_label: "none",
+    },
   } %>
 </form>

data/config/i18n-tasks.yml

@@ -0,0 +1,4 @@
+data:
+  yaml:
+    write:
+      line_width: -1

data/config/locales/en.yml

@@ -12,20 +12,14 @@ en:
     article_schema:
       scoped_search_description: Search within %{title}
     attachment:
-      opendocument_html: This file is in an <a href='https://www.gov.uk/guidance/using-open-document-formats-odf-in-your-organisation'
-        target=%{target} class='govuk-link'>OpenDocument</a> format
+      opendocument_html: This file is in an <a href='https://www.gov.uk/guidance/using-open-document-formats-odf-in-your-organisation' target=%{target} class='govuk-link'>OpenDocument</a> format
       order_a_copy: Order a copy
       page:
         one: 1 page
-        other: '%{count} pages'
+        other: "%{count} pages"
       reference: 'Ref: %{reference}'
       request_format_cta: Request an accessible format.
-      request_format_details_html: If you use assistive technology (such as a screen
-        reader) and need a version of this document in a more accessible format, please
-        email <a href='mailto:%{alternative_format_contact_email}' target='_blank'
-        class='govuk-link'>%{alternative_format_contact_email}</a>. Please tell us
-        what format you need. It will help us if you say what assistive technology
-        you use.
+      request_format_details_html: If you use assistive technology (such as a screen reader) and need a version of this document in a more accessible format, please email <a href='mailto:%{alternative_format_contact_email}' target='_blank' class='govuk-link'>%{alternative_format_contact_email}</a>. Please tell us what format you need. It will help us if you say what assistive technology you use.
       request_format_text: This file may not be suitable for users of assistive technology.
     back_link:
       back: Back
@@ -44,28 +38,24 @@ en:
       buttons:
         accept_cookies: Accept additional cookies
         reject_cookies: Reject additional cookies
-      hide: Hide this message
-      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.
       confirmation_message: You can %{link} at any time.
       confirmation_message_link: change your cookie settings
+      hide: Hide this message
+      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: Cookies on GOV.UK
     feedback:
       close: Close
-      dont_include_personal_info: Don’t include personal or financial information
-        like your National Insurance number or credit card details.
+      dont_include_personal_info: Don’t include personal or financial information like your National Insurance number or credit card details.
       email_address: Email address
       help_us_improve_govuk: Help us improve GOV.UK
       is_not_useful: this page is not useful
       is_this_page_useful: Is this page useful?
       is_useful: this page is useful
       maybe: Maybe
-      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.
+      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.
       'no': 'No'
       send: Send
       send_me_survey: Send me the survey

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -39,8 +39,7 @@ module GovukPublishingComponents
           tracking_category: "breadcrumbClicked",
           tracking_action: tracking_action,
           tracking_label: content_item["base_path"],
-          tracking_dimension_enabled: false,
-        }
+        }.merge(custom_dimension_tracking)
       end
 
     private
@@ -80,16 +79,36 @@ module GovukPublishingComponents
         [PRIORITY_TAXONS[:brexit_business], PRIORITY_TAXONS[:brexit_individuals]]
       end
 
+      def brexit_taxons
+        brexit_child_taxons << PRIORITY_TAXONS[:brexit_taxon]
+      end
+
       def preferred_priority_taxon
         query_parameters["priority-taxon"] if query_parameters
       end
 
       def tracking_action
         action = %w[superBreadcrumb]
-        action << "Brexitbusiness" if taxon["content_id"] == PRIORITY_TAXONS[:brexit_business]
-        action << "Brexitcitizen" if taxon["content_id"] == PRIORITY_TAXONS[:brexit_individuals]
-        action << "Brexitbusinessandcitizen" if taxon["content_id"] == PRIORITY_TAXONS[:brexit_taxon]
-        action.join(" ")
+        action << page_name_for_tracking
+        action.compact.join(" ")
+      end
+
+      def custom_dimension_tracking
+        tracking = { tracking_dimension_enabled: false }
+        if brexit_taxons.include?(taxon["content_id"])
+          tracking[:tracking_dimension_enabled] = true
+          tracking[:tracking_dimension] = page_name_for_tracking
+          tracking[:tracking_dimension_index] = 111
+        end
+        tracking
+      end
+
+      def page_name_for_tracking
+        {
+          PRIORITY_TAXONS[:brexit_business] => "Brexitbusiness",
+          PRIORITY_TAXONS[:brexit_individuals] => "Brexitcitizen",
+          PRIORITY_TAXONS[:brexit_taxon] => "Brexitbusinessandcitizen",
+        }[taxon["content_id"]]
       end
 
       def tagged_to_both_brexit_child_taxons?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.14.1".freeze
+  VERSION = "24.16.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.14.1
+  version: 24.16.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n-tasks
+  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
@@ -804,6 +818,7 @@ files:
 - app/views/govuk_publishing_components/components/metadata/_sentence.html.erb
 - app/views/govuk_publishing_components/components/related_navigation/_section.html.erb
 - app/views/layouts/govuk_publishing_components/application.html.erb
+- config/i18n-tasks.yml
 - config/initializers/assets.rb
 - config/locales/ar.yml
 - config/locales/az.yml