Changeset 42111

Timestamp:

11/02/2017 10:59:04 PM (7 years ago)

Author:

westonruter

Message:

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 #42373, #28721.
Fixes #42394.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (4 diffs)
• wp-includes/customize/class-wp-customize-date-time-control.php (modified) (4 diffs)

trunk/src/wp-admin/css/customize-controls.css

@@ -333 +333 @@
 }
 
-.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;
-}
 .customize-control.customize-control-date_time .date-time-fields .date-input.day {
     margin-right: 0;
@@ -362 +357 @@
 }
 
-.date-time-fields .date-time-separator {
-    line-height: 2;
-}
-
 .date-time-fields .time-row {
     margin-top: 12px;
@@ -371 +362 @@
 
 .date-time-fields .date-timezone {
-    float: left;
     line-height: 2.2;
     text-decoration: none;
@@ -2831 +2821 @@
     }
 
-    .date-time-fields .date-time-separator,
     .date-time-fields .date-timezone {
         line-height: 3.2;

trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php

@@ -99 +99 @@
         $data = array_merge( $this->json(), $this->get_month_choices() );
         $timezone_info = $this->get_timezone_info();
+
+        $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 );
+        }
         ?>
 
@@ -117 +128 @@
                 <legend class="title-day {{ ! data.includeTime ? 'screen-reader-text' : '' }}"><?php esc_html_e( 'Date' ); ?></legend>
                 <div class="day-fields clear">
+                    <?php ob_start(); ?>
                     <label for="{{ idPrefix }}date-time-month" class="screen-reader-text"><?php esc_html_e( 'Month' ); ?></label>
                     <select id="{{ idPrefix }}date-time-month" class="date-input month" data-component="month">
@@ -130 +142 @@
                         <# } ); #>
                     </select>
+                    <?php $month_field = trim( ob_get_clean() ); ?>
+
+                    <?php ob_start(); ?>
                     <label for="{{ idPrefix }}date-time-day" class="screen-reader-text"><?php esc_html_e( 'Day' ); ?></label>
                     <input id="{{ idPrefix }}date-time-day" type="number" size="2" autocomplete="off" class="date-input day" data-component="day" min="1" max="31" />
-                    <span class="time-special-char date-time-separator">,</span>
+                    <?php $day_field = trim( ob_get_clean() ); ?>
+
+                    <?php ob_start(); ?>
                     <label for="{{ idPrefix }}date-time-year" class="screen-reader-text"><?php esc_html_e( 'Year' ); ?></label>
                     <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 }}">
+                    <?php $year_field = trim( ob_get_clean() ); ?>
+
+                    <?php printf( $date_format, $year_field, $month_field, $day_field ); ?>
                 </div>
             </fieldset>
@@ -145 +165 @@
                         <# var minHour = data.twelveHourFormat ? 1 : 0; #>
                         <input id="{{ idPrefix }}date-time-hour" type="number" size="2" autocomplete="off" class="date-input hour" data-component="hour" min="{{ minHour }}" max="{{ maxHour }}">
-                        <span class="time-special-char date-time-separator">:</span>
+                        :
                         <label for="{{ idPrefix }}date-time-minute" class="screen-reader-text"><?php esc_html_e( 'Minute' ); ?></label>
                         <input id="{{ idPrefix }}date-time-minute" type="number" size="2" autocomplete="off" class="date-input minute" data-component="minute" min="0" max="59">