From 6f53b537e5a210efe812116f5bd92be79df99e9b Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Date: Mon, 29 Nov 2021 17:04:01 +0000
Subject: [PATCH] Refactor footer

---
 app/views/layouts/_footer.html.erb     | 66 +++++++++-----------------
 app/views/layouts/application.html.erb |  4 +-
 2 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 5e0da8f33..4a7b6a96d 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,48 +1,28 @@
-<div class="govuk-width-container ">
-
-  <div class="govuk-footer__meta">
+<%= govuk_footer do |footer| %>
+  <%= footer.meta do %>
     <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
-
-      <h2 class="govuk-visually-hidden">Support links</h2>
-
-      <div class="govuk-footer__meta-custom">
-
-        <h2 class="govuk-heading-m">Get help with this service</h2>
-        <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Online helpdesk</h3>
-        <p class="govuk-body govuk-!-font-size-16">
-          <a class="govuk-link govuk-footer__link" href="https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21" target="_blank">CORE helpdesk</a>
-          (opens in a new tab)</p>
-
-        <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Telephone</h3>
-        <ul class="govuk-list govuk-!-font-size-16">
-          <li>Telephone: 0333 202 5084</li>
-          <li>Monday to Friday, 9am to 5:30pm (except public holidays)</li>
-        </ul>
-
-        <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Email</h3>
-        <ul class="govuk-list govuk-!-font-size-16">
-          <li>
-            <a class="govuk-link govuk-footer__link" href="mailto:mhclg.digital-services@communities.gov.uk?subject=CORE">dluhc.digital-services@communities.gov.uk</a>
-          </li>
-          <li>We aim to respond within 2 working days</li>
-        </ul>
-
-        <h2 class="govuk-visually-hidden">Footer links</h2>
-
-      </div>
-
-      <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 483.2 195.7" height="17" width="41">
-        <path
-          fill="currentColor"
-          d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"/>
-      </svg>
-      <span class="govuk-footer__licence-description">
-        All content is available under the
-        <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated
-      </span>
+      <h2 class="govuk-heading-m">Get help with this service</h2>
+
+      <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Online helpdesk</h3>
+      <p class="govuk-body govuk-!-font-size-16">
+        <a class="govuk-link govuk-footer__link" href="https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21" target="_blank">CORE helpdesk</a> (opens in a new tab)</p>
+
+      <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Telephone</h3>
+      <ul class="govuk-list govuk-!-font-size-16">
+        <li>Telephone: 0333 202 5084</li>
+        <li>Monday to Friday, 9am to 5:30pm (except public holidays)</li>
+      </ul>
+
+      <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Email</h3>
+      <ul class="govuk-list govuk-!-font-size-16 govuk-!-margin-bottom-0">
+        <li>
+          <a class="govuk-link govuk-footer__link" href="mailto:mhclg.digital-services@communities.gov.uk?subject=CORE">dluhc.digital-services@communities.gov.uk</a>
+        </li>
+        <li class="govuk-!-margin-bottom-0">We aim to respond within 2 working days</li>
+      </ul>
     </div>
     <div class="govuk-footer__meta-item">
       <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
     </div>
-  </div>
-</div>
+  <% end %>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f75c0f9e3..abd02d9dd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -71,8 +71,6 @@
       </main>
     </div>
 
-    <footer class="govuk-footer">
-      <%= render partial: "layouts/footer" %>
-    </footer>
+    <%= render partial: "layouts/footer" %>
   </body>
 </html>