From 8aac1fc44720ff5b037544eb400b8b231a4e9612 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 18 Mar 2010 19:06:57 +0000
Subject: [PATCH] Use h3 (not h2) to break up sections on custom header/bg
 screens. Move div.updated message to right after the h2, as JS will move it
 there anyway.

git-svn-id: https://develop.svn.wordpress.org/trunk@13751 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/custom-background.php | 21 +++++++++++----------
 wp-admin/custom-header.php     | 17 ++++++++++-------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 242d9925b3..6563658322 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -218,16 +218,17 @@ class Custom_Background {
 	 * @since unknown
 	 */
 	function step_1() {
-		if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
-<div id="message" class="updated">
-<p><?php printf(__('Background updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
-</div>
-		<?php } ?>
-
+?>
 <div class="wrap" id="custom-background">
 <?php screen_icon(); ?>
 <h2><?php _e('Custom Background'); ?></h2>
-<?php if ( get_background_image() || get_background_color() ) { ?>
+<?php if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
+<div id="message" class="updated">
+<p><?php printf(__('Background updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
+</div>
+<?php }
+
+if ( get_background_image() || get_background_color() ) { ?>
 <p><?php _e('This is your current background.'); ?></p>
 <?php
 	if ( $this->admin_image_div_callback ) {
@@ -250,7 +251,7 @@ class Custom_Background {
 
 if ( get_background_image() ) : ?>
 
-<h2><?php _e('Change Display Options') ?></h2>
+<h3><?php _e('Change Display Options') ?></h3>
 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
 <table>
 <thead>
@@ -316,7 +317,7 @@ if ( get_background_image() ) : ?>
 
 <?php endif; ?>
 
-<h2><?php _e('Upload New Background Image'); ?></h2>
+<h3><?php _e('Upload New Background Image'); ?></h3>
 <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
 <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
 <input type="hidden" name="action" value="save" />
@@ -327,7 +328,7 @@ if ( get_background_image() ) : ?>
 </form>
 
 <?php if ( get_background_image() ) : ?>
-<h2><?php _e('Remove Background Image'); ?></h2>
+<h3><?php _e('Remove Background Image'); ?></h3>
 <p><?php _e('This will remove the background image. You will not be able to retrieve any customizations.') ?></p>
 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
 <?php wp_nonce_field('custom-background'); ?>
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 949e7cfe2b..81906f31c8 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -357,16 +357,19 @@ class Custom_Image_Header {
 	 */
 	function step_1() {
 		$this->process_default_headers();
-		if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
-<div id="message" class="updated">
-<p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
-</div>
-		<?php } ?>
+ ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Your Header Image'); ?></h2>
+
 <?php
+if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
+<div id="message" class="updated">
+<p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
+</div>
+<?php }
+
 if ( get_theme_mod('header_image') || empty($this->default_headers) ) :
 ?>
 <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
@@ -404,7 +407,7 @@ else:
 endif;
 ?>
 <div class="wrap">
-<h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
+<h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
 
 <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
 <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
@@ -419,7 +422,7 @@ endif;
 
 		<?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
 <div class="wrap">
-<h2><?php _e('Reset Header Image and Color'); ?></h2>
+<h3><?php _e('Reset Header Image and Color'); ?></h3>
 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
 <?php
 wp_nonce_field('custom-header');