govuk_publishing_components 13.5.3 → 13.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6f0a6a88e800116e375c194590701993f18afb31af15c9f618b5c262d7cd9e
-  data.tar.gz: fdf68a7b9d3242654437d6c720522f1bdb81ede1986067fb3b005e925e97228d
+  metadata.gz: 93fab2d996e30368c246e96ba84d3c6f8034c619dee13791b3f209ae67ded1cb
+  data.tar.gz: fbaff11c00bd6487bc157fc927a173011cfc32857c7476705182d7ab724c1d1e
 SHA512:
-  metadata.gz: f518f82c42467d896db37a6f8fa4598859eaf31ac46f8a1d53f10e46882e489956f04295b14b0d7152c7e33ae423f2fbcb771146febcd91f384917604c898d8f
-  data.tar.gz: 18e35556379c6b172aab0941d0f3fea45476366bf79ca1be0a32e91315d265060958d7787383f51e982ea610df9e6bf0b5c0b129e811dd68beac18b81c4dba0e
+  metadata.gz: fad9c0567d6e603a133066c0a03f4a31419b51baf7e04a2e618d1d5efd5f2b0d20019fff7814d79685b4f011685a73530182741107077b481f1f91a6941be6fc
+  data.tar.gz: 90d2b3b7226d9e831789704b7477684c90e9469ec94316a87b59c1fb8a43cd7bb16d59342250469c184fa5fcea4618f2091591dfb46063c30633f813a88d5ce3

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss

@@ -54,3 +54,9 @@
   background-color: govuk-colour("yellow");
   color: govuk-colour("black");
 }
+
+.govuk-header__navigation-item--collapsed-menu-only {
+  @include govuk-media-query($from: desktop) {
+    display: none;
+  }
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss

@@ -1 +1,14 @@
 @import "govuk-frontend/components/panel/panel";
+
+.gem-c-panel__prepend {
+  @include govuk-font($size: 24, $weight: bold);
+  margin-bottom: govuk-spacing(3);
+}
+
+.gem-c-panel__append {
+  @include govuk-font($size: 24, $weight: bold);
+}
+
+.gem-c-panel__prepend ~ .govuk-panel__title {
+  margin-bottom: govuk-spacing(3);
+}

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

@@ -7,12 +7,12 @@
   end
 
   email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
-  path_without_pii = utf_encode(request.original_url.gsub(email_regex, '[email]'))
-  url_without_pii = utf_encode(request.fullpath.gsub(email_regex, '[email]'))
+  url_without_pii = utf_encode(request.original_url.gsub(email_regex, '[email]'))
+  path_without_pii = utf_encode(request.fullpath.gsub(email_regex, '[email]'))
 %>
 
 <div class="gem-c-feedback <%= margin_top_class %>" data-module="feedback">
   <%= render "govuk_publishing_components/components/feedback/yes_no_banner" %>
-  <%= render "govuk_publishing_components/components/feedback/problem_form", path_without_pii: path_without_pii %>
-  <%= render "govuk_publishing_components/components/feedback/survey_signup_form", path_without_pii: path_without_pii, url_without_pii: url_without_pii %>
+  <%= render "govuk_publishing_components/components/feedback/problem_form", url_without_pii: url_without_pii %>
+  <%= render "govuk_publishing_components/components/feedback/survey_signup_form", url_without_pii: url_without_pii, path_without_pii: path_without_pii %>
 </div>

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

@@ -40,7 +40,8 @@
     <nav>
       <ul id="navigation" class="govuk-header__navigation govuk-header__navigation--end" aria-label="Top Level Navigation">
         <% navigation_items.each_with_index do |item, index| %>
-          <li class="govuk-header__navigation-item <%= "govuk-header__navigation-item--active" if item[:active] %>">
+          <li class="govuk-header__navigation-item <%= "govuk-header__navigation-item--active" if item[:active] %>
+            <%= "govuk-header__navigation-item--collapsed-menu-only" if item[:show_only_in_collapsed_menu] %>">
             <%= link_to(
               item[:text],
               item[:href],

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

@@ -1,13 +1,25 @@
 <%
   description ||= false
+  prepend ||= false
+  append ||= false
 %>
 <div class="gem-c-panel govuk-panel govuk-panel--confirmation">
+  <% if prepend %>
+    <div class="gem-c-panel__prepend">
+      <%= prepend %>
+    </div>
+  <% end %>
   <h2 class="govuk-panel__title">
     <%= title %>
   </h2>
   <% if description %>
     <div class="govuk-panel__body">
-      <%= description %> 
+      <%= description %>
+    </div>
+  <% end %>
+  <% if append %>
+    <div class="gem-c-panel__append">
+      <%= append %>
     </div>
   <% end %>
 </div>

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

@@ -31,6 +31,9 @@ examples:
         active: true
       - text: Navigation item 2
         href: "#2"
+      - text: Hidden on desktop
+        href: "#3"
+        show_only_in_collapsed_menu: true
   full_width:
     description: |
       This is difficult to preview because the preview windows are constrained, but the header will stretch to the size of its container.

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

@@ -14,3 +14,12 @@ examples:
   no_description:
     data:
       title: Content has been published
+  with_prepend:
+    data:
+      prepend: The clocks go forward
+      title: 31 March
+  with_prepend_and_append:
+    data:
+      prepend: The next bank holiday in England and Wales is
+      title: 19 April
+      append: Good Friday

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

@@ -16,7 +16,7 @@
     <div class="gem-c-feedback__column-two-thirds">
       <div class="gem-c-feedback__error-summary gem-c-feedback__js-show js-hidden js-errors" tabindex="-1"></div>
 
-      <input type="hidden" name="url" value="<%= path_without_pii %>">
+      <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>

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

@@ -17,7 +17,7 @@
       <div class="gem-c-feedback__error-summary js-hidden js-errors" tabindex="-1"></div>
 
       <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 %>">
+      <input name="email_survey_signup[survey_source]" type="hidden" value="<%= url_without_pii %>">
       <input name="email_survey_signup[ga_client_id]" type="hidden" value="1627485790.1515403243">
 
       <h3 class="gem-c-feedback__form-heading">Help us improve GOV.UK</h3>
@@ -35,7 +35,7 @@
       <%= render "govuk_publishing_components/components/button", {
         text: "Send me the survey"
       } %>
-      <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= url_without_pii %>&amp;gcl=1627485790.1515403243" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>
+      <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= path_without_pii %>&amp;gcl=1627485790.1515403243" class="gem-c-feedback__email-link govuk-link" id="take-survey" target="_blank" rel="noopener noreferrer">Don’t have an email address?</a>
     </div>
   </div>
 </form>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '13.5.3'.freeze
+  VERSION = '13.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 13.5.3
+  version: 13.5.4
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govspeak