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

Theme Customizer: Improve background image control, add correct meta key to custom headers and backgrounds uploaded using the customizer. see #19910. 

git-svn-id: http://core.svn.wordpress.org/trunk@20913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2012-05-25 20:26:25 +00:00
parent 9a3b25de9d
commit beb401b533
4 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/ajax-actions.php
View File

@ -1640,6 +1640,14 @@ function wp_ajax_upload_attachment() {
wp_die();
}
if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
if ( 'custom-background' === $post_data['context'] )
update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] );
if ( 'custom-header' === $post_data['context'] )
update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] );
}
$post = get_post( $attachment_id );
echo json_encode( array(

60
wp-includes/class-wp-customize-control.php
View File

@ -398,6 +398,52 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
<div class="uploaded-target"></div>
<?php
}
public function print_tab_image( $url, $thumbnail_url = null ) {
$url = set_url_scheme( $url );
$thumbnail_url = ( $thumbnail_url ) ? set_url_scheme( $thumbnail_url ) : $url;
?>
<a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $url ); ?>">
<img src="<?php echo esc_url( $thumbnail_url ); ?>" />
</a>
<?php
}
}
class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
public function __construct( $manager ) {
parent::__construct( $manager, 'background_image', array(
'label' => __( 'Background Image' ),
'section' => 'background_image',
'context' => 'custom-background',
'get_url' => 'get_background_image',
) );
if ( $this->setting->default )
$this->add_tab( 'default', __('Default'), array( $this, 'tab_default_background' ) );
}
public function tab_uploaded() {
$backgrounds = get_posts( array(
'post_type' => 'attachment',
'meta_key' => '_wp_attachment_is_custom_background',
'meta_value' => $this->manager->get_stylesheet(),
'orderby' => 'none',
'nopaging' => true,
) );
?><div class="uploaded-target"></div><?php
if ( empty( $backgrounds ) )
return;
foreach ( (array) $backgrounds as $background )
$this->print_tab_image( esc_url_raw( $background->guid ) );
}
public function tab_default_background() {
$this->print_tab_image( $this->setting->default );
}
}
class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
@ -424,21 +470,15 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
?><div class="uploaded-target"></div><?php
foreach ( $headers as $header ) : ?>
<a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $header['url'] ); ?>">
<img src="<?php echo esc_url( set_url_scheme( $header['thumbnail_url'] ) ); ?>" />
</a>
<?php endforeach;
foreach ( $headers as $header )
$this->print_tab_image( $header['url'], $header['thumbnail_url'] );
}
public function tab_default_headers() {
global $custom_image_header;
$custom_image_header->process_default_headers();
foreach ( $custom_image_header->default_headers as $header ) : ?>
<a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $header['url'] ); ?>">
<img src="<?php echo esc_url( set_url_scheme( $header['thumbnail_url'] ) ); ?>" />
</a>
<?php endforeach;
foreach ( $custom_image_header->default_headers as $header )
$this->print_tab_image( $header['url'], $header['thumbnail_url'] );
}
}

6
wp-includes/class-wp-customize-manager.php
View File

@ -698,11 +698,7 @@ final class WP_Customize_Manager {
'theme_supports' => 'custom-background',
) );
$this->add_control( new WP_Customize_Image_Control( $this, 'background_image', array(
'label' => __( 'Background Image' ),
'section' => 'background_image',
'context' => 'custom-background',
) ) );
$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
$this->add_setting( 'background_repeat', array(
'default' => 'repeat',

2
wp-includes/js/customize-controls.dev.js
View File

@ -158,6 +158,8 @@
if ( this.params.context )
control.uploader.param( 'post_data[context]', this.params.context );
control.uploader.param( 'post_data[theme]', api.settings.theme.stylesheet );
},
success: function( attachment ) {
this.setting.set( attachment.url );