Update header and footer partials

Also update classes relating to the logo which were changed in v6

Author: querkmachine

views/layouts/_generic.njk

@@ -41,21 +41,22 @@
   }) %}{% endcall %}
 {% endblock %}
 
-{# We provide our own header, so blank the one provided by the template #}
-{% block header %}{% endblock %}
-
-{% block main %}
+{% block header %}
   {% include "_header.njk" %}
   {% include "_navigation.njk" %}
+{% endblock %}
+
+{% block main %}
   {% include "_banner.njk" %}
 
   {% block body %}
     {{ contents | safe }}
   {% endblock %}
 {% endblock %}
 
-{# We provide our own footer, so blank the one provided by the template #}
-{% block footer %}{% endblock %}
+{% block footer %}
+  {% include "_footer.njk" %}
+{% endblock %}
 
 {% block bodyEnd %}
   <script type="module" src="{{ getFingerprint('/javascripts/application.js') }}"></script>

views/layouts/layout-pane.njk

@@ -63,5 +63,4 @@
   </div>
   {% include "_back-to-top.njk" %}
 </div>
-{% include "_footer.njk" %}
 {% endblock %}

views/layouts/layout-single-page.njk

@@ -11,6 +11,4 @@
       {{ contents | safe }}
     </main>
   </div>
-
-  {% include "_footer.njk" %}
 {% endblock %}

views/layouts/layout.njk

@@ -12,6 +12,4 @@
   <main id="main-content" role="main">
     {{ contents | safe }}
   </main>
-
-  {% include "_footer.njk" %}
 {% endblock %}

views/partials/_header.njk

@@ -1,7 +1,7 @@
-<header class="govuk-header govuk-header--full-width-border" role="banner">
+<div class="govuk-header govuk-header--full-width-border" role="banner">
   <div class="govuk-header__container app-width-container">
     <div class="govuk-header__logo app-header-logo">
-      <a href="/" class="govuk-header__link govuk-header__link--homepage">
+      <a href="/" class="govuk-header__homepage-link">
         <svg
           xmlns="http://www.w3.org/2000/svg"
           focusable="false"
@@ -37,4 +37,4 @@
       <a class="app-site-search__link govuk-link" href="/sitemap/">Sitemap</a>
     </div>
   </div>
-</header>
+</div>