<!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>[13668] trunk: Custom background color fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13668">13668</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-03-11 20:21:58 +0000 (Thu, 11 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Custom background color fixes. see <a href="http://trac.wordpress.org/ticket/12186">#12186</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (13667 => 13668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2010-03-11 18:28:31 UTC (rev 13667)
+++ trunk/wp-admin/css/wp-admin.dev.css 2010-03-11 20:21:58 UTC (rev 13668)
</span><span class="lines">@@ -3659,6 +3659,11 @@
</span><span class="cx"> width:80px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#custom-background-image {
+ max-width: 400px;
+ max-height: 200px;
+}
+
</ins><span class="cx"> div#custom-background-image img {
</span><span class="cx"> max-width: 400px;
</span><span class="cx"> max-height: 200px;
</span></span></pre></div>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (13667 => 13668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-03-11 18:28:31 UTC (rev 13667)
+++ trunk/wp-admin/custom-background.php 2010-03-11 20:21:58 UTC (rev 13668)
</span><span class="lines">@@ -227,15 +227,21 @@
</span><span class="cx"> <div class="wrap" id="custom-background">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e('Custom Background'); ?></h2>
</span><del>-<?php if ( get_background_image() ) { ?>
-<p><?php _e('This is your current background image.'); ?></p>
</del><ins>+<?php if ( get_background_image() || get_background_color() ) { ?>
+<p><?php _e('This is your current background.'); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( $this->admin_image_div_callback ) {
</span><span class="cx"> call_user_func($this->admin_image_div_callback);
</span><span class="cx"> } else {
</span><ins>+ if ( $bgcolor = get_background_color() )
+ $bgcolor = ' style="background-color: #' . $bgcolor . ';"';
+ else
+ $bgcolor = '';
</ins><span class="cx"> ?>
</span><del>-<div id="custom-background-image" style="background-color: #<?php background_color(); ?>;">
</del><ins>+<div id="custom-background-image"<?php echo $bgcolor; ?>>
+<?php if ( get_background_image() ) { ?>
</ins><span class="cx"> <img class="custom-background-image" src="<?php background_image(); ?>" />
</span><ins>+<?php } ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php }
</span><span class="cx"> } else { ?>
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (13667 => 13668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-03-11 18:28:31 UTC (rev 13667)
+++ trunk/wp-includes/theme.php 2010-03-11 20:21:58 UTC (rev 13668)
</span><span class="lines">@@ -1436,8 +1436,8 @@
</span><span class="cx"> */
</span><span class="cx"> function _custom_background_cb() {
</span><span class="cx"> $background = get_background_image();
</span><del>-
- if ( !$background )
</del><ins>+ $color = get_background_color();
+ if ( !$background && !$color )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $repeat = get_theme_mod('background_repeat', 'repeat');
</span><span class="lines">@@ -1457,11 +1457,26 @@
</span><span class="cx"> $attachment = 'background-attachment: scroll;';
</span><span class="cx"> else
</span><span class="cx"> $attachment = 'background-attachment: fixed;';
</span><ins>+
+ if ( !empty($background ) )
+ $image = "background-image: url('$background');";
+ else
+ $image = '';
+
+ if ( !empty($background ) )
+ $image = "background-image: url('$background');";
+ else
+ $image = '';
+
+ if ( !empty($color) )
+ $color = "background-color: #$color;";
+ else
+ $color = '';
</ins><span class="cx"> ?>
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> body {
</span><del>- background-color: #<?php background_color(); ?>;
- background-image: url('<?php background_image(); ?>');
</del><ins>+ <?php echo $image; ?>
+ <?php echo $color; ?>
</ins><span class="cx"> <?php echo $repeat; ?>
</span><span class="cx"> <?php echo $position; ?>
</span><span class="cx"> <?php echo $attachment; ?>
</span></span></pre>
</div>
</div>
</body>
</html>