govuk_publishing_components 18.0.1 → 18.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ac861a8149611a3195f191382f8847a3716d257a7641d6ca36c5416df83379
-  data.tar.gz: b396032eb52b0846f2c4826e723212fa939ffbe03e8ddc0d3958b571fe55906d
+  metadata.gz: 0aea274f30d9c743a631169bf2e4793b3887a3479d0b48ef928ae9b6654483da
+  data.tar.gz: 994fe267ee6273b160defdc4f124c78773956147e3021f98b952b79db1483ecd
 SHA512:
-  metadata.gz: 9ed1d1a8e80cee99f8bd3386422d0302f9615ee654c5ebcd3144b0d75ac7407b347dec573de192177b7205500d221b4952513c1b09dbe22f5629990943a72193
-  data.tar.gz: 3c29336db5d8fbab1fbde5b06cea5f0e7b567de96f4e43a37b31cb405e16d182a606dcaa18489d916691f9f319de73cc09cf5885c853c60b29d73ea1e5305748
+  metadata.gz: 0e5512c8f700cfe2cdb3c8e69096012878d0cc0c4eb57153c8e9890a91082615b435121bb2937db094f9a7c4377acbe9c2315149c8dbf6617691d279128bb543
+  data.tar.gz: ad3f9632302f2e583029842fcdb105be963f475b280023f97e6c26c07926cc58d316a9fca07058583229bc87dfbb983dcf598484fdde2ffbb50ecdcf20699cad

data/app/assets/stylesheets/govuk_publishing_components/components/_related-navigation.scss

@@ -42,10 +42,10 @@
 .gem-c-related-navigation__link {
   list-style-type: none;
   margin-top: govuk-spacing(3);
-  @include govuk-font($size: 16, $weight: regular, $line-height: 1.5);
+  @include govuk-font($size: 16, $weight: regular, $line-height: 1.45);
 
   @include govuk-media-query($from: tablet) {
-    margin-top: 5px;
+    line-height: 1.28;
   }
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_share-links.scss

@@ -13,6 +13,7 @@ $share-button-height: 32px;
   display: inline-block;
   min-height: $share-button-height;
   padding-left: ($share-button-width + govuk-spacing(2));
+  padding-right: govuk-spacing(1);
   margin-bottom: govuk-spacing(2);
   font-size: $share-button-height / 2;
   line-height: $share-button-height;
@@ -48,7 +49,7 @@ $share-button-height: 32px;
   }
 
   .gem-c-share-links__list-item {
-    padding-left: 0;
+    padding-left: govuk-spacing(1);
     padding-right: ($share-button-width + govuk-spacing(2));
   }
 
@@ -58,6 +59,17 @@ $share-button-height: 32px;
   }
 }
 
