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

Use display_header_text() in custom-header.php. Rework the UI to be a 'Show header text' checkbox (rather than radio buttons). Remove lame 'blank' hack for no-JS -- checkboxes work without JS. Move 'Select a Color' to a link like it is for custom background. Nearby code cleanup. see #18887. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-03-21 19:10:13 +00:00
parent f60b0a2af3
commit 22863bd9c3
1 changed files with 68 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,16 +208,17 @@ class Custom_Image_Header {
return; return;
} }
if ( isset( $_POST['text-color'] ) ) { if ( ! isset( $_POST['display-header-text'] ) ) {
check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
set_theme_mod( 'header_textcolor', 'blank' );
} elseif ( isset( $_POST['text-color'] ) ) {
check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' ); check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] ); $_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
if ( 'blank' == $_POST['text-color'] ) { $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
if ( strlen($color) == 6 || strlen($color) == 3 )
set_theme_mod('header_textcolor', $color);
elseif ( ! $color )
set_theme_mod( 'header_textcolor', 'blank' ); set_theme_mod( 'header_textcolor', 'blank' );
} else {
$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
if ( strlen($color) == 6 || strlen($color) == 3 )
set_theme_mod('header_textcolor', $color);
}
} }
if ( isset( $_POST['default-header'] ) ) { if ( isset( $_POST['default-header'] ) ) {
@ -329,86 +330,75 @@ class Custom_Image_Header {
function js_1() { ?> function js_1() { ?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
var text_objects = ['#name', '#desc', '#text-color-row']; var farbtastic;
var farbtastic; (function($){
var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>'; var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>',
var old_color = null; header_text_fields;
function pickColor(color) { function pickColor(color) {
jQuery('#name').css('color', color); $('#name').css('color', color);
jQuery('#desc').css('color', color); $('#desc').css('color', color);
jQuery('#text-color').val(color); $('#text-color').val(color);
farbtastic.setColor(color); farbtastic.setColor(color);
} }
function toggle_text(s) { function toggle_text() {
if (jQuery(s).attr('id') == 'showtext' && jQuery('#text-color').val() != 'blank') var checked = $('#display-header-text').prop('checked'),
text_color;
header_text_fields.toggle( checked );
if ( ! checked )
return; return;
text_color = $('#text-color');
if (jQuery(s).attr('id') == 'hidetext' && jQuery('#text-color').val() == 'blank') if ( '' == text_color.val().replace('#', '') ) {
return; text_color.val( default_color );
pickColor( default_color );
if (jQuery('#text-color').val() == 'blank') {
//Show text
if (old_color == '#blank')
old_color = default_color;
jQuery( text_objects.toString() ).show();
jQuery('#text-color').val(old_color);
jQuery('#name').css('color', old_color);
jQuery('#desc').css('color', old_color);
pickColor(old_color);
} else { } else {
//Hide text pickColor( text_color.val() );
jQuery( text_objects.toString() ).hide();
old_color = jQuery('#text-color').val();
jQuery('#text-color').val('blank');
} }
} }
jQuery(document).ready(function() { $(document).ready(function() {
jQuery('#pickcolor').click(function() { header_text_fields = $('.displaying-header-text');
jQuery('#color-picker').show(); $('#pickcolor').click(function(e) {
e.preventDefault();
$('#color-picker').show();
}); });
jQuery('input[name="hidetext"]').click(function() { $('#display-header-text').click( toggle_text );
toggle_text(this);
});
jQuery('#defaultcolor').click(function() { $('#defaultcolor').click(function() {
pickColor(default_color); pickColor(default_color);
jQuery('#text-color').val(default_color) $('#text-color').val(default_color);
}); });
jQuery('#text-color').keyup(function() { $('#text-color').keyup(function() {
var _hex = jQuery('#text-color').val(); var _hex = $('#text-color').val();
var hex = _hex; var hex = _hex;
if ( hex[0] != '#' ) if ( hex[0] != '#' )
hex = '#' + hex; hex = '#' + hex;
hex = hex.replace(/[^#a-fA-F0-9]+/, ''); hex = hex.replace(/[^#a-fA-F0-9]+/, '');
if ( hex != _hex ) if ( hex != _hex )
jQuery('#text-color').val(hex); $('#text-color').val(hex);
if ( hex.length == 4 || hex.length == 7 ) if ( hex.length == 4 || hex.length == 7 )
pickColor( hex ); pickColor( hex );
}); });
jQuery(document).mousedown(function(){ $(document).mousedown(function(){
jQuery('#color-picker').each( function() { $('#color-picker').each( function() {
var display = jQuery(this).css('display'); var display = $(this).css('display');
if (display == 'block') if (display == 'block')
jQuery(this).fadeOut(2); $(this).fadeOut(2);
}); });
}); });
farbtastic = jQuery.farbtastic('#color-picker', function(color) { pickColor(color); }); farbtastic = $.farbtastic('#color-picker', function(color) { pickColor(color); });
<?php if ( $color = get_header_textcolor() ) { ?> <?php if ( display_header_text() ) { ?>
pickColor('#<?php echo $color; ?>'); pickColor('#<?php echo get_header_textcolor(); ?>');
<?php } ?> <?php } else { ?>
toggle_text();
<?php if ( 'blank' == $color || '' == $color || ! current_theme_supports( 'custom-header', 'header-text' ) ) { ?>
toggle_text();
<?php } ?> <?php } ?>
}); });
})(jQuery);
/* ]]> */ /* ]]> */
</script> </script>
<?php <?php
@ -507,6 +497,8 @@ class Custom_Image_Header {
</div> </div>
<?php } ?> <?php } ?>
<h3><?php _e( 'Header Image' ); ?></h3>
<table class="form-table"> <table class="form-table">
<tbody> <tbody>
@ -519,14 +511,13 @@ class Custom_Image_Header {
?> ?>
<div id="headimg" style="background-image:url(<?php esc_url ( header_image() ) ?>);max-width:<?php echo get_custom_header()->width; ?>px;height:<?php echo get_custom_header()->height; ?>px;"> <div id="headimg" style="background-image:url(<?php esc_url ( header_image() ) ?>);max-width:<?php echo get_custom_header()->width; ?>px;height:<?php echo get_custom_header()->height; ?>px;">
<?php <?php
$color = get_header_textcolor(); if ( display_header_text() )
if ( 'blank' == $color || '' == $color || ! current_theme_supports( 'custom-header', 'header-text' ) ) $style = ' style="color:#' . get_header_textcolor() . ';"';
$style = ' style="display:none;"';
else else
$style = ' style="color:#' . $color . ';"'; $style = ' style="display:none;"';
?> ?>
<h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1> <h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>"><?php bloginfo( 'name' ); ?></a></h1>
<div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div> <div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
</div> </div>
<?php } ?> <?php } ?>
</td> </td>
@ -618,33 +609,32 @@ class Custom_Image_Header {
<?php endif; ?> <?php endif; ?>
</tbody> </tbody>
</table> </table>
<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
<h3><?php _e( 'Header Text' ); ?></h3>
<table class="form-table"> <table class="form-table">
<tbody> <tbody>
<tr valign="top" class="hide-if-no-js"> <tr valign="top">
<th scope="row"><?php _e( 'Display Text' ); ?></th> <th scope="row"><?php _e( 'Header Text' ); ?></th>
<td> <td>
<p> <p>
<?php <label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked( display_header_text() ); ?> /> <?php _e( 'Show header text with your image.' ); ?></label>
$show_text = get_header_textcolor();
if ( 'blank' == $show_text )
$show_text = false;
else
$show_text = (bool) $show_text;
?>
<label><input type="radio" value="1" name="hidetext" id="hidetext"<?php checked( ! $show_text ); ?> /> <?php _e( 'No' ); ?></label>
<label><input type="radio" value="0" name="hidetext" id="showtext"<?php checked( $show_text ); ?> /> <?php _e( 'Yes' ); ?></label>
</p> </p>
</td> </td>
</tr> </tr>
<tr valign="top" id="text-color-row"> <tr valign="top" class="displaying-header-text">
<th scope="row"><?php _e( 'Text Color' ); ?></th> <th scope="row"><?php _e( 'Text Color' ); ?></th>
<td> <td>
<p> <p>
<?php if ( display_header_text() ) : ?>
<input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_header_textcolor() ); ?>" /> <input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_header_textcolor() ); ?>" />
<span class="description hide-if-js"><?php _e( 'If you want to hide header text, add <strong>#blank</strong> as text color.' );?></span> <?php else : ?>
<input type="button" class="button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color' ); ?>" id="pickcolor" /> <input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_theme_support( 'custom-header', 'default-text-color' ) ); ?>" />
<?php endif; ?>
<a href="#" class="hide-if-no-js" id="pickcolor"><?php _e( 'Select a Color' ); ?></a>
</p> </p>
<div id="color-picker" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div> <div id="color-picker" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
</td> </td>
@ -662,7 +652,7 @@ class Custom_Image_Header {
</tbody> </tbody>
</table> </table>
<?php endif; <?php endif;
do_action( 'custom_header_options' ); do_action( 'custom_header_options' );