Merge pull request #148 from MITLibraries/pw-85

matt-bernhardt · web-flow · commit acbf963faed3 · 2024-02-05T11:17:54.000-05:00
Move header customization to parent theme
diff --git a/web/app/themes/mitlib-child/archive-interviewee.php b/web/app/themes/mitlib-child/archive-interviewee.php
@@ -30,7 +30,7 @@
 $interviews = new \WP_Query( $interview_params );
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php get_template_part( 'inc/breadcrumbs', 'child' ); ?>
 
diff --git a/web/app/themes/mitlib-child/archive.php b/web/app/themes/mitlib-child/archive.php
@@ -10,7 +10,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' ); ?>
+get_header(); ?>
 
 <?php get_template_part( 'inc/breadcrumbs', 'category' ); ?>
 
diff --git a/web/app/themes/mitlib-child/functions.php b/web/app/themes/mitlib-child/functions.php
@@ -122,44 +122,6 @@ function theme_setup() {
 }
 add_action( 'after_setup_theme', 'Mitlib\Child\theme_setup' );
 
-/**
- * Define a new Menu Style section within the Customizer.
- *
- * @link https://developer.wordpress.org/themes/customize-api/customizer-objects/
- * @param type $wp_customize The Customizer object which we are extending.
- */
-function theme_menu_style_customizer( $wp_customize ) {
-
-	$wp_customize->add_section(
-		'menu_style_section',
-		array(
-			'title' => 'Menu Style',
-		)
-	);
-
-	$wp_customize->add_setting(
-		'menu_style_setting',
-		array(
-			'default' => 'Full Menu',
-			'type' => 'option',
-		)
-	);
-
-	$wp_customize->add_control(
-		'menu_style_setting',
-		array(
-			'label'   => 'Menu Style',
-			'section' => 'menu_style_section',
-			'type'    => 'radio',
-			'choices'    => array(
-				'full' => 'Full Menu',
-				'slim' => 'Slim No Menu',
-			),
-		)
-	);
-}
-add_action( 'customize_register', 'Mitlib\Child\theme_menu_style_customizer' );
-
 /**
  * Define register_child_nav function.
  */
diff --git a/web/app/themes/mitlib-child/header-child.php b/web/app/themes/mitlib-child/header-child.php
diff --git a/web/app/themes/mitlib-child/header-slim.php b/web/app/themes/mitlib-child/header-slim.php
diff --git a/web/app/themes/mitlib-child/index.php b/web/app/themes/mitlib-child/index.php
@@ -12,7 +12,7 @@
 
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php get_template_part( 'inc/breadcrumbs', 'sitename' ); ?>
 		
diff --git a/web/app/themes/mitlib-child/search.php b/web/app/themes/mitlib-child/search.php
@@ -8,7 +8,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' ); ?>
+get_header(); ?>
 
 <?php get_template_part( 'inc/breadcrumbs', 'child' ); ?>
 
diff --git a/web/app/themes/mitlib-child/single-exhibits.php b/web/app/themes/mitlib-child/single-exhibits.php
@@ -9,7 +9,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' );
+get_header();
 
 get_template_part( 'inc/breadcrumbs', 'child' );
 
diff --git a/web/app/themes/mitlib-child/single-interview.php b/web/app/themes/mitlib-child/single-interview.php
@@ -8,7 +8,7 @@
 
 namespace Mitlib\PostTypes;
 
-get_header( 'child' ); // Should be 'moh'?
+get_header();
 
 get_template_part( 'inc/breadcrumbs', 'child' );
 
diff --git a/web/app/themes/mitlib-child/single.php b/web/app/themes/mitlib-child/single.php
@@ -9,7 +9,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' );
+get_header();
 
 get_template_part( 'inc/breadcrumbs', 'child' );
 
diff --git a/web/app/themes/mitlib-child/templates/page-exhibits-feed.php b/web/app/themes/mitlib-child/templates/page-exhibits-feed.php
@@ -8,7 +8,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' );
+get_header();
 ?>
 
 	<?php get_template_part( 'inc/breadcrumbs', 'child' ); ?>
diff --git a/web/app/themes/mitlib-child/templates/page-exhibits-home.php b/web/app/themes/mitlib-child/templates/page-exhibits-home.php
@@ -9,7 +9,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' ); ?>
+get_header(); ?>
 
 <?php
 // Get today's date in the right format.
diff --git a/web/app/themes/mitlib-child/templates/page-exhibits-location.php b/web/app/themes/mitlib-child/templates/page-exhibits-location.php
@@ -21,7 +21,7 @@
 
 namespace Mitlib\Child;
 
-get_header( 'child' );
+get_header();
 
 // Pages using this template should have one and only one category value. If
 // the page is placed in multiple categories, then the first term returned here