+.gem-c-share-links--columns {
+  .gem-c-share-links__list {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .gem-c-share-links__list-item {
+    flex: 0 0 200px;
+  }
+}
+
 .gem-c-share-links--stacked {
   .gem-c-share-links__list-item {
     display: block;

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

@@ -7,7 +7,13 @@
     <% if local_assigns[:context] != :footer %>
       <h2 id="related-nav-related_items-<%= random %>"
           class="gem-c-related-navigation__main-heading"
-          data-track-count="sidebarRelatedItemSection">
+          data-track-count="sidebarRelatedItemSection"
+          <%= related_nav_helper.t_lang(
+              "components.related_#{local_assigns[:context]}_navigation.related_content",
+              default: 'components.related_navigation.related_content'
+            )
+          %>
+      >
         <%= t("components.related_#{local_assigns[:context]}_navigation.related_content",
               default: t('components.related_navigation.related_content')) %>
       </h2>

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

@@ -3,12 +3,21 @@
   title ||= false
   track_as_sharing ||= false
   stacked ||= false
+  columns ||= false
 
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
+
+  classes = %w(gem-c-share-links)
+  classes << "gem-c-share-links--stacked" if stacked
+  classes << "gem-c-share-links--columns" if columns
+  classes << brand_helper.brand_class
+
+  data_attributes ||= {}
+  data_attributes[:module] = 'track-click'
 %>
 <% if links.any? %>
-  <div class="gem-c-share-links <%= brand_helper.brand_class %> <%= 'gem-c-share-links--stacked' if stacked %>" data-module="track-click">
+  <%= tag.div(class: classes, data: data_attributes) do %>
     <% if title %>
       <h2 class="gem-c-share-links__title"><%= title %></h2>
     <% end %>
@@ -62,6 +71,9 @@
               <% elsif link[:icon] == 'youtube' %>
                 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="9 9 32 32"><path fill="currentColor" d="M9 9h32v32H9V9z"/><path fill="#FFF" d="M19.88 33.32V16.68L33.32 25l-13.44 8.32z"/></svg>
 
+              <% elsif link[:icon] == 'whatsapp' %>
+                <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M0 32V0h32v32H0zm20.839-13.894c-.263-.131-1.555-.766-1.796-.854-.24-.088-.416-.132-.59.131-.176.263-.68.855-.833 1.03-.153.176-.307.198-.57.066-.262-.131-1.109-.41-2.113-1.304-.78-.697-1.308-1.557-1.461-1.82-.153-.263-.016-.406.115-.536.118-.118.263-.308.394-.46.131-.154.175-.264.263-.44.088-.174.044-.328-.022-.46-.066-.131-.591-1.424-.81-1.95-.214-.513-.43-.443-.59-.452a10.506 10.506 0 0 0-.505-.009.964.964 0 0 0-.7.329c-.241.263-.92.899-.92 2.192 0 1.293.942 2.542 1.073 2.718.131.176 1.852 2.83 4.489 3.967.626.27 1.116.433 1.497.554.63.2 1.202.172 1.655.104.505-.075 1.555-.636 1.774-1.25.219-.613.219-1.14.153-1.25-.066-.108-.24-.174-.503-.306zm-4.795 6.547h-.003a8.73 8.73 0 0 1-4.449-1.219l-.319-.19-3.308.869.883-3.226-.208-.33a8.718 8.718 0 0 1-1.336-4.652c.001-4.819 3.922-8.74 8.744-8.74a8.68 8.68 0 0 1 6.179 2.564 8.686 8.686 0 0 1 2.557 6.183c-.002 4.82-3.922 8.74-8.74 8.74zm7.44-16.18a10.449 10.449 0 0 0-7.44-3.084c-5.796 0-10.513 4.717-10.516 10.516 0 1.853.484 3.662 1.404 5.256l-1.492 5.45 5.574-1.463a10.504 10.504 0 0 0 5.026 1.28h.004c5.796 0 10.514-4.717 10.516-10.515a10.455 10.455 0 0 0-3.077-7.44z" fill="currentColor"/></svg>
+
               <% else %>
                 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="9 9 32 32"><path fill="currentColor" d="M9 9h32v32H9V9z"/><path fill="#FFF" d="M12.84 14.12v19.2h5.76l5.76 5.76v-5.76h12.8v-19.2H12.84zm3.2 8.32H28.2V25H16.04v-2.56zm16 7.68h-16v-2.56h16v2.56zm1.92-10.24H16.04v-2.56h17.92v2.56z"/></svg>
 
@@ -70,5 +82,5 @@
         </li>
       <% end %>
     </ul>
-  </div>
+  <% end %>
 <% end %>

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

@@ -206,6 +206,52 @@ examples:
             - title: Pest Control
               base_path: /pest-control
               document_type: contact
+  with_different_languages:
+    description: |
+      Each link can have a `locale` parameter to set the correct `lang` attribute.
+
+      If the link locale is the same as the document locale, then the lang attribute won't be used. For example, `lang="en"` won't appear on a page written in English.
+    data:
+      content_item:
+        links:
+          ordered_related_items:
+            - title: Find an apprenticeship (French)
+              base_path: /apply-apprenticeship.fr
+              locale: fr
+          topics:
+            - title: Apprenticeships, 14 to 19 education and training for work (Korean)
+              base_path: /browse/education/find-course.ko
+              document_type: topic
+              locale: ko
+          topical_events:
+            - title: UK-China High-Level People to People Dialogue 2017 (Spanish)
+              base_path: /government/topical-events/uk-china-high-level-people-to-people-dialogue-2017.es
+              document_type: topical_event
+              locale: es
+          related:
+            - title: Jam producers (Spanish)
+              base_path: /jam-producers.es
+              document_type: contact
+              locale: es
+          related_statistical_data_sets:
+            - title: International road fuel prices (Italian)
+              base_path: /government/statistical-data-sets/comparisons-of-industrial-and-domestic-energy-prices-monthly-figures.it
+              document_type: statistical_data_set
+              locale: it
+          document_collections:
+            - title: Recruit an apprentice (formerly apprenticeship vacancies)
+              base_path: /government/collections/apprenticeship-vacancies
+              document_type: document_collection
+              locale: en
+          world_locations:
+            - title: South Sudan (Arabic)
+              base_path: /world/south-sudan/news.ar
+              locale: ar
+        details:
+          external_related_links:
+            - url: "http://media.slc.co.uk/sfe/1718/ft/sfe_terms_and_conditions_guide_1718_d.pdf"
+              title: "Student loans: terms and conditions 2017 to 2018 (PDF, 136KB)"
+              locale: en
   with_all_related-content:
     data:
       content_item:

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

@@ -91,6 +91,42 @@ examples:
           icon: 'twitter'
         },
       ]
+  arrange_in_columns:
+    description: Share links are arranged in even columns that adjust according to the available space. This option uses flexbox, which is not fully supported in IE <= 10, so in those browsers the columns are not even.
+    data:
+      columns: true
+      links: [
+        {
+          href: '/facebook-share-link',
+          text: 'Facebook',
+          icon: 'facebook'
+        },
+        {
+          href: '/twitter-share-link',
+          text: 'Twitter',
+          icon: 'twitter'
+        },
+        {
+          href: '/email-share-link',
+          text: 'Email',
+          icon: 'email'
+        },
+        {
+          href: '/flickr-share-link',
+          text: 'Flickr',
+          icon: 'flickr'
+        },
+        {
+          href: '/instagram-share-link',
+          text: 'Instagram',
+          icon: 'instagram'
+        },
+        {
+          href: '/linkedin-share-link',
+          text: 'Linkedin',
+          icon: 'linkedin'
+        },
+      ]
   with_all_icons:
     data:
       stacked: true
@@ -126,6 +162,11 @@ examples:
           text: 'Linkedin',
           icon: 'linkedin'
         },
