Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

Refactor the Customizer accordion so that it can be used in other locations.

Browse Source 
fixes #23449. props lessbloat, aaroncampbell

git-svn-id: http://core.svn.wordpress.org/trunk@23417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2013-02-14 22:58:04 +00:00
parent cc5ed3a485
commit 88f17f77c4
10 changed files with 218 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/css/customize-controls-rtl.css
View File

@ -1,11 +1,3 @@
.control-section .customize-section-title {
font-family: Tahoma, Arial, sans-serif;
}
.customize-section-title:after {
right: auto;
left: 20px;
}
#customize-header-actions .button-primary { #customize-header-actions .button-primary {
float: left; float: left;
} }

179
wp-admin/css/customize-controls.css
View File

@ -6,124 +6,7 @@ body {
text-decoration: none; text-decoration: none;
} }
.customize-section { #customize-info .accordion-section-content {
border-top: 1px solid #fff;
border-bottom: 1px solid #dfdfdf;
margin: 0;
}
.control-section.customize-section:hover,
.control-section.customize-section.open {
border-top-color: #808080;
}
.control-section.customize-section:hover {
border-bottom-color: #6d6d6d;
}
.customize-section.open:hover {
border-bottom-color: #dfdfdf;
}
.customize-section:last-child {
box-shadow: 0 1px 0 0px #fff;
}
.customize-section-title {
margin: 0;
padding: 15px 20px;
position: relative;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}
.customize-section-title:focus {
outline: none;
}
.cannot-expand .customize-section-title {
cursor: auto;
}
.customize-section-content {
display: none;
padding: 10px 20px 15px;
overflow: hidden;
}
.control-section .customize-section-title {
padding: 10px 20px;
font-size: 15px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal;
text-shadow: 0 1px 0 #fff;
background: #f5f5f5;
background-image: -webkit-gradient(linear, left bottom, left top, from(#eee), to(#f5f5f5));
background-image: -webkit-linear-gradient(bottom, #eee, #f5f5f5);
background-image: -moz-linear-gradient(bottom, #eee, #f5f5f5);
background-image: -o-linear-gradient(bottom, #eee, #f5f5f5);
background-image: linear-gradient(to top, #eee, #f5f5f5);
}
.control-section:hover .customize-section-title,
.control-section .customize-section-title:hover,
.control-section.open .customize-section-title,
.control-section .customize-section-title:focus {
color: #fff;
text-shadow: 0 -1px 0 #333;
background: #808080;
background-image: -webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080));
background-image: -webkit-linear-gradient(bottom, #6d6d6d, #808080);
background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080);
background-image: -o-linear-gradient(bottom, #6d6d6d, #808080);
background-image: linear-gradient(to top, #6d6d6d, #808080);
}
.control-section.open .customize-section-title {
border-bottom: 1px solid #6d6d6d;
}
.customize-section.open .customize-section-content {
display: block;
background: #fdfdfd;
}
.customize-section-title:after {
content: '';
width: 0;
height: 0;
border-color: #ccc transparent;
border-style: solid;
border-width: 6px 6px 0;
position: absolute;
top: 25px;
right: 20px;
z-index: 1;
}
.cannot-expand .customize-section-title:after {
display: none;
}
.customize-section-title:hover:after,
.customize-section-title:focus:after {
border-color: #aaa transparent;
}
.control-section .customize-section-title:hover:after,
.control-section .customize-section-title:focus:after {
border-color: #eee transparent;
}
.control-section .customize-section-title:after {
top: 15px;
}
#customize-info .customize-section-content {
background: transparent; background: transparent;
} }
@ -158,7 +41,7 @@ body {
} }
#customize-theme-controls > ul, #customize-theme-controls > ul,
#customize-theme-controls .customize-section-content { #customize-theme-controls .accordion-section-content {
margin: 0; margin: 0;
} }
@ -245,7 +128,7 @@ body {
/* /*
* Dropdowns * Dropdowns
*/ */
.customize-section .dropdown { .accordion-section .dropdown {
float: left; float: left;
display: block; display: block;
position: relative; position: relative;
@ -255,7 +138,7 @@ body {
border-radius: 3px; border-radius: 3px;
} }
.customize-section .dropdown-content { .accordion-section .dropdown-content {
overflow: hidden; overflow: hidden;
float: left; float: left;
min-width: 30px; min-width: 30px;
@ -301,12 +184,12 @@ body {
z-index: 1; z-index: 1;
} }
.customize-section .dropdown:hover .dropdown-content, .accordion-section .dropdown:hover .dropdown-content,
.customize-control .dropdown:hover .dropdown-arrow { .customize-control .dropdown:hover .dropdown-arrow {
border-color: #aaa; border-color: #aaa;
} }
.customize-section .dropdown:hover .dropdown-arrow:after { .accordion-section .dropdown:hover .dropdown-arrow:after {
border-color: #aaa transparent; border-color: #aaa transparent;
} }
@ -341,7 +224,7 @@ body {
border-color: rgba( 0, 0, 0, 0.25 ); border-color: rgba( 0, 0, 0, 0.25 );
} }
.customize-section input[type="text"].color-picker-hex { .accordion-section input[type="text"].color-picker-hex {
width: 65px; width: 65px;
font-family: monospace; font-family: monospace;
text-align: center; text-align: center;
@ -349,10 +232,10 @@ body {
} }
/* The centered cursor overlaps the placeholder in webkit. Hide it when selected. */ /* The centered cursor overlaps the placeholder in webkit. Hide it when selected. */
.customize-section input[type="text"].color-picker-hex:focus::-webkit-input-placeholder { .accordion-section input[type="text"].color-picker-hex:focus::-webkit-input-placeholder {
color: transparent; color: transparent;
} }
.customize-section input[type="text"].color-picker-hex:-moz-placeholder { .accordion-section input[type="text"].color-picker-hex:-moz-placeholder {
color: #999; color: #999;
} }
@ -371,18 +254,18 @@ body {
display: block; display: block;
} }
.customize-section .customize-control-image .dropdown-content { .accordion-section .customize-control-image .dropdown-content {
height: auto; height: auto;
min-height: 24px; min-height: 24px;
min-width: 40px; min-width: 40px;
padding: 0; padding: 0;
} }
.customize-section .customize-control-image .dropdown-status { .accordion-section .customize-control-image .dropdown-status {
padding: 4px 5px; padding: 4px 5px;
} }
.customize-section .customize-control-image .preview-thumbnail img { .accordion-section .customize-control-image .preview-thumbnail img {
display: block; display: block;
width: 100%; width: 100%;
max-width: 122px; max-width: 122px;
@ -390,18 +273,18 @@ body {
margin: 0 auto; margin: 0 auto;
} }
.customize-section .customize-control-image .actions { .accordion-section .customize-control-image .actions {
text-align: right; text-align: right;
} }
.customize-section .customize-control-image .library ul { .accordion-section .customize-control-image .library ul {
border-bottom: 1px solid #dfdfdf; border-bottom: 1px solid #dfdfdf;
float: left; float: left;
width: 100%; width: 100%;
margin: 10px 0 0; margin: 10px 0 0;
} }
.customize-section .customize-control-image .library li { .accordion-section .customize-control-image .library li {
color: #999; color: #999;
float: left; float: left;
padding: 3px 5px; padding: 3px 5px;
@ -411,7 +294,7 @@ body {
border-width: 1px 1px 0 1px; border-width: 1px 1px 0 1px;
} }
.customize-section .customize-control-image .library li.library-selected { .accordion-section .customize-control-image .library li.library-selected {
margin-bottom: -1px; margin-bottom: -1px;
padding-bottom: 4px; padding-bottom: 4px;
@ -422,27 +305,27 @@ body {
border-radius: 3px 3px 0 0 ; border-radius: 3px 3px 0 0 ;
} }
.customize-section .customize-control-image .library-content { .accordion-section .customize-control-image .library-content {
display: none; display: none;
width: 100%; width: 100%;
float: left; float: left;
padding: 10px 0; padding: 10px 0;
} }
.customize-section .customize-control-image .library-content.library-selected { .accordion-section .customize-control-image .library-content.library-selected {
display: block; display: block;
} }
.customize-section .customize-control-image .library .thumbnail { .accordion-section .customize-control-image .library .thumbnail {
display: block; display: block;
width: 100%; width: 100%;
} }
.customize-section .customize-control-image .library .thumbnail:hover img { .accordion-section .customize-control-image .library .thumbnail:hover img {
border-color: #21759b; border-color: #21759b;
} }
.customize-section .customize-control-image .library .thumbnail img { .accordion-section .customize-control-image .library .thumbnail img {
display: block; display: block;
max-width: 90%; max-width: 90%;
max-height: 80px; max-height: 80px;
@ -453,13 +336,13 @@ body {
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
} }
.customize-section .customize-control-upload .upload-fallback, .accordion-section .customize-control-upload .upload-fallback,
.customize-section .customize-control-image .upload-fallback { .accordion-section .customize-control-image .upload-fallback {
display: none; display: none;
} }
.customize-section .customize-control-upload .upload-dropzone, .accordion-section .customize-control-upload .upload-dropzone,
.customize-section .customize-control-image .upload-dropzone { .accordion-section .customize-control-image .upload-dropzone {
display: none; display: none;
padding: 15px 10px; padding: 15px 10px;
border: 3px dashed #dfdfdf; border: 3px dashed #dfdfdf;
@ -470,8 +353,8 @@ body {
cursor: default; cursor: default;
} }
.customize-section .customize-control-upload .upload-dropzone.supports-drag-drop, .accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop,
.customize-section .customize-control-image .upload-dropzone.supports-drag-drop { .accordion-section .customize-control-image .upload-dropzone.supports-drag-drop {
display: block; display: block;
-webkit-transition: border-color 0.1s; -webkit-transition: border-color 0.1s;
-moz-transition: border-color 0.1s; -moz-transition: border-color 0.1s;
@ -480,13 +363,13 @@ body {
transition: border-color 0.1s; transition: border-color 0.1s;
} }
.customize-section .customize-control-upload .library ul li, .accordion-section .customize-control-upload .library ul li,
.customize-section .customize-control-image .library ul li { .accordion-section .customize-control-image .library ul li {
cursor: pointer; cursor: pointer;
} }
.customize-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over, .accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over,
.customize-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over { .accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over {
border-color: #83b4d8; border-color: #83b4d8;
} }

9
wp-admin/css/wp-admin-rtl.css
View File

@ -2534,6 +2534,15 @@ div.sidebar-name h3 {
direction: ltr; direction: ltr;
} }
.control-section .accordion-section-title {
font-family: Tahoma, Arial, sans-serif;
}
.accordion-section-title:after {
right: auto;
left: 20px;
}
/** /**
* HiDPI Displays * HiDPI Displays
*/ */

115
wp-admin/css/wp-admin.css
View File

@ -8277,6 +8277,121 @@ a.widget-control-edit {
-ms-touch-action: none; -ms-touch-action: none;
} }
/* Accordion */
.accordion-section {
border-top: 1px solid #fff;
border-bottom: 1px solid #dfdfdf;
margin: 0;
}
.accordion-section:last-child {
box-shadow: 0 1px 0 0px #fff;
}
.accordion-section.open .accordion-section-content {
display: block;
background: #fdfdfd;
}
.accordion-section.open:hover {
border-bottom-color: #dfdfdf;
}
.accordion-section-content {
display: none;
padding: 10px 20px 15px;
overflow: hidden;
}
.accordion-section-title {
margin: 0;
padding: 15px 20px;
position: relative;
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}
.accordion-section-title:after {
content: '';
width: 0;
height: 0;
border-color: #ccc transparent;
border-style: solid;
border-width: 6px 6px 0;
position: absolute;
top: 25px;
right: 20px;
z-index: 1;
}
.accordion-section-title:focus {
outline: none;
}
.accordion-section-title:hover:after,
.accordion-section-title:focus:after {
border-color: #aaa transparent;
}
.cannot-expand .accordion-section-title {
cursor: auto;
}
.cannot-expand .accordion-section-title:after {
display: none;
}
.control-section .accordion-section-title {
padding: 10px 20px;
font-size: 15px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal;
text-shadow: 0 1px 0 #fff;
background: #f5f5f5;
background-image: -webkit-gradient(linear, left bottom, left top, from(#eee), to(#f5f5f5));
background-image: -webkit-linear-gradient(bottom, #eee, #f5f5f5);
background-image: -moz-linear-gradient(bottom, #eee, #f5f5f5);
background-image: -o-linear-gradient(bottom, #eee, #f5f5f5);
background-image: linear-gradient(to top, #eee, #f5f5f5);
}
.control-section .accordion-section-title:after {
top: 15px;
}
.control-section .accordion-section-title:hover:after,
.control-section .accordion-section-title:focus:after {
border-color: #eee transparent;
}
.control-section:hover .accordion-section-title,
.control-section .accordion-section-title:hover,
.control-section.open .accordion-section-title,
.control-section .accordion-section-title:focus {
color: #fff;
text-shadow: 0 -1px 0 #333;
background: #808080;
background-image: -webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080));
background-image: -webkit-linear-gradient(bottom, #6d6d6d, #808080);
background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080);
background-image: -o-linear-gradient(bottom, #6d6d6d, #808080);
background-image: linear-gradient(to top, #6d6d6d, #808080);
}
.control-section.accordion-section:hover,
.control-section.accordion-section.open {
border-top-color: #808080;
}
.control-section.open .accordion-section-title {
border-bottom: 1px solid #6d6d6d;
}
/* =Media Queries /* =Media Queries
-------------------------------------------------------------- */ -------------------------------------------------------------- */

10
wp-admin/customize.php
View File

@ -36,6 +36,8 @@ do_action( 'customize_controls_init' );
wp_enqueue_script( 'customize-controls' ); wp_enqueue_script( 'customize-controls' );
wp_enqueue_style( 'customize-controls' ); wp_enqueue_style( 'customize-controls' );
wp_enqueue_script( 'accordion' );
do_action( 'customize_controls_enqueue_scripts' ); do_action( 'customize_controls_enqueue_scripts' );
// Let's roll. // Let's roll.
@ -89,15 +91,15 @@ do_action( 'customize_controls_print_scripts' );
?> ?>
<div class="wp-full-overlay-sidebar-content" tabindex="-1"> <div class="wp-full-overlay-sidebar-content" tabindex="-1">
<div id="customize-info" class="customize-section<?php if ( $cannot_expand ) echo ' cannot-expand'; ?>"> <div id="customize-info" class="accordion-section<?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
<div class="customize-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0"> <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0">
<span class="preview-notice"><?php <span class="preview-notice"><?php
/* translators: %s is the theme name in the Customize/Live Preview pane */ /* translators: %s is the theme name in the Customize/Live Preview pane */
echo sprintf( __( 'You are previewing %s' ), '<strong class="theme-name">' . $wp_customize->theme()->display('Name') . '</strong>' ); echo sprintf( __( 'You are previewing %s' ), '<strong class="theme-name">' . $wp_customize->theme()->display('Name') . '</strong>' );
?></span> ?></span>
</div> </div>
<?php if ( ! $cannot_expand ) : ?> <?php if ( ! $cannot_expand ) : ?>
<div class="customize-section-content"> <div class="accordion-section-content">
<?php if ( $screenshot ) : ?> <?php if ( $screenshot ) : ?>
<img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" /> <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
<?php endif; ?> <?php endif; ?>
@ -109,7 +111,7 @@ do_action( 'customize_controls_print_scripts' );
<?php endif; ?> <?php endif; ?>
</div> </div>
<div id="customize-theme-controls"><ul> <div id="customize-theme-controls" class="accordion-container"><ul>
<?php <?php
foreach ( $wp_customize->sections() as $section ) foreach ( $wp_customize->sections() as $section )
$section->maybe_render(); $section->maybe_render();

51
wp-admin/js/accordion.js Normal file
View File

@ -0,0 +1,51 @@
jQuery(document).ready( function($) {
// Expand/Collapse
$('.accordion-section-title').on('click keydown', function( event ) {
if ( event.type === 'keydown' && 13 !== event.which ) // enter
return;
var clicked = $( this ).closest( '.accordion-section' );
if ( clicked.hasClass('cannot-expand') )
return;
clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
clicked.toggleClass( 'open' );
event.preventDefault();
});
});
jQuery(document).ready( function($) {
// Expand/Collapse
$('.accordion-section-title').on('click keydown', function( event ) {
if ( event.type === 'keydown' && 13 !== event.which ) // enter
return;
var clicked = $( this ).closest( '.accordion-section' );
if ( clicked.hasClass('cannot-expand') )
return;
clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
clicked.toggleClass( 'open' );
event.preventDefault();
});
});
jQuery(document).ready( function($) {
// Expand/Collapse
$('.accordion-section-title').on('click keydown', function( event ) {
if ( event.type === 'keydown' && 13 !== event.which ) // enter
return;
var clicked = $( this ).closest( '.accordion-section' );
if ( clicked.hasClass('cannot-expand') )
return;
clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
clicked.toggleClass( 'open' );
event.preventDefault();
});
});

0
wp-admin/js/accordion.min.js vendored Normal file
View File

20
wp-admin/js/customize-controls.js
View File

@ -846,26 +846,6 @@
api.state = state; api.state = state;
}()); }());
// Temporary accordion code.
$('.customize-section-title').bind('click keydown', function( event ) {
if ( event.type === 'keydown' && 13 !== event.which ) // enter
return;
var clicked = $( this ).parents( '.customize-section' );
if ( clicked.hasClass('cannot-expand') )
return;
// Scroll up if on #customize-section-title_tagline
if ('customize-section-title_tagline' === clicked.attr('id'))
$('.wp-full-overlay-sidebar-content').scrollTop(0);
$( '.customize-section' ).not( clicked ).removeClass( 'open' );
clicked.toggleClass( 'open' );
event.preventDefault();
});
// Button bindings. // Button bindings.
$('#save').click( function( event ) { $('#save').click( function( event ) {
previewer.save(); previewer.save();

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

@ -79,9 +79,9 @@ class WP_Customize_Section {
*/ */
protected function render() { protected function render() {
?> ?>
<li id="customize-section-<?php echo esc_attr( $this->id ); ?>" class="control-section customize-section"> <li id="accordion-section-<?php echo esc_attr( $this->id ); ?>" class="control-section accordion-section">
<h3 class="customize-section-title" tabindex="0" title="<?php echo esc_attr( $this->description ); ?>"><?php echo esc_html( $this->title ); ?></h3> <h3 class="accordion-section-title" tabindex="0" title="<?php echo esc_attr( $this->description ); ?>"><?php echo esc_html( $this->title ); ?></h3>
<ul class="customize-section-content"> <ul class="accordion-section-content">
<?php <?php
foreach ( $this->controls as $control ) foreach ( $this->controls as $control )
$control->maybe_render(); $control->maybe_render();

4
wp-includes/script-loader.php
View File

@ -107,7 +107,7 @@ function wp_default_scripts( &$scripts ) {
) ); ) );
$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), false, 1 ); $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), false, 1 );
$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 ); $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings', did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
apply_filters( 'heartbeat_settings', array() ) apply_filters( 'heartbeat_settings', array() )
@ -331,6 +331,8 @@ function wp_default_scripts( &$scripts ) {
'allowedFiles' => __( 'Allowed Files' ), 'allowedFiles' => __( 'Allowed Files' ),
) ); ) );
$scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );
$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 ); $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
$scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 ); $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 );
did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array( did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(