X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-includes/class-wp-customize-section.php diff --git a/wp-includes/class-wp-customize-section.php b/wp-includes/class-wp-customize-section.php index b852dfba..68d67713 100644 --- a/wp-includes/class-wp-customize-section.php +++ b/wp-includes/class-wp-customize-section.php @@ -24,6 +24,8 @@ class WP_Customize_Section { * Used when sorting two instances whose priorities are equal. * * @since 4.1.0 + * + * @static * @access protected * @var int */ @@ -137,12 +139,24 @@ class WP_Customize_Section { * @see WP_Customize_Section::active() * * @var callable Callback is called with one argument, the instance of - * {@see WP_Customize_Section}, and returns bool to indicate - * whether the section is active (such as it relates to the URL - * currently being previewed). + * WP_Customize_Section, and returns bool to indicate whether + * the section is active (such as it relates to the URL currently + * being previewed). */ public $active_callback = ''; + /** + * Show the description or hide it behind the help icon. + * + * @since 4.7.0 + * @access public + * + * @var bool Indicates whether the Section's description should be + * hidden behind a help icon ("?") in the Section header, + * similar to how help icons are displayed on Panels. + */ + public $description_hidden = false; + /** * Constructor. * @@ -186,12 +200,12 @@ class WP_Customize_Section { $active = call_user_func( $this->active_callback, $this ); /** - * Filter response of {@see WP_Customize_Section::active()}. + * Filters response of WP_Customize_Section::active(). * * @since 4.1.0 * * @param bool $active Whether the Customizer section is active. - * @param WP_Customize_Section $section {@see WP_Customize_Section} instance. + * @param WP_Customize_Section $section WP_Customize_Section instance. */ $active = apply_filters( 'customize_section_active', $active, $section ); @@ -199,7 +213,7 @@ class WP_Customize_Section { } /** - * Default callback used when invoking {@see WP_Customize_Section::active()}. + * Default callback used when invoking WP_Customize_Section::active(). * * Subclasses can override this with their specific logic, or they may provide * an 'active_callback' argument to the constructor. @@ -207,7 +221,7 @@ class WP_Customize_Section { * @since 4.1.0 * @access public * - * @return bool Always true. + * @return true Always true. */ public function active_callback() { return true; @@ -221,10 +235,19 @@ class WP_Customize_Section { * @return array The array to be exported to the client as JSON. */ public function json() { - $array = wp_array_slice_assoc( (array) $this, array( 'title', 'description', 'priority', 'panel', 'type' ) ); + $array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type', 'description_hidden' ) ); + $array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) ); $array['content'] = $this->get_content(); $array['active'] = $this->active(); $array['instanceNumber'] = $this->instance_number; + + if ( $this->panel ) { + /* translators: ▸ is the unicode right-pointing triangle, and %s is the section title in the Customizer */ + $array['customizeAction'] = sprintf( __( 'Customizing ▸ %s' ), esc_html( $this->manager->get_panel( $this->panel )->title ) ); + } else { + $array['customizeAction'] = __( 'Customizing' ); + } + return $array; } @@ -249,7 +272,7 @@ class WP_Customize_Section { } /** - * Get the section's content template for insertion into the Customizer pane. + * Get the section's content for insertion into the Customizer pane. * * @since 4.1.0 * @@ -258,9 +281,7 @@ class WP_Customize_Section { final public function get_content() { ob_start(); $this->maybe_render(); - $template = trim( ob_get_contents() ); - ob_end_clean(); - return $template; + return trim( ob_get_clean() ); } /** @@ -295,159 +316,91 @@ class WP_Customize_Section { } /** - * Render the section, and the controls that have been added to it. + * Render the section UI in a subclass. + * + * Sections are now rendered in JS by default, see WP_Customize_Section::print_template(). * * @since 3.4.0 */ - protected function render() { - $classes = 'accordion-section control-section control-section-' . $this->type; - ?> -
  • -

    - title ); ?> - -

    - -
    • - + + type; + protected function render_template() { ?> -
  • -

    - manager->is_theme_active() ) { - /* translators: %s: theme name */ - printf( __( 'Active theme %s' ), $this->title ); - } else { - /* translators: %s: theme name */ - printf( __( 'Previewing theme %s' ), $this->title ); - } - ?> - - +
  • +

    + {{ data.title }} +

    -
    -

    - - controls ) + 1 /* Active theme */; ?> -

    - -

    - manager->is_theme_active() ) { - /* translators: %s: theme name */ - printf( __( 'Active theme %s' ), $this->title ); - } else { - /* translators: %s: theme name */ - printf( __( 'Previewing theme %s' ), $this->title ); - } - ?> - -

    - - - -
    - controls ) > 4 ) : ?> -

    - -
    -
      -
    -
    -
    +
      +
    • +
      + +

      + + {{{ data.customizeAction }}} + + {{ data.title }} +

      + <# if ( data.description && data.description_hidden ) { #> + +
      + {{{ data.description }}} +
      + <# } #> +
      + + <# if ( data.description && ! data.description_hidden ) { #> +
      + {{{ data.description }}} +
      + <# } #> +
      • +
    • -sidebar_id; - return $json; - } +/** WP_Customize_Nav_Menu_Section class */ +require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' ); - /** - * Whether the current sidebar is rendered on the page. - * - * @since 4.1.0 - * @access public - * - * @return bool Whether sidebar is rendered. - */ - public function active_callback() { - return $this->manager->widgets->is_sidebar_rendered( $this->sidebar_id ); - } -} +/** WP_Customize_New_Menu_Section class */ +require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );