govuk_publishing_components 24.6.0 → 24.9.0

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

@@ -1,7 +1,14 @@
 <% navigation_aria_label ||= "Top level" %>
 
 <% 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>
+  <button
+    aria-controls="navigation"
+    aria-label="Show or hide Top Level Navigation"
+    class="govuk-header__menu-button govuk-js-header-toggle gem-c-header__menu-button"
+    type="button"
+  >
+    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">
       <% navigation_items.each_with_index do |item, index| %>

data/config/locales/ar.yml

@@ -0,0 +1 @@
+ar:

data/config/locales/az.yml

@@ -0,0 +1 @@
+az:

data/config/locales/be.yml

@@ -0,0 +1 @@
+be:

data/config/locales/bg.yml

@@ -0,0 +1 @@
+bg:

data/config/locales/bn.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/cs.yml

@@ -0,0 +1 @@
+cs:

data/config/locales/da.yml

@@ -0,0 +1 @@
+da:

data/config/locales/de.yml

@@ -0,0 +1 @@
+de:

data/config/locales/dr.yml

@@ -0,0 +1 @@
+dr:

data/config/locales/el.yml

@@ -0,0 +1 @@
+el:

data/config/locales/en.yml

@@ -100,6 +100,8 @@ en:
       hide_password: "Hide password"
       announce_show: "Your password is shown"
       announce_hide: "Your password is hidden"
+    success_alert:
+      success: "Success"
     print_link:
       text: "Print this page"
     skip_link:

data/config/locales/es-419.yml

@@ -0,0 +1 @@
+es-419:

data/config/locales/es.yml

@@ -0,0 +1 @@
+es:

data/config/locales/fa.yml

@@ -0,0 +1 @@
+fa:

data/config/locales/fi.yml

@@ -0,0 +1 @@
+fi:

data/config/locales/gd.yml

@@ -0,0 +1 @@
+gd:

data/config/locales/gu.yml

@@ -0,0 +1 @@
+gu:

data/config/locales/he.yml

@@ -0,0 +1 @@
+he:

data/config/locales/hi.yml

@@ -0,0 +1 @@
+hi:

data/config/locales/hr.yml

@@ -0,0 +1 @@
+hr:

data/config/locales/hu.yml

@@ -0,0 +1 @@
+hu:

data/config/locales/hy.yml

@@ -0,0 +1 @@
+hy:

data/config/locales/id.yml

@@ -0,0 +1 @@
+id:

data/config/locales/is.yml

@@ -0,0 +1 @@
+is:

data/config/locales/it.yml

@@ -0,0 +1 @@
+it:

data/config/locales/ja.yml

@@ -0,0 +1 @@
+ja:

data/config/locales/ka.yml

@@ -0,0 +1 @@
+ka:

data/config/locales/kk.yml

@@ -0,0 +1 @@
+kk:

data/config/locales/ko.yml

@@ -0,0 +1 @@
+ko:

data/config/locales/lt.yml

@@ -0,0 +1 @@
+lt:

data/config/locales/lv.yml

@@ -0,0 +1 @@
+lv:

data/config/locales/ms.yml

@@ -0,0 +1 @@
+ms:

data/config/locales/mt.yml

@@ -0,0 +1 @@
+mt:

data/config/locales/nl.yml

@@ -0,0 +1 @@
+nl:

data/config/locales/no.yml

@@ -0,0 +1 @@
+"no":

data/config/locales/pa-pk.yml

@@ -0,0 +1 @@
+pa-pk:

data/config/locales/pa.yml

@@ -0,0 +1 @@
+pa:

data/config/locales/pl.yml

@@ -0,0 +1 @@
+pl:

data/config/locales/ps.yml

@@ -0,0 +1 @@
+ps:

data/config/locales/pt.yml

@@ -0,0 +1 @@
+pt:

data/config/locales/ro.yml

@@ -0,0 +1 @@
+ro:

data/config/locales/ru.yml

@@ -0,0 +1 @@
+ru:

data/config/locales/si.yml

@@ -0,0 +1 @@
+si:

data/config/locales/sk.yml

@@ -0,0 +1 @@
+sk:

