govuk_publishing_components 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f20110c0dabc04645577702eafe2331de4c0f0e29f451c3f3c2afff0224564
-  data.tar.gz: 96066fa35b68926dfde283d683563c504b59beb723a563c4d2157c45415d6b32
+  metadata.gz: bc94cc7e07e90e46f3a4bf22d0fa0958a17cc405f49b5fb646cd87a9fb347ab4
+  data.tar.gz: 7de7916bd4f5411c1c2daf3708d1e11b046c0a971424985065fcc0c58f68226f
 SHA512:
-  metadata.gz: 48b785e1fb91b2d41359f540b03e82f871f8cb403fbe1953936a25dc6ae2ee2ec9c4752800d53f11841a74a7d5ea2dd97eadc92391c79d9fe727c8f20295cbc5
-  data.tar.gz: 9a9ddfbef2158e78e8aeb1e321798869a15373197b189c9cd4f220240050bbab23e0a41ead74808ab282133999576ca3c47e48db0083a60ae7a84db773e59409
+  metadata.gz: a4b1e28965f84d09984f45bdd218306d4724696a679c75f9b897d79f69eada7857df542851e63f252f63d5ef3b4a7773b0c6d1810e7621299e436d8e0701da42
+  data.tar.gz: d65aa55223fc7979381527c66f837417e9695a400504b9de07ff83fcbf0cba047c5932eaaf5e7906f463ec827d82869c0200af38a2829dce20a8a1d4740c28fa

data/app/assets/javascripts/govuk_publishing_components/components/feedback.js

@@ -35,6 +35,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       this.$closeForms.on('click', function(e) {
         e.preventDefault();
         toggleForm($(e.target).attr('aria-controls'));
+        trackEvent(getTrackEventParams($(this)));
         setInitialAriaAttributes();
         revealInitialPrompt();
       });

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

@@ -32,8 +32,8 @@
       <%= link_to contact_govuk_path, {
         class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--wrong js-toggle-form js-something-is-wrong',
         data: {
-          'track-category' => 'yesNoFeedbackForm',
-          'track-action' => 'ffWrongClick'
+          'track-category' => 'Onsite Feedback',
+          'track-action' => 'GOV.UK Open Form'
           },
           'aria-controls': 'something-is-wrong',
           'aria-expanded': false
@@ -47,8 +47,19 @@
     </div>
   </div>
 
-  <form action="/contact/govuk/problem_reports" id="something-is-wrong" class="gem-c-feedback__form js-feedback-form js-hidden" data-track-category="yesNoFeedbackForm" data-track-action="ffFormSubmit" method="post">
-    <a href="#" class="gem-c-feedback__close gem-c-feedback__js-show js-close-form" aria-controls="something-is-wrong" aria-expanded="true" role="button">Close</a>
+  <form action="/contact/govuk/problem_reports"
+    id="something-is-wrong"
+    class="gem-c-feedback__form js-feedback-form js-hidden"
+    data-track-category="Onsite Feedback"
+    data-track-action="GOV.UK Send Form"
+    method="post">
+    <a href="#"
+      class="gem-c-feedback__close gem-c-feedback__js-show js-close-form"
+      data-track-category="Onsite Feedback"
+      data-track-action="GOV.UK Close Form"
+      aria-controls="something-is-wrong"
+      aria-expanded="true"
+      role="button">Close</a>
 
     <div class="gem-c-feedback__grid-row">
       <div class="gem-c-feedback__column-two-thirds">
@@ -81,8 +92,19 @@
     </div>
   </form>
 
-  <form action="/contact/govuk/email-survey-signup" id="page-is-not-useful" class="gem-c-feedback__form gem-c-feedback__form--email gem-c-feedback__js-show js-feedback-form js-hidden" data-track-category="user_satisfaction_survey" data-track-action="banner_taken" method="post">
-    <a href="#" class="gem-c-feedback__close js-close-form" aria-controls="page-is-not-useful" aria-expanded="true" role="button">Close</a>
+  <form action="/contact/govuk/email-survey-signup"
+    id="page-is-not-useful"
+    class="gem-c-feedback__form gem-c-feedback__form--email gem-c-feedback__js-show js-feedback-form js-hidden"
+    data-track-category="yesNoFeedbackForm"
+    data-track-action="Send Form"
+    method="post">
+    <a href="#"
+      class="gem-c-feedback__close js-close-form"
+      data-track-category="yesNoFeedbackForm"
+      data-track-action="ffFormClose"
+      aria-controls="page-is-not-useful"
+      aria-expanded="true"
+      role="button">Close</a>
 
     <div class="gem-c-feedback__grid-row">
       <div class="gem-c-feedback__column-two-thirds">

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

@@ -2,7 +2,7 @@
 <% related_content = related_nav_helper.related_navigation %>
 <% if related_content.map(&:values).flatten.any? || related_nav_helper.other.flatten.any? %>
 <% random = SecureRandom.hex(4) %>
-  <aside class="gem-c-related-navigation" role="complementary">
+  <div class="gem-c-related-navigation">
     <h2 id="related-nav-related_items-<%= random %>"
         class="gem-c-related-navigation__main-heading"
         data-track-count="sidebarRelatedItemSection" >
@@ -13,17 +13,17 @@
       <% section.each do |section_title, links| %>
         <% if links.any? %>
           <% section_index += 1 %>
-          <% unless section_title === "related_items" %>
-            <h3 id="related-nav-<%= section_title %>-<%= random %>"
-              data-track-count="sidebarRelatedItemSection"
-              class="<%= related_nav_helper.section_css_class("gem-c-related-navigation__sub-heading", section_title) %>">
-              <%= related_nav_helper.construct_section_heading(section_title) %>
-            </h3>
-          <% end %>
           <nav role="navigation"
                class="gem-c-related-navigation__nav-section"
                aria-labelledby="related-nav-<%= section_title %>-<%= random %>"
                data-module="toggle">
+            <% unless section_title === "related_items" %>
+              <h3 id="related-nav-<%= section_title %>-<%= random %>"
+                data-track-count="sidebarRelatedItemSection"
+                class="<%= related_nav_helper.section_css_class("gem-c-related-navigation__sub-heading", section_title) %>">
+                <%= related_nav_helper.construct_section_heading(section_title) %>
+              </h3>
+            <% end %>
             <ul class="gem-c-related-navigation_link-list" data-module="track-click">
               <% constructed_link_array = [] %>
               <% section_link_limit = related_nav_helper.calculate_section_link_limit(links) %>
@@ -73,5 +73,5 @@
         <% end %>
       <% end %>
     <% end %>
-  </aside>
+  </div>
 <% end %>

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

@@ -1,8 +1,8 @@
 name: Related Navigation
 description: Component showing related content, including topics, guidance, collections and policies (where applicable)
 accessibility_criteria: |
-  - Should have a role of 'complementary' as it complements the main page content
   - Should have a role of 'navigation' on any navigation elements inside the component
+  - Should be marked up as navigation and not as tangential content
 shared_accessibility_criteria:
   - link
 accessibility_excluded_rules:

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '5.2.0'.freeze
+  VERSION = '5.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement