<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13751] trunk/wp-admin: Use h3 (not h2)
to break up sections on custom header/bg screens.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13751">13751</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-18 19:06:57 +0000 (Thu, 18 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (13750 => 13751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-03-18 17:46:25 UTC (rev 13750)
+++ trunk/wp-admin/custom-background.php 2010-03-18 19:06:57 UTC (rev 13751)
</span><span class="lines">@@ -218,16 +218,17 @@
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="cx"> function step_1() {
</span><del>- if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
</del><ins>+?>
+<div class="wrap" id="custom-background">
+<?php screen_icon(); ?>
+<h2><?php _e('Custom Background'); ?></h2>
+<?php if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
</ins><span class="cx"> <div id="message" class="updated">
</span><span class="cx"> <p><?php printf(__('Background updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
</span><span class="cx"> </div>
</span><del>- <?php } ?>
</del><ins>+<?php }
</ins><span class="cx">
</span><del>-<div class="wrap" id="custom-background">
-<?php screen_icon(); ?>
-<h2><?php _e('Custom Background'); ?></h2>
-<?php if ( get_background_image() || get_background_color() ) { ?>
</del><ins>+if ( get_background_image() || get_background_color() ) { ?>
</ins><span class="cx"> <p><?php _e('This is your current background.'); ?></p>
</span><span class="cx"> <?php
</span><span class="cx"> if ( $this->admin_image_div_callback ) {
</span><span class="lines">@@ -250,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> if ( get_background_image() ) : ?>
</span><span class="cx">
</span><del>-<h2><?php _e('Change Display Options') ?></h2>
</del><ins>+<h3><?php _e('Change Display Options') ?></h3>
</ins><span class="cx"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
</span><span class="cx"> <table>
</span><span class="cx"> <thead>
</span><span class="lines">@@ -316,7 +317,7 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<h2><?php _e('Upload New Background Image'); ?></h2>
</del><ins>+<h3><?php _e('Upload New Background Image'); ?></h3>
</ins><span class="cx"> <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
</span><span class="cx"> <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
</span><span class="cx"> <input type="hidden" name="action" value="save" />
</span><span class="lines">@@ -327,7 +328,7 @@
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <?php if ( get_background_image() ) : ?>
</span><del>-<h2><?php _e('Remove Background Image'); ?></h2>
</del><ins>+<h3><?php _e('Remove Background Image'); ?></h3>
</ins><span class="cx"> <p><?php _e('This will remove the background image. You will not be able to retrieve any customizations.') ?></p>
</span><span class="cx"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
</span><span class="cx"> <?php wp_nonce_field('custom-background'); ?>
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (13750 => 13751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-03-18 17:46:25 UTC (rev 13750)
+++ trunk/wp-admin/custom-header.php 2010-03-18 19:06:57 UTC (rev 13751)
</span><span class="lines">@@ -357,16 +357,19 @@
</span><span class="cx"> */
</span><span class="cx"> function step_1() {
</span><span class="cx"> $this->process_default_headers();
</span><del>- 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 } ?>
</del><ins>+ ?>
</ins><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e('Your Header Image'); ?></h2>
</span><ins>+
</ins><span class="cx"> <?php
</span><ins>+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 }
+
</ins><span class="cx"> if ( get_theme_mod('header_image') || empty($this->default_headers) ) :
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
</span><span class="lines">@@ -404,7 +407,7 @@
</span><span class="cx"> endif;
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx">
</span><span class="cx"> <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
</span><span class="cx"> <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
</span><span class="lines">@@ -419,7 +422,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<h2><?php _e('Reset Header Image and Color'); ?></h2>
</del><ins>+<h3><?php _e('Reset Header Image and Color'); ?></h3>
</ins><span class="cx"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
</span><span class="cx"> <?php
</span><span class="cx"> wp_nonce_field('custom-header');
</span></span></pre>
</div>
</div>
</body>
</html>