data/config/locales/sl.yml

@@ -0,0 +1 @@
+sl:

data/config/locales/so.yml

@@ -0,0 +1 @@
+so:

data/config/locales/sq.yml

@@ -0,0 +1 @@
+sq:

data/config/locales/sr.yml

@@ -0,0 +1 @@
+sr:

data/config/locales/sv.yml

@@ -0,0 +1 @@
+sv:

data/config/locales/sw.yml

@@ -0,0 +1 @@
+sw:

data/config/locales/ta.yml

@@ -0,0 +1 @@
+ta:

data/config/locales/th.yml

@@ -0,0 +1 @@
+th:

data/config/locales/tk.yml

@@ -0,0 +1 @@
+tk:

data/config/locales/tr.yml

@@ -0,0 +1 @@
+tr:

data/config/locales/uk.yml

@@ -0,0 +1 @@
+uk:

data/config/locales/ur.yml

@@ -0,0 +1 @@
+ur:

data/config/locales/uz.yml

@@ -0,0 +1 @@
+uz:

data/config/locales/vi.yml

@@ -0,0 +1 @@
+vi:

data/config/locales/zh-hk.yml

@@ -0,0 +1 @@
+zh-hk:

data/config/locales/zh-tw.yml

@@ -0,0 +1 @@
+zh-tw:

data/config/locales/zh.yml

@@ -0,0 +1 @@
+zh:

data/lib/govuk_publishing_components/presenters/button_helper.rb

@@ -31,7 +31,8 @@ module GovukPublishingComponents
         @info_text = local_assigns[:info_text]
         @info_text_classes = %w[gem-c-button__info-text]
         if local_assigns[:margin_bottom]
-          @info_text_classes << "gem-c-button__info-text--bottom-margin"
+          margin_class = get_margin_bottom(local_assigns[:margin_bottom], true)
+          @info_text_classes << margin_class
         end
         @rel = local_assigns[:rel]
         @data_attributes = local_assigns[:data_attributes]
@@ -81,11 +82,21 @@ module GovukPublishingComponents
         css_classes << "gem-c-button--secondary-quiet" if secondary_quiet
         css_classes << "govuk-button--secondary" if secondary_solid
         css_classes << "govuk-button--warning" if destructive
-        css_classes << "gem-c-button--bottom-margin" if margin_bottom && !info_text
+        if margin_bottom && !info_text
+          margin_class = get_margin_bottom(margin_bottom, false)
+          css_classes << margin_class
+        end
         css_classes << "gem-c-button--inline" if inline_layout
         css_classes << classes if classes
         css_classes.join(" ")
       end
+
+      def get_margin_bottom(margin, info_text)
+        legacy_class = "gem-c-button--bottom-margin"
+        legacy_class = "gem-c-button__info-text--bottom-margin" if info_text
+
+        [*0..9].include?(margin) ? "govuk-!-margin-bottom-#{margin}" : legacy_class
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -249,6 +249,10 @@ module GovukPublishingComponents
         false
       end
 
+      def brexit_cta_lang_allow_list?
+        %w[en cy].include?(content_item["locale"])
+      end
+
       def parent_taxon_include?(taxon, taxon_list)
         if taxon.present?
           if taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| taxon_list.include?(taxon_item["content_id"]) }
@@ -294,6 +298,7 @@ module GovukPublishingComponents
 
       def show_brexit_cta?
         brexit_cta_taxon_allow_list? &&
+          brexit_cta_lang_allow_list? &&
           step_by_step_count.zero? &&
           !brexit_cta_exception?
       end

data/lib/govuk_publishing_components/presenters/public_layout_helper.rb

