<!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>[42111] trunk/src: Customize: Present the date/time control input fields in the same format (and order) as `date_format`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42111">42111</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42111","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-02 22:59:04 +0000 (Thu, 02 Nov 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Present the date/time control input fields in the same format (and order) as `date_format`.
Props westonruter, obenland, atachibana for testing, Mirucon for testing.
See <a href="https://core.trac.wordpress.org/ticket/42373">#42373</a>, <a href="https://core.trac.wordpress.org/ticket/28721">#28721</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42394">#42394</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizedatetimecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2017-11-02 22:30:16 UTC (rev 42110)
+++ trunk/src/wp-admin/css/customize-controls.css 2017-11-02 22:59:04 UTC (rev 42111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,11 +332,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.customize-control.customize-control-date_time .date-time-fields .date-input,
-.customize-control.customize-control-date_time .date-time-fields .date-time-separator {
- float: left;
- margin-right: 5px;
-}
</del><span class="cx" style="display: block; padding: 0 10px"> .customize-control.customize-control-date_time .date-time-fields .date-input.day {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,16 +356,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.date-time-fields .date-time-separator {
- line-height: 2;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .date-time-fields .time-row {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 12px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .date-time-fields .date-timezone {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- float: left;
</del><span class="cx" style="display: block; padding: 0 10px"> line-height: 2.2;
</span><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2830,7 +2820,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 80px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .date-time-fields .date-time-separator,
</del><span class="cx" style="display: block; padding: 0 10px"> .date-time-fields .date-timezone {
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 3.2;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizedatetimecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php 2017-11-02 22:30:16 UTC (rev 42110)
+++ trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php 2017-11-02 22:59:04 UTC (rev 42111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,6 +98,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function content_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array_merge( $this->json(), $this->get_month_choices() );
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone_info = $this->get_timezone_info();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $date_format = get_option( 'date_format' );
+ foreach ( array( 'Y', 'y', 'o' ) as $year_token ) {
+ $date_format = preg_replace( '/(?<!\\\\)' . $year_token . '/', '%1$s', $date_format );
+ }
+ foreach ( array( 'F', 'm', 'M', 'n' ) as $month_token ) {
+ $date_format = preg_replace( '/(?<!\\\\)' . $month_token . '/', '%2$s', $date_format );
+ }
+ foreach ( array( 'j', 'd' ) as $day_token ) {
+ $date_format = preg_replace( '/(?<!\\\\)' . $day_token . '/', '%3$s', $date_format );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# _.defaults( data, <?php echo wp_json_encode( $data ); ?> ); #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,6 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="day-row">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="title-day {{ ! data.includeTime ? 'screen-reader-text' : '' }}"><?php esc_html_e( 'Date' ); ?></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="day-fields clear">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php ob_start(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="{{ idPrefix }}date-time-month" class="screen-reader-text"><?php esc_html_e( 'Month' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="{{ idPrefix }}date-time-month" class="date-input month" data-component="month">
</span><span class="cx" style="display: block; padding: 0 10px"> <# _.each( data.month_choices, function( choice ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,11 +141,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } ); #>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $month_field = trim( ob_get_clean() ); ?>
+
+ <?php ob_start(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="{{ idPrefix }}date-time-day" class="screen-reader-text"><?php esc_html_e( 'Day' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="{{ idPrefix }}date-time-day" type="number" size="2" autocomplete="off" class="date-input day" data-component="day" min="1" max="31" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="time-special-char date-time-separator">,</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $day_field = trim( ob_get_clean() ); ?>
+
+ <?php ob_start(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="{{ idPrefix }}date-time-year" class="screen-reader-text"><?php esc_html_e( 'Year' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="{{ idPrefix }}date-time-year" type="number" size="4" autocomplete="off" class="date-input year" data-component="year" min="{{ data.minYear }}" max="{{ data.maxYear }}">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $year_field = trim( ob_get_clean() ); ?>
+
+ <?php printf( $date_format, $year_field, $month_field, $day_field ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.includeTime ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# var maxHour = data.twelveHourFormat ? 12 : 23; #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# var minHour = data.twelveHourFormat ? 1 : 0; #>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="{{ idPrefix }}date-time-hour" type="number" size="2" autocomplete="off" class="date-input hour" data-component="hour" min="{{ minHour }}" max="{{ maxHour }}">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="time-special-char date-time-separator">:</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ :
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="{{ idPrefix }}date-time-minute" class="screen-reader-text"><?php esc_html_e( 'Minute' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="{{ idPrefix }}date-time-minute" type="number" size="2" autocomplete="off" class="date-input minute" data-component="minute" min="0" max="59">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.twelveHourFormat ) { #>
</span></span></pre>
</div>
</div>
</body>
</html>