From 608f651133aef28813f89abfe50ff2f30b1195c0 Mon Sep 17 00:00:00 2001
From: Justin Shreve <justin.shreve@gmail.com>
Date: Wed, 17 Feb 2016 10:01:20 -0800
Subject: [PATCH] Fix hierarchy on settings screens.

---
 includes/admin/class-wc-admin-api-keys.php           | 2 +-
 includes/admin/class-wc-admin-settings.php           | 2 +-
 includes/admin/class-wc-admin-webhooks.php           | 2 +-
 includes/admin/settings/views/html-keys-edit.php     | 2 +-
 includes/admin/settings/views/html-webhooks-edit.php | 6 +++---
 includes/admin/views/html-admin-settings.php         | 6 ++++--
 includes/emails/class-wc-email.php                   | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/includes/admin/class-wc-admin-api-keys.php b/includes/admin/class-wc-admin-api-keys.php
index 04f3ec2d58e..853579ed3dd 100644
--- a/includes/admin/class-wc-admin-api-keys.php
+++ b/includes/admin/class-wc-admin-api-keys.php
@@ -59,7 +59,7 @@ class WC_Admin_API_Keys {
 	 * Table list output.
 	 */
 	private static function table_list_output() {
-		echo '<h3>' . __( 'Keys/Apps', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ) . '" class="add-new-h2">' . __( 'Add Key', 'woocommerce' ) . '</a></h3>';
+		echo '<h2>' . __( 'Keys/Apps', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ) . '" class="add-new-h2">' . __( 'Add Key', 'woocommerce' ) . '</a></h2>';
 
 		$keys_table_list = new WC_Admin_API_Keys_Table_List();
 		$keys_table_list->prepare_items();
diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php
index 9c2d8bf2f75..c9b3b2cfcb0 100644
--- a/includes/admin/class-wc-admin-settings.php
+++ b/includes/admin/class-wc-admin-settings.php
@@ -265,7 +265,7 @@ class WC_Admin_Settings {
 				// Section Titles
 				case 'title':
 					if ( ! empty( $value['title'] ) ) {
-						echo '<h3>' . esc_html( $value['title'] ) . '</h3>';
+						echo '<h2>' . esc_html( $value['title'] ) . '</h2>';
 					}
 					if ( ! empty( $value['desc'] ) ) {
 						echo wpautop( wptexturize( wp_kses_post( $value['desc'] ) ) );
diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php
index 277d63b82d6..0ccee3f7458 100644
--- a/includes/admin/class-wc-admin-webhooks.php
+++ b/includes/admin/class-wc-admin-webhooks.php
@@ -400,7 +400,7 @@ class WC_Admin_Webhooks {
 	 * Table list output.
 	 */
 	private static function table_list_output() {
-		echo '<h3>' . __( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&create-webhook=1' ), 'create-webhook' ) ) . '" class="add-new-h2">' . __( 'Add Webhook', 'woocommerce' ) . '</a></h3>';
+		echo '<h2>' . __( 'Webhooks', 'woocommerce' ) . ' <a href="' . esc_url( wp_nonce_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=webhooks&create-webhook=1' ), 'create-webhook' ) ) . '" class="add-new-h2">' . __( 'Add Webhook', 'woocommerce' ) . '</a></h2>';
 
 		$webhooks_table_list = new WC_Admin_Webhooks_Table_List();
 		$webhooks_table_list->prepare_items();
diff --git a/includes/admin/settings/views/html-keys-edit.php b/includes/admin/settings/views/html-keys-edit.php
index c94159b53f8..41f1e3544b5 100644
--- a/includes/admin/settings/views/html-keys-edit.php
+++ b/includes/admin/settings/views/html-keys-edit.php
@@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 ?>
 
 <div id="key-fields" class="settings-panel">
-	<h3><?php _e( 'Key Details', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Key Details', 'woocommerce' ); ?></h2>
 
 	<input type="hidden" id="key_id" value="<?php echo esc_attr( $key_id ); ?>" />
 
diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php
index 2d39cea7963..ad134bba5b8 100644
--- a/includes/admin/settings/views/html-webhooks-edit.php
+++ b/includes/admin/settings/views/html-webhooks-edit.php
@@ -7,7 +7,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 <input type="hidden" name="webhook_id" value="<?php echo esc_attr( $webhook->id ); ?>" />
 
 <div id="webhook-options" class="settings-panel">
-	<h3><?php _e( 'Webhook Data', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Webhook Data', 'woocommerce' ); ?></h2>
 	<table class="form-table">
 		<tbody>
 			<tr valign="top">
@@ -113,7 +113,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 </div>
 
 <div id="webhook-actions" class="settings-panel">
-	<h3><?php _e( 'Webhook Actions', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Webhook Actions', 'woocommerce' ); ?></h2>
 	<table class="form-table">
 		<tbody>
 			<?php if ( '0000-00-00 00:00:00' != $webhook->post_data->post_modified_gmt ) : ?>
@@ -160,7 +160,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 </div>
 
 <div id="webhook-logs" class="settings-panel">
-	<h3><?php _e( 'Webhook Logs', 'woocommerce' ); ?></h3>
+	<h2><?php _e( 'Webhook Logs', 'woocommerce' ); ?></h2>
 
 	<?php WC_Admin_Webhooks::logs_output( $webhook ); ?>
 </div>
diff --git a/includes/admin/views/html-admin-settings.php b/includes/admin/views/html-admin-settings.php
index e638eb544f9..9035d4682ee 100644
--- a/includes/admin/views/html-admin-settings.php
+++ b/includes/admin/views/html-admin-settings.php
@@ -9,7 +9,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 <div class="wrap woocommerce">
 	<form method="<?php echo esc_attr( apply_filters( 'woocommerce_settings_form_method_tab_' . $current_tab, 'post' ) ); ?>" id="mainform" action="" enctype="multipart/form-data">
 		<div class="icon32 icon32-woocommerce-settings" id="icon-woocommerce"><br /></div>
-		<h2 class="nav-tab-wrapper woo-nav-tab-wrapper">
+		<h1 class="screen-reader-text"><?php echo esc_html( $tabs[ $current_tab ] ); ?></h1>
+
+		<p class="nav-tab-wrapper woo-nav-tab-wrapper">
 			<?php
 				foreach ( $tabs as $name => $label ) {
 					echo '<a href="' . admin_url( 'admin.php?page=wc-settings&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
@@ -17,7 +19,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 				do_action( 'woocommerce_settings_tabs' );
 			?>
-		</h2>
+		</p>
 
 		<?php
 			do_action( 'woocommerce_sections_' . $current_tab );
diff --git a/includes/emails/class-wc-email.php b/includes/emails/class-wc-email.php
index 973f455008c..38cffaee6c0 100644
--- a/includes/emails/class-wc-email.php
+++ b/includes/emails/class-wc-email.php
@@ -704,7 +704,7 @@ class WC_Email extends WC_Settings_API {
 		// Do admin actions.
 		$this->admin_actions();
 		?>
-		<h3><?php echo esc_html( $this->get_title() ); ?></h3>
+		<h2><?php echo esc_html( $this->get_title() ); ?></h2>
 		<?php echo wpautop( wp_kses_post( $this->get_description() ) ); ?>
 
 		<?php