Gemfile.lock

@@ -149,7 +149,7 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    cgi (0.5.2)
+    cgi (0.5.1)
     childprocess (5.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
@@ -225,10 +225,10 @@ GEM
       raabro (~> 1.4)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    govuk-components (6.4.0)
+    govuk-components (6.2.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
-      view_component (>= 4.9, < 4.13)
+      view_component (>= 4.9, < 4.10)
     govuk_design_system_formbuilder (5.7.1)
       actionview (>= 6.1)
       activemodel (>= 6.1)
@@ -240,7 +240,7 @@ GEM
     hashdiff (1.1.0)
     html-attributes-utils (1.0.2)
       activesupport (>= 6.1.4.4)
-    i18n (1.15.2)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iniparse (1.5.0)
@@ -551,7 +551,7 @@ GEM
       activerecord (>= 6.1)
     uri (1.1.1)
     useragent (0.16.11)
-    view_component (4.12.0)
+    view_component (4.9.0)
       actionview (>= 7.1.0)
       activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)
@@ -571,7 +571,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.10)
-    websocket-driver (0.8.2)
+    websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

app/views/layouts/_footer.html.erb

@@ -1,44 +1,42 @@
-<footer class="govuk-footer" role="contentinfo">
+<%= govuk_footer do |footer| %>
-  <div class="govuk-width-container">
+  <%= footer.with_meta do %>
-    <div class="govuk-footer__meta">
+    <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
-      <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+      <h2 class="govuk-heading-m">Get help with this service</h2>
-        <h2 class="govuk-heading-m">Get help with this service</h2>
+      <div class="govuk-grid-row">
-        <div class="govuk-grid-row">
+        <div class="govuk-grid-column-one-third-from-desktop">
-          <div class="govuk-grid-column-one-third-from-desktop">
+          <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Online helpdesk</h3>
-            <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Online helpdesk</h3>
+          <p class="govuk-body govuk-!-font-size-16">
-            <p class="govuk-body govuk-!-font-size-16">
+            <%= govuk_link_to("CORE helpdesk (opens in a new tab)", GlobalConstants::HELPDESK_URL, class: "govuk-footer__link", rel: "noreferrer noopener", target: "_blank") %>
-              <%= govuk_link_to("CORE helpdesk (opens in a new tab)", GlobalConstants::HELPDESK_URL, class: "govuk-footer__link", rel: "noreferrer noopener", target: "_blank") %>
+          </p>
-            </p>
-          </div>
-
-          <div class="govuk-grid-column-one-third-from-desktop">
-            <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Telephone</h3>
-            <ul class="govuk-list govuk-!-font-size-16">
-              <li>0333 202 5084</li>
-              <li>Monday to Friday, 9am to 5:30pm<br>(except public holidays)</li>
-            </ul>
-          </div>
         </div>
 
-        <h2 class="govuk-visually-hidden">Helpful links</h2>
+        <div class="govuk-grid-column-one-third-from-desktop">
-        <ul class="govuk-footer__inline-list govuk-!-margin-top-6 govuk-!-margin-bottom-0">
+          <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Telephone</h3>
-          <li class="govuk-footer__inline-list-item">
+          <ul class="govuk-list govuk-!-font-size-16">
-            <%= govuk_link_to("Accessibility statement", accessibility_statement_path, class: "govuk-footer__link") %>
+            <li>0333 202 5084</li>
-          </li>
+            <li>Monday to Friday, 9am to 5:30pm<br>(except public holidays)</li>
-          <li class="govuk-footer__inline-list-item">
+          </ul>
-            <%= govuk_link_to("Privacy notice", privacy_notice_path, class: "govuk-footer__link") %>
+        </div>
-          </li>
-          <li class="govuk-footer__inline-list-item">
-            <%= govuk_link_to("View source code", "https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data", class: "govuk-footer__link") %>
-          </li>
-          <li class="govuk-footer__inline-list-item">
-            <%= govuk_link_to("Cookies", cookies_path, class: "govuk-footer__link") %>
-          </li>
-        </ul>
-      </div>
-      <div class="govuk-footer__meta-item">
-        <a class="govuk-footer__link govuk-footer__copyright-logo govuk-!-margin-bottom-1" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
       </div>
+
+      <h2 class="govuk-visually-hidden">Helpful links</h2>
+      <ul class="govuk-footer__inline-list govuk-!-margin-top-6 govuk-!-margin-bottom-0">
+        <li class="govuk-footer__inline-list-item">
+          <%= govuk_link_to("Accessibility statement", accessibility_statement_path, class: "govuk-footer__link") %>
+        </li>
+        <li class="govuk-footer__inline-list-item">
+          <%= govuk_link_to("Privacy notice", privacy_notice_path, class: "govuk-footer__link") %>
+        </li>
+        <li class="govuk-footer__inline-list-item">
+          <%= govuk_link_to("View source code", "https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data", class: "govuk-footer__link") %>
+        </li>
+        <li class="govuk-footer__inline-list-item">
+          <%= govuk_link_to("Cookies", cookies_path, class: "govuk-footer__link") %>
+        </li>
+      </ul>
+    </div>
+    <div class="govuk-footer__meta-item">
+      <a class="govuk-footer__link govuk-footer__copyright-logo govuk-!-margin-bottom-1" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
     </div>
-  </div>
+  <% end %>
-</footer>
+<% end %>