+        {
+          href: '/whatsapp-share-link',
+          text: 'WhatsApp',
+          icon: 'whatsapp'
+        },
         {
           href: '/other-share-link',
           text: 'Anything else that might be included that could have quite a long name',

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

@@ -28,6 +28,7 @@
           link[:path],
           class: related_nav_helper.section_css_class("gem-c-related-navigation__section-link", section_title, link),
           rel: link[:rel],
+          lang: related_nav_helper.t_locale_check(link[:locale]),
           data: {
             track_category: 'relatedLinkClicked',
             track_action: "#{section_index}.#{index} #{related_nav_helper.construct_section_heading(section_title) || t('components.related_navigation.related_content')}",

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -90,8 +90,48 @@ module GovukPublishingComponents
         related_navigation.flat_map(&:last).any?
       end
 
+      def t_locale(content, options = {})
+        # Check if the content string has a translation
+        content_translation_available = translation_present?(content)
+
+        # True, return locale
+        this_locale = I18n.locale if content_translation_available
+        # If false, return default locale
+        this_locale = I18n.default_locale unless content_translation_available
+
+        # Check if default string passed in
+        if options[:default].present?
+          # Check if the default string has a translation
+          default_translation_available = translation_present?(options[:default])
+          # If true, return locale
+          this_locale = I18n.locale if default_translation_available
+          # If false, return default_locale
+          this_locale = I18n.default_locale unless default_translation_available
+        end
+
+        this_locale
+      end
+
+      def t_lang(content, options = {})
+        locale = t_locale(content, options)
+        "lang=#{locale}" unless locale.eql?(I18n.locale)
+      end
+
+      def t_locale_check(locale)
+        locale.presence unless locale.to_s.eql?(I18n.locale.to_s)
+      end
+
     private
 
+      def translation_present?(content)
+        default_string = 'This is a string to act as a default for the `I18n.translate` method. Comparing the result reveals if there is a translation in the i18n files.'
+        I18n.translate(
+          content,
+          default: default_string,
+          fallback: false
+        ) != default_string
+      end
+
       def related_items
         related_quick_links = content_item_details_for('quick_links')
 
@@ -184,7 +224,13 @@ module GovukPublishingComponents
           links = links.find_all { |link| link['document_type'] == only }
         end
 
-        links.map { |link| { path: link['base_path'], text: link['title'] } }
+        links.map { |link|
+          {
+            path: link['base_path'],
+            text: link['title'],
+            locale: link['locale'],
+          }
+        }
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '18.0.1'.freeze
+  VERSION = '18.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 18.0.1
+  version: 18.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters