golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rearrange the media uploader view so the filename is visible. Fixes #6517 for trunk props andy. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2008-04-01 21:12:35 +00:00
parent e0e2dedba5
commit 8ca58c943e
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/css/media.css
View File

@ -91,8 +91,15 @@ tr.image-size label {
max-height: 40px;
}
.filename {
display: none;
.filename.original {
z-index: 10;
position: absolute;
}
.crunching {
display: block;
line-height: 32px;
text-align: right;
margin-right: 5px;
}
button.dismiss {
position: absolute;
@ -216,7 +223,7 @@ abbr.required {
position: relative;
min-height: 36px;
}
#media-upload .filename {
.filename {
display: block;
line-height: 36px;
margin-left: 50px;

4
wp-includes/js/swfupload/handlers.js
View File

@ -24,8 +24,8 @@ function uploadProgress(fileObj, bytesDone, bytesTotal) {
// Lengthen the progress bar
jQuery('#media-item-' + fileObj.id + ' .bar').width(620*bytesDone/bytesTotal);
if ( bytesDone== bytesTotal )
jQuery('#media-item-' + fileObj.id + ' .bar').html('<strong style="display: block; padding-top: 9px; padding-left: 1em;">' + swfuploadL10n.crunching + '</strong>');
if ( bytesDone == bytesTotal )
jQuery('#media-item-' + fileObj.id + ' .bar').html('<strong class="crunching">' + swfuploadL10n.crunching + '</strong>');
}
function prepareMediaItem(fileObj, serverData) {

2
wp-includes/script-loader.php
View File

@ -87,7 +87,7 @@ class WP_Scripts {
'is_lighttpd_before_150' => is_lighttpd_before_150(),
) );
$this->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2');
$this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080301');
$this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080331');
// these error messages came from the sample swfupload js, they might need changing.
$this->localize( 'swfupload-handlers', 'swfuploadL10n', array(
'queue_limit_exceeded' => __('You have attempted to queue too many files.'),