@@ -3,50 +3,34 @@ module GovukPublishingComponents
     class PublicLayoutHelper
       FOOTER_NAV = [
         {
-          title: "Prepare for Brexit",
+          title: "Coronavirus (COVID-19)",
           columns: 2,
           items: [
             {
-              href: "/business-uk-leaving-eu",
-              text: "Prepare your business or organisation for Brexit",
+              href: "/coronavirus",
+              text: "Coronavirus (COVID-19): guidance and support",
               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",
+                  track_action: "coronavirusLinks",
+                  track_label: "Coronavirus (COVID-19): guidance and support",
                 },
               },
             },
+          ],
+        },
+        {
+          title: "Brexit",
+          columns: 1,
+          items: [
             {
-              href: "/staying-uk-eu-citizen",
-              text: "Continue to live in the UK after Brexit",
+              href: "/transition",
+              text: "Check what you need to do",
               attributes: {
                 data: {
                   track_category: "footerClicked",
-                  track_action: "brexitLinks",
-                  track_label: "Continue to live in the UK after Brexit",
+                  track_action: "transitionLinks",
+                  track_label: "Check what you need to do",
                 },
               },
             },

data/lib/govuk_publishing_components/presenters/shared_helper.rb

@@ -31,6 +31,16 @@ module GovukPublishingComponents
         "span"
       end
 
+      def get_heading_size(option, fallback)
+        govuk_class = "govuk-heading-"
+
+        if %w[xl l m s].include? option
+          "#{govuk_class}#{option}"
+        else
+          "#{govuk_class}#{fallback}"
+        end
+      end
+
       def t_locale(content, options = {})
         # Check if the content string has a translation
         content_translation_available = translation_present?(content)

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.6.0".freeze
+  VERSION = "24.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.6.0
+  version: 24.9.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: jasmine_selenium_runner
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
@@ -592,6 +592,8 @@ files:
 - app/models/govuk_publishing_components/component_docs.rb
 - app/models/govuk_publishing_components/component_example.rb
 - app/models/govuk_publishing_components/shared_accessibility_criteria.rb
+- app/views/govuk_publishing_components/audit/_applications.html.erb
+- app/views/govuk_publishing_components/audit/_components.html.erb
 - app/views/govuk_publishing_components/audit/show.html.erb
 - app/views/govuk_publishing_components/component_guide/_application_stylesheet.html.erb
 - app/views/govuk_publishing_components/component_guide/component_doc/_call.html.erb
@@ -766,10 +768,70 @@ files:
 - app/views/govuk_publishing_components/components/related_navigation/_section.html.erb
 - app/views/layouts/govuk_publishing_components/application.html.erb
 - config/initializers/assets.rb
+- config/locales/ar.yml
+- config/locales/az.yml
+- config/locales/be.yml
+- config/locales/bg.yml
+- config/locales/bn.yml
+- config/locales/cs.yml
 - config/locales/cy.yml
+- config/locales/da.yml
+- config/locales/de.yml
+- config/locales/dr.yml
+- config/locales/el.yml
 - config/locales/en.yml
+- config/locales/es-419.yml
+- config/locales/es.yml
 - config/locales/et.yml
+- config/locales/fa.yml
+- config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/gd.yml
+- config/locales/gu.yml
+- config/locales/he.yml
+- config/locales/hi.yml
+- config/locales/hr.yml
+- config/locales/hu.yml
+- config/locales/hy.yml
+- config/locales/id.yml
+- config/locales/is.yml
+- config/locales/it.yml
+- config/locales/ja.yml
+- config/locales/ka.yml
+- config/locales/kk.yml
+- config/locales/ko.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/ms.yml
+- config/locales/mt.yml
+- config/locales/nl.yml
+- config/locales/no.yml
+- config/locales/pa-pk.yml
+- config/locales/pa.yml
+- config/locales/pl.yml
+- config/locales/ps.yml
+- config/locales/pt.yml
+- config/locales/ro.yml
+- config/locales/ru.yml
+- config/locales/si.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so.yml
+- config/locales/sq.yml
+- config/locales/sr.yml
+- config/locales/sv.yml
+- config/locales/sw.yml
+- config/locales/ta.yml
+- config/locales/th.yml
+- config/locales/tk.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
+- config/locales/ur.yml
+- config/locales/uz.yml
+- config/locales/vi.yml
+- config/locales/zh-hk.yml
+- config/locales/zh-tw.yml
+- config/locales/zh.yml
 - config/routes.rb
 - lib/generators/govuk_publishing_components/USAGE
 - lib/generators/govuk_publishing_components/component_generator.rb