Reorder customizer options, rephrase notices.

blank-canvas/functions.php

@@ -112,10 +112,10 @@ add_action( 'customize_register', 'blank_canvas_remove_customizer_settings', 11
 function blank_canvas_add_customizer_settings( $wp_customize ) {
 
 	// Add a Customizer message about the site title & tagline options.
-	$wp_customize->get_section( 'title_tagline' )->description  = __( 'This theme will not show the site logo, site title, and tagline on all single posts and pages unless the site header is enabled in the the Content Options section.', 'blank-canvas' );
-	$wp_customize->get_section( 'menu_locations' )->description = __( 'Menus will only be displayed on this theme if the header or footer is enabled. This can be done in the Content Options section.', 'blank-canvas' );
-	$wp_customize->get_panel( 'nav_menus' )->description        = __( 'Menus will only be displayed on this theme if the header or footer is enabled. This can be done in the Content Options section.', 'blank-canvas' );
-	$wp_customize->get_panel( 'widgets' )->description          = __( 'Widgets will only be displayed on this theme if the footer is enabled. This can be done in the Content Options section.', 'blank-canvas' );
+	$wp_customize->get_section( 'title_tagline' )->description  = __( 'The site logo, title, and tagline will only appear on single posts and pages if the “Site header and top menu" option is enabled in the Content Options section.', 'blank-canvas' );
+	$wp_customize->get_section( 'menu_locations' )->description = __( 'This theme will only display Menus if they are enabled in the Content Options section.', 'blank-canvas' );
+	$wp_customize->get_panel( 'nav_menus' )->description        = __( 'This theme will only display Menus if they are enabled in the Content Options section.', 'blank-canvas' );
+	$wp_customize->get_panel( 'widgets' )->description          = __( 'This theme will only display Widgets if they are enabled in the Content Options section.', 'blank-canvas' );
 }
 add_action( 'customize_register', 'blank_canvas_add_customizer_settings', 11 );
 

blank-canvas/inc/customizer.php

@@ -47,9 +47,9 @@ if ( ! class_exists( 'Blank_Canvas_Customize' ) ) {
 				)
 			);
 
-			// Add setting to show post and page titles.
+			// Add setting to show the site header.
 			$wp_customize->add_setting(
-				'show_post_and_page_titles',
+				'show_site_header',
 				array(
 					'default'           => false,
 					'type'              => 'theme_mod',
@@ -58,22 +58,22 @@ if ( ! class_exists( 'Blank_Canvas_Customize' ) ) {
 				)
 			);
 
-			// Add control to show the site header on the homepage.
+			// Add control to show the site header.
 			$wp_customize->add_control(
-				'show_post_and_page_titles',
+				'show_site_header',
 				array(
-					'label'       => esc_html__( 'Show post and page titles', 'blank-canvas' ),
-					'description' => esc_html__( 'Check to show titles at the top of single posts and pages.', 'blank-canvas' ),
+					'label'       => esc_html__( 'Enable site header and top menu', 'blank-canvas' ),
+					'description' => esc_html__( 'Check to show a standard site header, navigation menu and social links menu on the top of every page.', 'blank-canvas' ),
 					'section'     => 'jetpack_content_options',
 					'priority'    => 10,
 					'type'        => 'checkbox',
-					'settings'    => 'show_post_and_page_titles',
+					'settings'    => 'show_site_header',
 				)
 			);
 
-			// Add setting to show the site header.
+			// Add setting to show the site footer.
 			$wp_customize->add_setting(
-				'show_site_header',
+				'show_site_footer',
 				array(
 					'default'           => false,
 					'type'              => 'theme_mod',
@@ -82,22 +82,22 @@ if ( ! class_exists( 'Blank_Canvas_Customize' ) ) {
 				)
 			);
 
-			// Add control to show the site header.
+			// Add control to show the site footer.
 			$wp_customize->add_control(
-				'show_site_header',
+				'show_site_footer',
 				array(
-					'label'       => esc_html__( 'Enable site header and navigation', 'blank-canvas' ),
-					'description' => esc_html__( 'Check to show a standard site header, navigation menu and social links menu on the top of every page.', 'blank-canvas' ),
+					'label'       => esc_html__( 'Enable widgets and footer menu', 'blank-canvas' ),
+					'description' => esc_html__( "Check to show a navigation menu and widgets in your site's footer area.", 'blank-canvas' ),
 					'section'     => 'jetpack_content_options',
 					'priority'    => 10,
 					'type'        => 'checkbox',
-					'settings'    => 'show_site_header',
+					'settings'    => 'show_site_footer',
 				)
 			);
 
-			// Add setting to show the site footer.
+			// Add setting to show post and page titles.
 			$wp_customize->add_setting(
-				'show_site_footer',
+				'show_post_and_page_titles',
 				array(
 					'default'           => false,
 					'type'              => 'theme_mod',
@@ -106,16 +106,16 @@ if ( ! class_exists( 'Blank_Canvas_Customize' ) ) {
 				)
 			);
 
-			// Add control to show the site footer.
+			// Add control to show post and page titles.
 			$wp_customize->add_control(
-				'show_site_footer',
+				'show_post_and_page_titles',
 				array(
-					'label'       => esc_html__( 'Enable footer menu and widgets', 'blank-canvas' ),
-					'description' => esc_html__( "Check to show a navigation menu and widgets in your site's footer area.", 'blank-canvas' ),
+					'label'       => esc_html__( 'Show post and page titles', 'blank-canvas' ),
+					'description' => esc_html__( 'Check to show titles at the top of single posts and pages.', 'blank-canvas' ),
 					'section'     => 'jetpack_content_options',
 					'priority'    => 10,
 					'type'        => 'checkbox',
-					'settings'    => 'show_site_footer',
+					'settings'    => 'show_post_and_page_titles',
 				)
 			);