Changeset 26506 for trunk/src/wp-admin/includes/misc.php

Timestamp:

12/01/2013 07:49:55 PM (12 years ago)

Author:

azaozz

Message:

Improve the admin color scheme picker:

• Easier to extend.
• Remove the "drop-down" look, show all choices inline.
• Some PHP and JS cleanup.

Props ryelle, fixes #26336.

File:

• trunk/src/wp-admin/includes/misc.php (modified) (2 diffs)

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

@@ -564 +564 @@
 function admin_color_scheme_picker() {
     global $_wp_admin_css_colors, $user_id;
-    ksort($_wp_admin_css_colors);
+
+    ksort( $_wp_admin_css_colors );
+
+    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 );
+    }
 
     $current_color = get_user_option( 'admin_color', $user_id );
 
-    if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) )
+    if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
         $current_color = 'fresh';
-
-    $color_info = $_wp_admin_css_colors[ $current_color ];
-?>
-
-    <fieldset id="color-picker">
+    }
+
+    ?>
+    <fieldset id="color-picker" class="scheme-list">
         <legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
-
-        <div class="picker-dropdown dropdown-current">
-            <div class="picker-dropdown-arrow"></div>
-            <label for="admin_color_<?php echo esc_attr( $current_color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
-            <table class="color-palette">
-                <tr>
-                <?php foreach ( $color_info->colors as $html_color ): ?>
-                    <td style="background-color: <?php echo esc_attr( $html_color ); ?>" title="<?php echo esc_attr( $current_color ); ?>">&nbsp;</td>
-                <?php endforeach; ?>
-                </tr>
-            </table>
-        </div>
-
-        <div class="picker-dropdown dropdown-container">
-
-        <?php foreach ( $_wp_admin_css_colors as $color => $color_info ) : ?>
-
+        <?php
+
+        foreach ( $_wp_admin_css_colors as $color => $color_info ) :
+
+            ?>
             <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
                 <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
@@ -600 +593 @@
                 <table class="color-palette">
                     <tr>
-                    <?php foreach ( $color_info->colors as $html_color ): ?>
+                    <?php
+
+                    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>
-                    <?php endforeach; ?>
+                        <?php
+                    }
+
+                    ?>
                     </tr>
                 </table>
             </div>
-
-        <?php endforeach; ?>
-
-        </div>
-
+            <?php
+
+        endforeach;
+
+    ?>
     </fieldset>
-
-<?php
+    <?php
 }