Changeset 36698

Timestamp:

02/24/2016 10:09:54 PM (8 years ago)

Author:

obenland

Message:

Customize: Introduce Logo support for themes.

Allows a common theme feature to have a common implementation provided by core and available in a consistent location for users.
See ​https://make.wordpress.org/core/2016/02/24/theme-logo-support/

Props kwight, enejb, jeherve, bhubbard, samhotchkiss, zinigor, eliorivero, adamsilverstein, melchoyce, ryan, mikeschroder, westonruter, pento, karmatosed, celloexpressions, obenland.
See #33755.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (9 diffs)
• wp-admin/includes/admin.php (modified) (1 diff)
• wp-admin/includes/class-wp-site-logo.php (added)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/customize-controls.js (modified) (2 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (6 diffs)
• wp-includes/customize/class-wp-customize-site-icon-control.php (modified) (1 diff)
• wp-includes/customize/class-wp-customize-site-logo-control.php (added)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/js/customize-preview.js (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)

trunk/src/wp-admin/css/customize-controls.css

@@ -726 +726 @@
 .customize-control-cropped_image .current,
 .customize-control-site_icon .current,
+
 .customize-control-header .current {
     margin-bottom: 8px;
@@ -767 +768 @@
 .customize-control-site_icon .default-button,
 .customize-control-site_icon .upload-button,
+
+
+
 .customize-control-header button.new,
 .customize-control-header button.remove {
@@ -780 +784 @@
 .customize-control-cropped_image .current .container,
 .customize-control-site_icon .current .container,
+
 .customize-control-header .current .container {
     overflow: hidden;
@@ -793 +798 @@
 .customize-control-cropped_image .current .container,
 .customize-control-site_icon .current .container,
+
 .customize-control-image .current .container {
     min-height: 40px;
@@ -821 +827 @@
 .customize-control-cropped_image .inner,
 .customize-control-site_icon .inner,
+
 .customize-control-header .inner {
     display: none;
@@ -836 +843 @@
 .customize-control-cropped_image .inner,
 .customize-control-site_icon .inner,
+
 .customize-control-image .inner {
     display: block;
@@ -847 +855 @@
 .customize-control-cropped_image .inner,
 .customize-control-site_icon .inner,
+
 .customize-control-header .inner,
 .customize-control-header .inner .dashicons {
@@ -990 +999 @@
 .customize-control-site_icon .remove-button,
 .customize-control-site_icon .default-button,
+
+
 .customize-control-header .remove {
     float: left;
@@ -1001 +1012 @@
 .customize-control-cropped_image .upload-button,
 .customize-control-site_icon .upload-button,
+
 .customize-control-header .new {
     float: right;

trunk/src/wp-admin/includes/admin.php

@@ -73 +73 @@
 require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
 
+
+
+
 /** WordPress Update Administration API */
 require_once(ABSPATH . 'wp-admin/includes/update.php');

trunk/src/wp-admin/includes/template.php

@@ -1751 +1751 @@
     }
 
+
+
+
+
     /**
      * Filter the default media display states for items in the Media list table.
@@ -1757 +1761 @@
      *
      * @param array $media_states An array of media states. Default 'Header Image',
-     *                            'Background Image', 'Site Icon'.
+     *                            'Background Image', 'Site Icon'.
      */
     $media_states = apply_filters( 'display_media_states', $media_states );

trunk/src/wp-admin/js/customize-controls.js

@@ -2304 +2304 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * @class
      * @augments wp.customize.Control
@@ -3209 +3246 @@
         cropped_image: api.CroppedImageControl,
         site_icon:     api.SiteIconControl,
+
         header:        api.HeaderControl,
         background:    api.BackgroundControl,

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -218 +218 @@
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
+
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
@@ -829 +830 @@
             'activeControls' => array(),
             'nonce' => $this->get_nonces(),
+
+
+
             '_dirty' => array_keys( $this->unsanitized_post_values() ),
         );
@@ -1858 +1862 @@
         $this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
         $this->register_control_type( 'WP_Customize_Site_Icon_Control' );
+
         $this->register_control_type( 'WP_Customize_Theme_Control' );
 
@@ -1932 +1937 @@
             'section'    => 'title_tagline',
         ) );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
         $this->add_setting( 'site_icon', array(
@@ -1952 +1974 @@
         ) ) );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         /* Colors */
 
@@ -2180 +2222 @@
 
         return $color;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }

trunk/src/wp-includes/customize/class-wp-customize-site-icon-control.php

@@ -42 +42 @@
         add_action( 'customize_controls_print_styles', 'wp_site_icon', 99 );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/src/wp-includes/general-template.php

@@ -830 +830 @@
 function has_site_icon( $blog_id = 0 ) {
     return (bool) get_site_icon_url( 512, '', $blog_id );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/wp-includes/js/customize-preview.js

@@ -224 +224 @@
         });
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         api.trigger( 'preview-ready' );
     });

trunk/src/wp-includes/post-template.php

@@ -706 +706 @@
     if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
         $classes[] = 'custom-background';
+
+
+
+
 
     $page = $wp_query->get( 'page' );