diff --git a/web/app/themes/mitlib-child/templates/page-exhibits-past.php b/web/app/themes/mitlib-child/templates/page-exhibits-past.php
@@ -8,7 +8,7 @@
 
 namespace Mitlib\Child;
 
-	get_header( 'child' );
+	get_header();
 ?>
 
 	<?php get_template_part( 'inc/breadcrumbs', 'child' ); ?>
diff --git a/web/app/themes/mitlib-child/templates/page-front.php b/web/app/themes/mitlib-child/templates/page-front.php
@@ -20,7 +20,7 @@
 }
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php
 if ( is_front_page() ) {
diff --git a/web/app/themes/mitlib-child/templates/page-full-width.php b/web/app/themes/mitlib-child/templates/page-full-width.php
@@ -18,7 +18,7 @@
 
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php
 if ( is_front_page() ) {
diff --git a/web/app/themes/mitlib-child/templates/page-posts-feed.php b/web/app/themes/mitlib-child/templates/page-posts-feed.php
@@ -21,7 +21,7 @@
 }
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php
 if ( is_front_page() ) {
diff --git a/web/app/themes/mitlib-child/templates/page-widgetized.php b/web/app/themes/mitlib-child/templates/page-widgetized.php
@@ -22,7 +22,7 @@
 }
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php
 if ( is_front_page() ) {
diff --git a/web/app/themes/mitlib-child/templates/page.php b/web/app/themes/mitlib-child/templates/page.php
@@ -25,7 +25,7 @@
 }
 ?>
 
-<?php get_header( 'child' ); ?>
+<?php get_header(); ?>
 
 <?php
 if ( is_front_page() ) {
diff --git a/web/app/themes/mitlib-parent/functions.php b/web/app/themes/mitlib-parent/functions.php
@@ -262,6 +262,44 @@ function setup_scripts_styles() {
 }
 add_action( 'wp_enqueue_scripts', 'Mitlib\Parent\setup_scripts_styles' );
 
+/**
+ * Define a new Menu Style section within the Customizer.
+ *
+ * @link https://developer.wordpress.org/themes/customize-api/customizer-objects/
+ * @param type $wp_customize The Customizer object which we are extending.
+ */
+function customize_menu_style( $wp_customize ) {
+
+	$wp_customize->add_section(
+		'menu_style_section',
+		array(
+			'title' => 'Menu Style',
+		)
+	);
+
+	$wp_customize->add_setting(
+		'menu_style_setting',
+		array(
+			'default' => 'Full Menu',
+			'type' => 'option',
+		)
+	);
+
+	$wp_customize->add_control(
+		'menu_style_setting',
+		array(
+			'label'   => 'Menu Style',
+			'section' => 'menu_style_section',
+			'type'    => 'radio',
+			'choices'    => array(
+				'full' => 'Full Menu',
+				'slim' => 'Slim No Menu',
+			),
+		)
+	);
+}
+add_action( 'customize_register', 'Mitlib\Parent\customize_menu_style' );
+
 /**
  * Creates a nicely formatted and more specific title element text
  * for output in head of document, based on current view.
diff --git a/web/app/themes/mitlib-parent/header.php b/web/app/themes/mitlib-parent/header.php
@@ -10,6 +10,10 @@
 
 namespace Mitlib\Parent;
 
+$menu = 'full';
+if ( 'slim' === get_option( 'menu_style_setting' ) ) {
+	$menu = 'slim';
+}
 ?><!DOCTYPE html>
 <!--[if lte IE 9]><html class="no-js lte-ie9" lang="en"><![endif]-->
 <!--[if !(IE 8) | !(IE 9) ]><!-->
@@ -39,10 +43,16 @@
 	<div id="skip"><a href="#content">Skip to Main Content</a></div>
 	<div class="wrap-page">
 		<header class="header-main flex-container flex-end">
-			<?php get_template_part( 'inc/nav', 'hamburger' ); ?>
+			<?php if ( 'full' === $menu ) { ?>
+				<?php get_template_part( 'inc/nav', 'hamburger' ); ?>
+			<?php } ?>
 			<?php get_template_part( 'inc/liblogo' ); ?>
-			<?php get_template_part( 'inc/nav', 'main' ); ?>
+			<?php if ( 'full' === $menu ) { ?>
+				<?php get_template_part( 'inc/nav', 'main' ); ?>
+			<?php } ?>
 			<a class="link-logo-mit" href="http://www.mit.edu"><img src="https://cdn.libraries.mit.edu/files/branding/local/mit_logo_std_rgb_white.svg" height="32" alt="MIT logo" >
 			</a><!-- End MIT Logo -->
-			<?php get_template_part( 'inc/nav', 'smalldisplays' ); ?>
+			<?php if ( 'full' === $menu ) { ?>
+				<?php get_template_part( 'inc/nav', 'smalldisplays' ); ?>
+			<?php } ?>
 		</header>
