WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: http://svn.automattic.com/wordpress/trunk@13751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-03-18 19:06:57 +00:00
parent 94d540f05d
commit 5097dba597
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-admin/custom-background.php
View File

@ -218,16 +218,17 @@ class Custom_Background {
* @since unknown * @since unknown
*/ */
function step_1() { 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"> <div class="wrap" id="custom-background">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e('Custom Background'); ?></h2> <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> <p><?php _e('This is your current background.'); ?></p>
<?php <?php
if ( $this->admin_image_div_callback ) { if ( $this->admin_image_div_callback ) {
@ -250,7 +251,7 @@ class Custom_Background {
if ( get_background_image() ) : ?> 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)) ?>"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
<table> <table>
<thead> <thead>
@ -316,7 +317,7 @@ if ( get_background_image() ) : ?>
<?php endif; ?> <?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)) ?>"> <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" /> <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" /> <input type="hidden" name="action" value="save" />
@ -327,7 +328,7 @@ if ( get_background_image() ) : ?>
</form> </form>
<?php if ( get_background_image() ) : ?> <?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> <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)) ?>"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
<?php wp_nonce_field('custom-background'); ?> <?php wp_nonce_field('custom-background'); ?>

17
wp-admin/custom-header.php
View File

@ -357,16 +357,19 @@ class Custom_Image_Header {
*/ */
function step_1() { function step_1() {
$this->process_default_headers(); $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"> <div class="wrap">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e('Your Header Image'); ?></h2> <h2><?php _e('Your Header Image'); ?></h2>
<?php <?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) ) : 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> <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; endif;
?> ?>
<div class="wrap"> <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)) ?>"> <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" /> <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') ) : ?> <?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
<div class="wrap"> <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)) ?>"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
<?php <?php
wp_nonce_field('custom-header'); wp_nonce_field('custom-header');