govuk_publishing_components 21.62.0 → 21.64.0

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

@@ -2,12 +2,16 @@
   size ||= ""
   no_border ||= false
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  classes = %w(gem-c-search gem-c-search--on-white)
+  classes = %w(gem-c-search)
   classes << (shared_helper.get_margin_top)
   classes << (shared_helper.get_margin_bottom) if local_assigns[:margin_bottom]
   classes << "gem-c-search--large" if size == 'large'
   classes << "gem-c-search--no-border" if no_border
-  classes << "gem-c-search--on-govuk-blue" if local_assigns[:on_govuk_blue].eql?(true)
+  if local_assigns[:on_govuk_blue].eql?(true)
+    classes << "gem-c-search--on-govuk-blue"
+  else
+    classes << "gem-c-search--on-white"
+  end
   classes << "gem-c-search--separate-label" if local_assigns.include?(:inline_label)
 
   value ||= ""

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

@@ -262,3 +262,21 @@ examples:
         - link:
             text: 'Criteria'
             description: 'no url provided, just text'
+  with_locale_specified:
+    description: |
+      The component is used on translated pages that don’t have a translation for the document link text or the metadata. This means that it could display the fallback English string if the translate method can’t find an appropriate translation. This makes sure that the lang can be set to ensure that browsers understand which parts of the page are in each language.
+
+      Locales can be set separately for the document link text and individual metadata items. To set link text locale, pass a locale attribute along with the link object. To set metadata locale, pass a locale attribute containing a parallel object to your metadata (depending on which metadata have translations and which need a lang attribute to specify that they are in a different language).
+
+      The lang attribute must be set to a [valid BCP47 string](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang#Language_tag_syntax). A valid code can be the two or three letter language code - for example, English is en or eng, Korean is ko or kor - but if in doubt please check.
+    data:
+      items:
+      - link:
+          text: 'Tryloywder Uwch Staff Ysgrifennydd Gwladol Cymru Ionawr-Mawrth 2020'
+          path: '/government/publications/office-of-the-secretary-of-state-for-wales-senior-staff-transparency-january-march-2020'
+          locale: 'cy'
+        metadata:
+          public_updated_at: 2016-06-27 10:29:44
+          document_type: 'Data tryloywder'
+          locale:
+            document_type: 'cy'

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

@@ -10,7 +10,7 @@
     data-track-action="GOV.UK Close Form"
     aria-controls="something-is-wrong"
     aria-expanded="true"
-    role="button">Close</a>
+    role="button"><%= t("components.feedback.close", default: "Close") %></a>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -18,12 +18,12 @@
 
       <input type="hidden" name="url" value="<%= url_without_pii %>">
 
-      <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
-      <p id="feedback_explanation" class="gem-c-feedback__form-paragraph">Don’t include personal or financial information like your National Insurance number or credit card details.</p>
+      <h3 class="gem-c-feedback__form-heading"><%= t("components.feedback.help_us_improve_govuk", default: "Help us improve GOV.UK") %></h3>
+      <p id="feedback_explanation" class="gem-c-feedback__form-paragraph"><%= t("components.feedback.dont_include_personal_info", default: "Don’t include personal or financial information like your National Insurance number or credit card details.") %></p>
 
       <%= render "govuk_publishing_components/components/input", {
         label: {
-          text: "What were you doing?"
+          text: t("components.feedback.what_doing", default: "What were you doing?")
         },
         name: "what_doing",
         describedby: "feedback_explanation"
@@ -31,13 +31,13 @@
 
       <%= render "govuk_publishing_components/components/input", {
         label: {
-          text: "What went wrong?"
+          text: t("components.feedback.what_wrong", default: "What went wrong?")
         },
         name: "what_wrong"
       } %>
 
       <%= render "govuk_publishing_components/components/button", {
-        text: "Send"
+        text: t("components.feedback.send", default: "Send")
       } %>
     </div>
   </div>

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

@@ -10,7 +10,7 @@
     data-track-action="ffFormClose"
     aria-controls="page-is-not-useful"
     aria-expanded="true"
-    role="button">Close</a>
+    role="button"><%= t("components.feedback.close", default: "Close") %></a>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds" id="survey-wrapper">
@@ -19,12 +19,12 @@
       <input name="email_survey_signup[survey_id]" type="hidden" value="footer_satisfaction_survey">
       <input name="email_survey_signup[survey_source]" type="hidden" value="<%= path_without_pii %>">
 
-      <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
-      <p id="survey_explanation" class="gem-c-feedback__form-paragraph">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.</p>
+      <h3 class="gem-c-feedback__form-heading"><%= t("components.feedback.help_us_improve_govuk", default: "Help us improve GOV.UK") %></h3>
+      <p id="survey_explanation" class="gem-c-feedback__form-paragraph"><%= t("components.feedback.more_about_visit", default: "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.") %></p>
 
       <%= render "govuk_publishing_components/components/input", {
         label: {
-          text: "Email address"
+          text: t("components.feedback.email_address", default: "Email address")
         },
         name: "email_survey_signup[email_address]",
         type: "email",
@@ -32,8 +32,8 @@
         describedby: "survey_explanation"
       } %>
 
-      <%= render "govuk_publishing_components/components/button", {
-        text: "Send me the survey",
+       <%= render "govuk_publishing_components/components/button", {
+        text: t("components.feedback.send_me_survey", default: "Send me the survey"),
       } %>
     </div>
   </div>

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

@@ -4,9 +4,9 @@
 
 <div class="gem-c-feedback__prompt gem-c-feedback__js-show js-prompt" tabindex="-1">
   <div class="gem-c-feedback__prompt-questions js-prompt-questions">
-    <h2 class="gem-c-feedback__prompt-question">Is this page useful?</h2>
+    <h2 class="gem-c-feedback__prompt-question"><%= t("components.feedback.is_this_page_useful", default: "Is this page useful?") %></h2>
     <!-- Maybe button exists only to try and capture clicks by bots -->
-    <%= link_to contact_govuk_path, {
+    <%= link_to t("components.feedback.maybe", default: "Maybe"), contact_govuk_path, {
         class: 'gem-c-feedback__prompt-link',
         data: {
           'track-category' => 'yesNoFeedbackForm',
@@ -17,9 +17,7 @@
         style: 'display: none;',
         hidden: 'hidden',
         'aria-hidden': 'true',
-      } do %>
-        Maybe
-    <% end %>
+      } %>
     <ul class="gem-c-feedback__option-list">
       <li class="gem-c-feedback__option-list-item">
         <%= link_to contact_govuk_path, {
@@ -31,7 +29,7 @@
           'aria-expanded': false,
           role: 'button',
         } do %>
-          Yes <span class="govuk-visually-hidden">this page is useful</span>
+          <%= t("components.feedback.yes", default: "Yes") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_useful", default: "this page is useful") %></span>
         <% end %>
       </li>
       <li class="gem-c-feedback__option-list-item">
@@ -45,13 +43,13 @@
           'aria-expanded': false,
           role: 'button',
         } do %>
-          No <span class="govuk-visually-hidden">this page is not useful</span>
+          <%= t("components.feedback.no", default: "No") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_not_useful", default: "this page is not useful") %></span>
         <% end %>
       </li>
     </ul>
   </div>
-  <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-success js-prompt-success js-hidden" tabindex="-1">
-    Thank you for your feedback
+  <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-success js-prompt-success js-hidden" role="alert">
+    <%= t("components.feedback.thank_you_for_feedback", default: "Thank you for your feedback") %>
   </div>
   <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-questions--something-is-wrong js-prompt-questions">
     <%= link_to contact_govuk_path, {
@@ -64,7 +62,7 @@
       'aria-expanded': false,
       role: 'button',
     } do %>
-      Is there anything wrong with this page?
+      <%= t("components.feedback.anything_wrong", default: "Is there anything wrong with this page?") %>
     <% end %>
   </div>
 </div>

data/config/locales/en.yml

@@ -36,6 +36,24 @@ en:
       or: 'or'
     contents_list:
       contents: Contents
+    feedback:
+      is_this_page_useful: "Is this page useful?"
+      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"
+      anything_wrong: "Is there anything wrong 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."
+      dont_include_personal_info: "Don’t include personal or financial information like your National Insurance number or credit card details."
+      email_address: "Email address"
+      what_doing: "What were you doing?"
+      what_wrong: "What went wrong?"
+      send_me_survey: "Send me the survey"
+      send: "Send"
     organisation_schema:
       all_content_search_description: "Find all content from %{organisation}"
     radio:

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -18,6 +18,7 @@ module GovukPublishingComponents
       end
 
       def priority_breadcrumbs
+        return if hide_priority_breadcrumb?
         return parent_item_navigation.priority_breadcrumbs if content_item_navigation.html_publication_with_parent?
 
         content_item_navigation.priority_breadcrumbs
@@ -25,6 +26,10 @@ module GovukPublishingComponents
 
     private
 
+      def hide_priority_breadcrumb?
+        content_item_navigation.content_tagged_to_current_step_by_step? && content_item_navigation.tagged_to_brexit?
+      end
+
       def best_match_option
         return content_item_options unless content_item_navigation.html_publication_with_parent?
 

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -12,18 +12,22 @@ module GovukPublishingComponents
       }.freeze
 
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
-      def self.call(content_item)
-        new(content_item).breadcrumbs
+      def self.call(content_item, query_parameters = nil)
+        new(content_item, query_parameters).breadcrumbs
       end
 
-      attr_reader :content_item
+      attr_reader :content_item, :query_parameters
 
-      def initialize(content_item)
+      def initialize(content_item, query_parameters = nil)
         @content_item = content_item
+        @query_parameters = query_parameters
       end
 
       def taxon
-        @taxon ||= priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
+        @taxon ||= begin
+          default_taxon = priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
+          preferred_taxon || default_taxon
+        end
       end
 
       def breadcrumbs
@@ -39,6 +43,12 @@ module GovukPublishingComponents
 
     private
 
+      def preferred_taxon
+        if preferred_priority_taxon
+          priority_taxons.find { |t| t["content_id"] == preferred_priority_taxon }
+        end
+      end
+
       def priority_taxons
         return [] unless content_item["links"].is_a?(Hash)
 
@@ -57,6 +67,10 @@ module GovukPublishingComponents
       def priority_taxon?(taxon)
         PRIORITY_TAXONS.values.include?(taxon["content_id"])
       end
+
+      def preferred_priority_taxon
+        query_parameters["priority-taxon"] if query_parameters
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -30,7 +30,7 @@ module GovukPublishingComponents
       end
 
       def priority_breadcrumbs
-        @priority_breadcrumbs ||= ContentBreadcrumbsBasedOnPriority.call(content_item)
+        @priority_breadcrumbs ||= ContentBreadcrumbsBasedOnPriority.call(content_item, query_parameters)
       end
 
       def topic_breadcrumbs

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.62.0".freeze
+  VERSION = "21.64.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.62.0
+  version: 21.64.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -419,6 +419,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js
 - app/assets/javascripts/govuk_publishing_components/lib/current-location.js
 - app/assets/javascripts/govuk_publishing_components/lib/govspeak/barchart-enhancement.js
+- app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js
 - app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js
 - app/assets/javascripts/govuk_publishing_components/lib/header-navigation.js
 - app/assets/javascripts/govuk_publishing_components/lib/primary-links.js
@@ -428,8 +429,9 @@ files:
 - 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
-- app/assets/javascripts/govuk_publishing_components/vendor/magna-charta.min.js
 - app/assets/javascripts/govuk_publishing_components/vendor/modernizr.js
+- app/assets/javascripts/govuk_publishing_components/vendor/polyfills/closest.js
+- app/assets/javascripts/govuk_publishing_components/vendor/polyfills/indexOf.js
 - app/assets/stylesheets/component_guide/application.scss
 - app/assets/stylesheets/component_guide/print.scss
 - app/assets/stylesheets/govuk_publishing_components/_all_components.scss

data/app/assets/javascripts/govuk_publishing_components/vendor/magna-charta.min.js

@@ -1,4 +0,0 @@
-/*! Magna Charta - v3.0.0 - 2012-12-04
-* https://github.com/alphagov/magna-charta
- */
-(function(e){var t=function(){this.init=function(t,n){var r={outOf:65,applyOnInit:!0,toggleText:"Toggle between chart and table",autoOutdent:!1,outdentAll:!1};this.options=e.extend({},r,n);var i=function(){var e,t=3,n=document.createElement("div"),r=n.getElementsByTagName("i");do n.innerHTML="<!--[if gt IE "+ ++t+"]><i></i><![endif]-->";while(t<10&&r[0]);return t>4?t:e}();return this.ENABLED=!(i&&i<8),this.$table=t,this.$graph=e("<div/>").attr("aria-hidden","true"),this.$graph.attr("class",this.$table.attr("class")).addClass("mc-chart"),this.options.stacked=this.$table.hasClass("mc-stacked"),this.options.negative=this.$table.hasClass("mc-negative"),this.options.multiple=!this.options.stacked&&(this.$table.hasClass("mc-multiple")||this.$table.find("tbody tr").first().find("td").length>2),this.options.autoOutdent=this.options.autoOutdent||this.$table.hasClass("mc-auto-outdent"),this.options.outdentAll=this.options.outdentAll||this.$table.hasClass("mc-outdented"),this.options.multiple&&this.$graph.addClass("mc-multiple"),this.options.hasCaption=!!this.$table.find("caption").length,this.ENABLED&&(this.apply(),this.options.applyOnInit||this.toggle()),this}};t.prototype.construct={},t.prototype.construct.thead=function(){var t=e("<div />",{"class":"mc-thead"}),n=e("<div />",{"class":"mc-tr"}),r="";return this.$table.find("th").each(function(t,n){r+='<div class="mc-th">',r+=e(n).html(),r+="</div>"}),n.append(r),t.append(n),t},t.prototype.construct.tbody=function(){var t=e("<div />",{"class":"mc-tbody"}),n="";return this.$table.find("tbody tr").each(function(n,r){var i=e("<div />",{"class":"mc-tr"}),s="";e(r).find("td").each(function(t,n){s+='<div class="mc-td">',s+=e(n).html(),s+="</div>"}),i.append(s),t.append(i)}),t},t.prototype.construct.caption=function(){var e=this.$table.find("caption");return e.clone()},t.prototype.construct.toggleLink=function(){var t=this;return e("<a />",{href:"#","class":"mc-toggle-link",text:this.options.toggleText}).on("click",function(e){t.toggle(e)})},t.prototype.constructChart=function(){var e=this.construct.thead.call(this),t=this.construct.tbody.call(this),n=this.construct.toggleLink.call(this);if(this.options.hasCaption){var r=this.construct.caption.call(this);this.$graph.append(r)}this.$table.before(n),this.$graph.append(e),this.$graph.append(t)},t.prototype.apply=function(){this.ENABLED&&(this.constructChart(),this.addClassesToHeader(),this.calculateMaxWidth(),this.applyWidths(),this.insert(),this.$table.addClass("visually-hidden"),this.applyOutdent())},t.prototype.toggle=function(e){this.$graph.toggle(),this.$table.toggleClass("visually-hidden"),e&&e.preventDefault()},t.prototype.utils={isFloat:function(e){return!isNaN(parseFloat(e))},stripValue:function(e){var t=new RegExp("\\,|£|%|[a-z]","gi");return e.replace(t,"")},returnMax:function(e){var t=0;for(var n=0;n<e.length;n++)e[n]>t&&(t=e[n]);return t},isNegative:function(e){return e<0}},t.prototype.addClassesToHeader=function(){var t=this.$graph.find(".mc-th").filter(":not(:first)");this.options.stacked&&(t.last().addClass("mc-stacked-header mc-header-total"),t=t.filter(":not(:last)")),t.addClass("mc-key-header").filter(":not(.mc-stacked-header)").each(function(t,n){e(n).addClass("mc-key-"+(t+1))})},t.prototype.calculateMaxWidth=function(){var t=this,n=[],r=0;this.$graph.find(".mc-tr").each(function(i,s){var o=e(s),u=o.find(".mc-td:not(:first)");if(t.options.stacked){var a=u.last().addClass("mc-stacked-total");u=u.filter(":not(:last)")}o.find(".mc-td:first").addClass("mc-key-cell");var f=0;u.each(function(i,s){var o=e(s).addClass("mc-bar-cell").addClass("mc-bar-"+(i+1)),u=t.utils.stripValue(o.text());if(t.utils.isFloat(u)){var a=parseFloat(u,10),l=Math.abs(a);a===0&&o.addClass("mc-bar-zero"),t.options.negative&&(t.utils.isNegative(a)?(o.addClass("mc-bar-negative"),l>r&&(r=l)):o.addClass("mc-bar-positive")),a=l,t.options.stacked?f+=a:(f=a,n.push(a))}}),t.options.stacked&&n.push(f)});var i={};return i.max=parseFloat(t.utils.returnMax(n),10),i.single=parseFloat(this.options.outOf/i.max,10),this.options.negative&&(i.marginLeft=parseFloat(r,10)*i.single,i.maxNegative=parseFloat(r,10)),i},t.prototype.applyWidths=function(){this.dimensions=this.calculateMaxWidth();var t=this;this.$graph.find(".mc-tr").each(function(n,r){var i=e(r),s=i.find(".mc-bar-cell:not(.mc-bar-zero)").length;i.find(".mc-bar-cell").each(function(n,r){var i=e(r),s=parseFloat(t.utils.stripValue(i.text()),10),o=s*t.dimensions.single,u=Math.abs(s),a=Math.abs(o);if(t.options.negative)if(i.hasClass("mc-bar-positive"))i.css("margin-left",t.dimensions.marginLeft+"%");else if(u<t.dimensions.maxNegative){var f=(t.dimensions.maxNegative-u)*t.dimensions.single;i.css("margin-left",f+"%")}i.wrapInner("<span />"),i.css("width",a+"%")})})},t.prototype.insert=function(){this.$table.after(this.$graph)},t.prototype.applyOutdent=function(){var t=this,n=this.$graph.find(".mc-bar-cell");this.$graph.find(".mc-bar-cell").each(function(n,r){var i=e(r),s=parseFloat(t.utils.stripValue(i.text()),10),o=i.children("span"),u=o.width()+10,a=i.width(),f=parseFloat(i[0].style.width,10),l=i.height();t.options.stacked?u>a&&s>0&&i.addClass("mc-value-overflow"):(s===0&&i.addClass("mc-bar-outdented"),t.options.autoOutdent&&u>a||t.options.outdentAll?(i.addClass("mc-bar-outdented"),o.css({"margin-left":"100%",display:"inline-block"})):i.addClass("mc-bar-indented"))})},e.magnaCharta=function(e,n){return(new t).init(e,n)}})(jQuery);