<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29034] trunk/src/wp-admin: Customizer info section:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29034">29034</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-07-08 19:52:17 +0000 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Customizer info section:
* Only show the theme info when doing a live preview of another theme.
* Replace with helper text about what you are customizing and what the Customizer is for.
* Fix focus styling.
props celloexpressions, westonruter. fixes <a href="http://core.trac.wordpress.org/ticket/28550">#28550</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/customize-controls.css (29033 => 29034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/customize-controls.css 2014-07-08 18:46:56 UTC (rev 29033)
+++ trunk/src/wp-admin/css/customize-controls.css 2014-07-08 19:52:17 UTC (rev 29034)
</span><span class="lines">@@ -50,22 +50,12 @@
</span><span class="cx"> border-bottom: 1px solid #eeeeee;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#customize-info.open .accordion-section-title,
-#customize-info .accordion-section-title:hover,
-#customize-info .accordion-section-title:focus {
- color: #555555;
-}
-
</del><span class="cx"> #customize-info.open .accordion-section-title:after,
</span><span class="cx"> #customize-info .accordion-section-title:hover:after,
</span><span class="cx"> #customize-info .accordion-section-title:focus:after {
</span><span class="cx"> color: #555555;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#customize-info.open .accordion-section-title {
- border-color: transparent;
-}
-
</del><span class="cx"> #customize-info .preview-notice {
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> line-height: 24px;
</span><span class="lines">@@ -103,6 +93,9 @@
</span><span class="cx"> background: white;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#customize-info.open .accordion-section-title,
+#customize-info .accordion-section-title:hover,
+#customize-info .accordion-section-title:focus,
</ins><span class="cx"> #customize-theme-controls .control-section:hover > .accordion-section-title,
</span><span class="cx"> #customize-theme-controls .control-section .accordion-section-title:hover,
</span><span class="cx"> #customize-theme-controls .control-section.open .accordion-section-title,
</span><span class="lines">@@ -125,6 +118,7 @@
</span><span class="cx"> color: #555555;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#customize-info.open,
</ins><span class="cx"> #customize-theme-controls .control-section.open {
</span><span class="cx"> border-bottom: 1px solid #eeeeee;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/customize.php (29033 => 29034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/customize.php 2014-07-08 18:46:56 UTC (rev 29033)
+++ trunk/src/wp-admin/customize.php 2014-07-08 19:52:17 UTC (rev 29034)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $screenshot = $wp_customize->theme()->get_screenshot();
</span><del>- $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
</del><ins>+ $cannot_expand = ! ( $wp_customize->is_theme_active() || $screenshot || $wp_customize->theme()->get('Description') );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the customizer for compat -->
</span><span class="lines">@@ -127,19 +127,28 @@
</span><span class="cx"> <div id="customize-info" class="accordion-section <?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
</span><span class="cx"> <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0">
</span><span class="cx"> <span class="preview-notice"><?php
</span><del>- /* 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>' );
</del><ins>+ if ( ! $wp_customize->is_theme_active() ) {
+ /* 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>' );
+ } else {
+ /* translators: %s is the site title in the Customize pane */
+ echo sprintf( __( 'You are customizing %s' ), '<strong class="theme-name site-title">' . get_bloginfo( 'name' ) . '</strong>' );
+ }
</ins><span class="cx"> ?></span>
</span><span class="cx"> </div>
</span><span class="cx"> <?php if ( ! $cannot_expand ) : ?>
</span><span class="cx"> <div class="accordion-section-content">
</span><del>- <?php if ( $screenshot ) : ?>
- <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
- <?php endif; ?>
</del><ins>+ <?php if ( ! $wp_customize->is_theme_active() ) :
+ if ( $screenshot ) : ?>
+ <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( $wp_customize->theme()->get('Description') ): ?>
- <div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
- <?php endif; ?>
</del><ins>+ <?php if ( $wp_customize->theme()->get('Description') ): ?>
+ <div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
+ <?php endif;
+ else:
+ echo __( 'The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.' );
+ endif; ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/customize-controls.js (29033 => 29034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/customize-controls.js 2014-07-08 18:46:56 UTC (rev 29033)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-07-08 19:52:17 UTC (rev 29034)
</span><span class="lines">@@ -916,6 +916,7 @@
</span><span class="cx"> var previewer, parent, topFocus,
</span><span class="cx"> body = $( document.body ),
</span><span class="cx"> overlay = body.children( '.wp-full-overlay' ),
</span><ins>+ title = $( '#customize-info .theme-name.site-title' ),
</ins><span class="cx"> closeBtn = $( '.customize-controls-close' ),
</span><span class="cx"> saveBtn = $( '#save' );
</span><span class="cx">
</span><span class="lines">@@ -1112,6 +1113,13 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // Bind site title display to the corresponding field.
+ if ( title.length ) {
+ $( '#customize-control-blogname input' ).on( 'input', function() {
+ title.text( this.value );
+ } );
+ }
+
</ins><span class="cx"> // Create a potential postMessage connection with the parent frame.
</span><span class="cx"> parent = new api.Messenger({
</span><span class="cx"> url: api.settings.url.parent,
</span></span></pre>
</div>
</div>
</body>
</html>