<!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>[28927] trunk/src: Support descriptions for individual customizer controls.</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/28927">28927</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-06-30 15:54:04 +0000 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support descriptions for individual customizer controls.
* Control title (label) markup will also only be output if specified.
* Control section descriptions are no longer italicized for visual hierarchy / differentiation.
props celloexpressions. fixes <a href="http://core.trac.wordpress.org/ticket/27981">#27981</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizesectionphp">trunk/src/wp-includes/class-wp-customize-section.php</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 (28926 => 28927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/customize-controls.css 2014-06-30 15:09:52 UTC (rev 28926)
+++ trunk/src/wp-admin/css/customize-controls.css 2014-06-30 15:54:04 UTC (rev 28927)
</span><span class="lines">@@ -275,6 +275,10 @@
</span><span class="cx"> line-height: 24px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+p.customize-section-description {
+ font-style: normal;
+}
+
</ins><span class="cx"> .customize-control {
</span><span class="cx"> width: 100%;
</span><span class="cx"> float: left;
</span><span class="lines">@@ -314,6 +318,13 @@
</span><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.customize-control-description {
+ display: block;
+ font-style: italic;
+ line-height: 18px;
+ margin-bottom: 5px;
+}
+
</ins><span class="cx"> .customize-control-color .color-picker,
</span><span class="cx"> .customize-control-checkbox label,
</span><span class="cx"> .customize-control-upload div {
</span><span class="lines">@@ -333,6 +344,10 @@
</span><span class="cx"> line-height: 22px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.customize-control-radio .customize-control-title + .customize-control-description {
+ margin-top: 7px;
+}
+
</ins><span class="cx"> .customize-control-radio label {
</span><span class="cx"> line-height: 32px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-control.php (28926 => 28927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-control.php 2014-06-30 15:09:52 UTC (rev 28926)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2014-06-30 15:54:04 UTC (rev 28927)
</span><span class="lines">@@ -54,6 +54,12 @@
</span><span class="cx"> public $label = '';
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @access public
+ * @var string
+ */
+ public $description = '';
+
+ /**
</ins><span class="cx"> * @todo: Remove choices
</span><span class="cx"> *
</span><span class="cx"> * @access public
</span><span class="lines">@@ -258,7 +264,12 @@
</span><span class="cx"> case 'text':
</span><span class="cx"> ?>
</span><span class="cx"> <label>
</span><del>- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</del><ins>+ <?php if ( ! empty( $this->label ) ) : ?>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <?php endif;
+ if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif; ?>
</ins><span class="cx"> <input type="text" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
</span><span class="cx"> </label>
</span><span class="cx"> <?php
</span><span class="lines">@@ -268,6 +279,9 @@
</span><span class="cx"> <label>
</span><span class="cx"> <input type="checkbox" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); checked( $this->value() ); ?> />
</span><span class="cx"> <?php echo esc_html( $this->label ); ?>
</span><ins>+ <?php if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif; ?>
</ins><span class="cx"> </label>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="lines">@@ -277,9 +291,13 @@
</span><span class="cx">
</span><span class="cx"> $name = '_customize-radio-' . $this->id;
</span><span class="cx">
</span><del>- ?>
- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
- <?php
</del><ins>+ if ( ! empty( $this->label ) ) : ?>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <?php endif;
+ if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif;
+
</ins><span class="cx"> foreach ( $this->choices as $value => $label ) :
</span><span class="cx"> ?>
</span><span class="cx"> <label>
</span><span class="lines">@@ -295,7 +313,13 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <label>
</span><del>- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</del><ins>+ <?php if ( ! empty( $this->label ) ) : ?>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <?php endif;
+ if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif; ?>
+
</ins><span class="cx"> <select <?php $this->link(); ?>>
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( $this->choices as $value => $label )
</span><span class="lines">@@ -401,7 +425,13 @@
</span><span class="cx"> // The input's value gets set by JS. Don't fill it.
</span><span class="cx"> ?>
</span><span class="cx"> <label>
</span><del>- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</del><ins>+ <?php if ( ! empty( $this->label ) ) : ?>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <?php endif;
+ if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif; ?>
+
</ins><span class="cx"> <div class="customize-control-content">
</span><span class="cx"> <input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>"<?php echo $default_attr; ?> />
</span><span class="cx"> </div>
</span><span class="lines">@@ -458,7 +488,12 @@
</span><span class="cx"> public function render_content() {
</span><span class="cx"> ?>
</span><span class="cx"> <label>
</span><del>- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</del><ins>+ <?php if ( ! empty( $this->label ) ) : ?>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <?php endif;
+ if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif; ?>
</ins><span class="cx"> <div>
</span><span class="cx"> <a href="#" class="button-secondary upload"><?php _e( 'Upload' ); ?></a>
</span><span class="cx"> <a href="#" class="remove"><?php _e( 'Remove' ); ?></a>
</span><span class="lines">@@ -540,7 +575,12 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <div class="customize-image-picker">
</span><del>- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</del><ins>+ <?php if ( ! empty( $this->label ) ) : ?>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <?php endif;
+ if ( ! empty( $this->description ) ) : ?>
+ <span class="description customize-control-description"><?php echo esc_html( $this->description ); ?></span>
+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <div class="customize-control-content">
</span><span class="cx"> <div class="dropdown preview-thumbnail" tabindex="0">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizesectionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-customize-section.php (28926 => 28927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-customize-section.php 2014-06-30 15:09:52 UTC (rev 28926)
+++ trunk/src/wp-includes/class-wp-customize-section.php 2014-06-30 15:54:04 UTC (rev 28927)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> <h3 class="accordion-section-title" tabindex="0"><?php echo esc_html( $this->title ); ?></h3>
</span><span class="cx"> <ul class="accordion-section-content">
</span><span class="cx"> <?php if ( ! empty( $this->description ) ) : ?>
</span><del>- <li><p class="description"><?php echo $this->description; ?></p></li>
</del><ins>+ <li><p class="description customize-section-description"><?php echo $this->description; ?></p></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( $this->controls as $control )
</span></span></pre>
</div>
</div>
</body>
</html>