<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13487] trunk: Move Admin Colour Scheme picker to a hook.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13487">13487</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 06:34:31 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move Admin Colour Scheme picker to a hook. Props Jick. s/register_admin_color_themes()/register_admin_color_schemes/g. See <a href="http://trac.wordpress.org/ticket/11625">#11625</a>, Fixes <a href="http://trac.wordpress.org/ticket/6837">#6837</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (13486 => 13487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-02-28 05:59:39 UTC (rev 13486)
+++ trunk/wp-admin/includes/misc.php 2010-02-28 06:34:31 UTC (rev 13487)
</span><span class="lines">@@ -662,4 +662,32 @@
</span><span class="cx"> function send_nosniff_header() {
</span><span class="cx"> @header( 'X-Content-Type-Options: nosniff' );
</span><span class="cx"> }
</span><ins>+/**
+ * Display the default admin color scheme picker (Used in user-edit.php)
+ *
+ * @since 3.0
+ */
+function admin_color_scheme_picker() {
+ global $_wp_admin_css_colors, $user_id; ?>
+<fieldset><legend class="screen-reader-text"><span><?php _e('Admin Color Scheme')?></span></legend>
+<?php
+$current_color = get_user_option('admin_color', $user_id);
+if ( empty($current_color) )
+ $current_color = 'fresh';
+foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
+<div class="color-option"><input name="admin_color" id="admin_color_<?php echo $color; ?>" type="radio" value="<?php echo esc_attr($color) ?>" class="tog" <?php checked($color, $current_color); ?> />
+ <table class="color-palette">
+ <tr>
+ <?php foreach ( $color_info->colors as $html_color ): ?>
+ <td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>">&nbsp;</td>
+ <?php endforeach; ?>
+ </tr>
+ </table>
+
+ <label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
+</div>
+ <?php endforeach; ?>
+</fieldset>
+<?php
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (13486 => 13487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-02-28 05:59:39 UTC (rev 13486)
+++ trunk/wp-admin/user-edit.php 2010-02-28 06:34:31 UTC (rev 13487)
</span><span class="lines">@@ -184,31 +184,13 @@
</span><span class="cx"> <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php if ( count($_wp_admin_css_colors) > 1 ) : ?>
</del><ins>+<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
</ins><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e('Admin Color Scheme')?></th>
</span><del>-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Admin Color Scheme')?></span></legend>
-<?php
-$current_color = get_user_option('admin_color', $user_id);
-if ( empty($current_color) )
- $current_color = 'fresh';
-foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
-<div class="color-option"><input name="admin_color" id="admin_color_<?php echo $color; ?>" type="radio" value="<?php echo esc_attr($color) ?>" class="tog" <?php checked($color, $current_color); ?> />
- <table class="color-palette">
- <tr>
- <?php foreach ( $color_info->colors as $html_color ): ?>
- <td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>">&nbsp;</td>
- <?php endforeach; ?>
- </tr>
- </table>
-
- <label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
-</div>
- <?php endforeach; ?>
-</fieldset></td>
</del><ins>+<td><?php do_action( 'admin_color_scheme_picker' ); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php
</span><del>-endif;
</del><ins>+endif; // $_wp_admin_css_colors
</ins><span class="cx"> if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
</span></span></pre></div>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (13486 => 13487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2010-02-28 05:59:39 UTC (rev 13486)
+++ trunk/wp-includes/default-filters.php 2010-02-28 06:34:31 UTC (rev 13487)
</span><span class="lines">@@ -238,5 +238,6 @@
</span><span class="cx"> // Timezone
</span><span class="cx"> add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
</span><span class="cx">
</span><del>-// Admin Themes
-add_action('admin_init', 'register_admin_color_themes', 1);
</del><ins>+// Admin Color Schemes
+add_action( 'admin_init', 'register_admin_color_schemes', 1);
+add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
</ins></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13486 => 13487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-28 05:59:39 UTC (rev 13486)
+++ trunk/wp-includes/general-template.php 2010-02-28 06:34:31 UTC (rev 13487)
</span><span class="lines">@@ -2029,11 +2029,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Registers the default Admin color themes
</del><ins>+ * Registers the default Admin color schemes
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><del>-function register_admin_color_themes() {
</del><ins>+function register_admin_color_schemes() {
</ins><span class="cx"> wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
</span><span class="cx"> wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));}
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>