Merge pull request #27 from NHSLeadership/DI-7002

Theme upgrade based on latest nightingale
NHSLeadership · Dec 10, 2024 · 5cb6d32 · 5cb6d32
2 parents 69f1277 + dbbfe3c
commit 5cb6d32
Show file tree

Hide file tree

Showing 8 changed files with 4,113 additions and 10,443 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,7 +43,7 @@ node_modules/
 nhsblocks/node_modules/
 style-gutenburg.min.css
 .sass-cache/
-nightingale.zip
+nightingale-buddyboss.zip
 
 # Docker stuff
 ssh-key
diff --git a/footer.php b/footer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * The template for displaying the footer
  *
@@ -17,24 +18,29 @@
 </main>
 </div>
 
-<footer>
-	<div class="nhsuk-footer" id="nhsuk-footer">
-		<?php
-		get_template_part( 'template-parts/buddynav' );
-		?>
-		<div class="nhsuk-width-container">
-			<?php if ( is_active_sidebar( 'footer-region' ) ) : ?>
-				<div id="nhsuk-footer-widgets" class="nhsuk-footer__widgets widget-area" role="complementary">
-					<?php dynamic_sidebar( 'footer-region' ); ?>
-				</div>
-				<?php
-			endif;
-			get_template_part( 'partials/footernav' );
-			get_template_part( 'partials/footer-copyright' );
-			?>
+<footer role="contentinfo">
+    <div class="nhsuk-footer-container" id="nhsuk-footer">
+    <?php
+        get_template_part('template-parts/buddynav');
+    ?>
+        <div class="nhsuk-width-container">
+            <?php if (is_active_sidebar('footer-region')) : ?>
+                <div id="nhsuk-footer-widgets" class="nhsuk-footer__widgets widget-area" role="complementary">
+                    <?php dynamic_sidebar('footer-region'); ?>
+                </div>
+                <?php
+            endif;
+            ?>
+            <h2 class="nhsuk-u-visually-hidden">Support links</h2>
+            <div class="nhsuk-footer">
+            <?php
+                get_template_part('partials/footernav');
+                get_template_part('partials/footer-copyright');
+            ?>
+            </div>
 
-		</div>
-	</div>
+        </div>
+    </div>
 </footer>
 <?php wp_footer(); ?>
 </body>

diff --git a/header.php b/header.php
@@ -47,9 +47,9 @@ function wp_body_open() {
 } else {
 	$header_colour_text = '';
 }
-echo '<header class="nhsuk-header nhsuk-header--' . esc_attr( $header_layout . $header_colour_text ) . '">';
+echo '<header class="nhsuk-header nhsuk-header--' . esc_attr( $header_layout . $header_colour_text ) . '" role="banner">';
 ?>
-<div class="nhsuk-width-container nhsuk-header__container">
+<div class="nhsuk-header__container">
 	<?php
 	get_template_part( 'partials/logo' );
 	?>
@@ -63,11 +63,6 @@ function wp_body_open() {
 			$headersearchextra = '';
 		}
 		?>
-		<div class="nhsuk-header__menu <?php echo esc_attr( $headersearchextra ); ?>">
-			<button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation"
-					aria-label="Open menu">Menu
-			</button>
-		</div>
 
 		<?php
 		if ( is_user_logged_in() ) {
@@ -79,7 +74,7 @@ function wp_body_open() {
 				<?php get_search_form(); ?>
 			</div>
 			<?php
-        }
+		}
 		?>
 
 	</div>