Changeset 26776

Timestamp:

12/07/2013 07:45:57 AM (13 years ago)

Author:

nacin

Message:

Core updates for the new color schemes.

• Update about page, there's now 8.
• Display them four wide, not three, and ensure adequate spacing.
• Use a dedicated nonce.
• Push Light to the front in addition to Default.
• Use user-profile.js on about.php. A few extra things are initialized but they are harmless.

see #26468, #26387.

Location:

trunk/src

Files:

• wp-admin/about.php (modified) (2 diffs)
• wp-admin/css/wp-admin.css (modified) (2 diffs)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (3 diffs)
• wp-admin/js/about.js (deleted)
• wp-admin/js/user-profile.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/about.php

@@ -80 +80 @@
                 <div>
                         <h3><?php echo ( 'Pick a color' ); ?></h3>
-                        <p><?php echo ( 'We&#8217;ve included four color schemes so that you can pick your favorite. Choose from any of the schemes below to change it in an instant.' ); ?></p>
+                        <p><?php echo ( 'We&#8217;ve included eight color schemes so you can pick your favorite. Choose from any of them below to change it in an instant.' ); ?></p>
                         <?php $user_id = get_current_user_id(); ?>
                         <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) :?>
                                 <?php
-                                wp_nonce_field('update-user_' . $user_id);
                                 /** This action is documented in wp-admin/user-edit.php */
                                 do_action( 'admin_color_scheme_picker' );
@@ -91 +90 @@
                                 <img src="<?php echo admin_url( 'images/about-color-schemes.png' ); ?>" />
                         <?php endif; ?>
-                        <p><?php printf( ( 'To change your color scheme later, just <a href="%1$s">visit your profile settings</a>.' ), get_edit_profile_url( $user_id ) ); ?></p>
+                        <p><?php printf( ( 'To change your color scheme later, just <a href="%1$s">visit your profile</a>.' ), get_edit_profile_url( $user_id ) ); ?></p>
                 </div>
         </div>

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

@@ -7639 +7639 @@
 .color-option {
         display: inline-block;
-        width: 32%;
+        width: 24%;
         padding: 5px 15px 15px;
         -moz-box-sizing: border-box;
         box-sizing: border-box;
+        margin-bottom: 3px;
 }
 
@@ -8030 +8031 @@
 
 .about-wrap .about-colors .color-option {
-        width: 24%;
         padding-top: 10px;
 }

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2251 +2251 @@
 
         $user_id = get_current_user_id();
-        check_ajax_referer( 'update-user_' . $user_id, 'nonce' );
+
+        check_ajax_referer( 'save-color-scheme_' . $user_id, 'nonce' );
 
         $color_scheme = sanitize_key( $_POST['color_scheme'] );

trunk/src/wp-admin/includes/misc.php

@@ -568 +568 @@
 
         if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
-                // Set 'fresh' (the default option) to be the first array element
-                $_wp_admin_css_colors = array_merge( array( 'fresh' => '' ), $_wp_admin_css_colors );
+                // Set Default ('fresh') and Light should go first.
+                $_wp_admin_css_colors = array_merge( array( 'fresh' => '', 'light' => '' ), $_wp_admin_css_colors );
         }
 
@@ -582 +582 @@
                 <legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
                 <?php
-
+                wp_nonce_field( 'save-color-scheme_' . $user_id, 'color-nonce', false );
                 foreach ( $_wp_admin_css_colors as $color => $color_info ) :
 
@@ -597 +597 @@
                                         foreach ( $color_info->colors as $html_color ) {
                                                 ?>
-                                                <td style="background-color: <?php echo esc_attr( $html_color ); ?>" title="<?php echo esc_attr( $color ); ?>">&nbsp;</td>
+                                                <td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
                                                 <?php
                                         }

trunk/src/wp-admin/js/user-profile.js

@@ -115 +115 @@
                                         action:       'save-user-color-scheme',
                                         color_scheme: $this.children( 'input[name="admin_color"]' ).val(),
-                                        nonce:        $('#_wpnonce').val()
+                                        nonce:        $('#color-nonce').val()
                                 });
                         }

trunk/src/wp-includes/script-loader.php

@@ -332 +332 @@
         $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
 
-        $scripts->add( 'about', "/wp-admin/js/about$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
+        $scripts->add( 'about', false, array( 'user-profile' ), false );
 
         $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );