<!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>[16773] trunk/wp-admin:
Fix the background colors for the Select Files upload buttons.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16773">16773</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-07 19:42:57 +0000 (Tue, 07 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the background colors for the Select Files upload buttons. props TECannon. fixes <a href="http://trac.wordpress.org/ticket/8545">#8545</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminimagesuploadclassicpng">trunk/wp-admin/images/upload-classic.png</a></li>
<li><a href="#trunkwpadminimagesuploadfreshpng">trunk/wp-admin/images/upload-fresh.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimagesuploadclassicpng"></a>
<div class="binary"><h4>Added: trunk/wp-admin/images/upload-classic.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/wp-admin/images/upload-classic.png
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="trunkwpadminimagesuploadfreshpng"></a>
<div class="binary"><h4>Added: trunk/wp-admin/images/upload-fresh.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/wp-admin/images/upload-fresh.png
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (16772 => 16773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-12-07 19:00:58 UTC (rev 16772)
+++ trunk/wp-admin/includes/media.php 2010-12-07 19:42:57 UTC (rev 16773)
</span><span class="lines">@@ -1406,7 +1406,7 @@
</span><span class="cx"> * @param unknown_type $errors
</span><span class="cx"> */
</span><span class="cx"> function media_upload_form( $errors = null ) {
</span><del>- global $type, $tab;
</del><ins>+ global $type, $tab, $pagenow;
</ins><span class="cx">
</span><span class="cx"> $flash_action_url = admin_url('async-upload.php');
</span><span class="cx">
</span><span class="lines">@@ -1477,6 +1477,16 @@
</span><span class="cx"> $p[] = "\t\t'$param' : '$val'";
</span><span class="cx"> $post_params_str = implode( ", \n", $p );
</span><span class="cx">
</span><ins>+// #8545. wmode=transparent cannot be used with SWFUpload
+if ( 'media-new.php' == $pagenow ) {
+ $upload_image_path = get_user_option( 'admin_color' );
+ if ( 'classic' != $upload_image_path )
+ $upload_image_path = 'fresh';
+ $upload_image_path = admin_url( 'images/upload-' . $upload_image_path . '.png?ver=20101205' );
+} else {
+ $upload_image_path = includes_url( 'images/upload.png?ver=20100531' );
+}
+
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="lines">@@ -1488,7 +1498,7 @@
</span><span class="cx"> button_height: "23",
</span><span class="cx"> button_width: "132",
</span><span class="cx"> button_text_top_padding: 3,
</span><del>- button_image_url: '<?php echo includes_url('images/upload.png?ver=20100531'); ?>',
</del><ins>+ button_image_url: '<?php echo $upload_image_path; ?>',
</ins><span class="cx"> button_placeholder_id: "flash-browse-button",
</span><span class="cx"> upload_url : "<?php echo esc_attr( $flash_action_url ); ?>",
</span><span class="cx"> flash_url : "<?php echo includes_url('js/swfupload/swfupload.swf'); ?>",
</span></span></pre>
</div>
</div>
</body>
</html>