WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add big-file-upload-warning for IE and Opera, left-align the percentage in the progress bar, see #19228 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-14 23:21:16 +00:00
parent 0f3e2f79bd
commit 8f4fd39550
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/wp-admin.css
View File

File diff suppressed because one or more lines are too long

3
wp-admin/css/wp-admin.dev.css
View File

@ -3708,7 +3708,6 @@ abbr.required {
height: 22px; height: 22px;
margin: 6px 10px 0 0; margin: 6px 10px 0 0;
width: 200px; width: 200px;
text-align: center;
line-height: 2em; line-height: 2em;
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
@ -3747,7 +3746,7 @@ abbr.required {
z-index: 10; z-index: 10;
position: relative; position: relative;
width: 200px; width: 200px;
text-align: center; padding: 0 8px;
text-shadow: 0 1px 0 rgba(255,255,255,0.4); text-shadow: 0 1px 0 rgba(255,255,255,0.4);
color: rgba(0,0,0,0.6); color: rgba(0,0,0,0.6);
} }

8
wp-admin/includes/media.php
View File

@ -1263,7 +1263,7 @@ function media_upload_header() {
* @param unknown_type $errors * @param unknown_type $errors
*/ */
function media_upload_form( $errors = null ) { function media_upload_form( $errors = null ) {
global $type, $tab, $pagenow; global $type, $tab, $pagenow, $is_IE, $is_opera;
$upload_action_url = admin_url('async-upload.php'); $upload_action_url = admin_url('async-upload.php');
$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0; $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
@ -1367,7 +1367,11 @@ wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
</div> </div>
<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); <p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) );
echo ' ' . __('After a file has been uploaded, you can add titles and descriptions.'); ?></p> if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 )
echo ' <span class="big-file-warning">' . __('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.') . '</span></p><p>';
echo ' ' . __('After a file has been uploaded, you can add titles and descriptions.');
?></p>
<?php <?php
do_action('post-upload-ui'); do_action('post-upload-ui');

4
wp-includes/js/plupload/handlers.dev.js
View File

@ -365,11 +365,11 @@ jQuery(document).ready(function($){
$(this).remove(); $(this).remove();
}); });
} else if ( target.is('.upload-flash-bypass a') || target.is('a.uploader-html') ) { // switch uploader to html4 } else if ( target.is('.upload-flash-bypass a') || target.is('a.uploader-html') ) { // switch uploader to html4
$('#media-items, p.submit').css('display', 'none'); $('#media-items, p.submit, span.big-file-warning').css('display', 'none');
switchUploader(0); switchUploader(0);
return false; return false;
} else if ( target.is('.upload-html-bypass a') ) { // switch uploader to multi-file } else if ( target.is('.upload-html-bypass a') ) { // switch uploader to multi-file
$('#media-items, p.submit').css('display', ''); $('#media-items, p.submit, span.big-file-warning').css('display', '');
switchUploader(1); switchUploader(1);
return false; return false;
} else if ( target.is('a.describe-toggle-on') ) { // Show } else if ( target.is('a.describe-toggle-on') ) { // Show

2
wp-includes/js/plupload/handlers.js
View File

File diff suppressed because one or more lines are too long

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

@ -221,7 +221,7 @@ function wp_default_scripts( &$scripts ) {
// cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo // cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
$scripts->add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1511-20111112'); $scripts->add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1511-20111112');
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery'), '20111113'); $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery'), '20111114');
$scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n ); $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
// keep 'swfupload' for back-compat. // keep 'swfupload' for back-compat.
@ -432,7 +432,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr // Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' ); $no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111114c' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111114d' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );