Wordpress 3.3

[autoinstalls/wordpress.git] / wp-admin / media-upload.php

diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index fc3bf3253c5c6ee89f3c1ea442aabd6da5fc6607..666c3f37e252a178b0797a1dc235ba7f2bbfa869 100644 (file)
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -9,14 +9,16 @@
  * @subpackage Administration
  */
 
+if ( ! isset( $_GET['inline'] ) )
+       define( 'IFRAME_REQUEST' , true );
+
 /** Load WordPress Administration Bootstrap */
 require_once('./admin.php');
 
 if (!current_user_can('upload_files'))
        wp_die(__('You do not have permission to upload files.'));
 
-wp_enqueue_script('swfupload-all');
-wp_enqueue_script('swfupload-handlers');
+wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');
 wp_enqueue_script('set-post-thumbnail' );
 wp_enqueue_style('imgareaselect');
@@ -53,25 +55,41 @@ if ( isset($_GET['inline']) ) {
                        $location .= '?message=3';
 
                wp_redirect( admin_url($location) );
+               exit;
        }
 
        $title = __('Upload New Media');
        $parent_file = 'upload.php';
-
-       add_contextual_help( $current_screen,
-'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share.') . '</p>' .
-               '<p>' . __('There are two options for uploading files: <em>Select Files</em> will open the Flash-based uploader (multiple file upload allowed), or you can use the <em>Browser Uploader</em>. Clicking <em>Select Files</em> opens a navigation window showing you files in your operating system. Selecting <em>Open</em> after clicking on the file you want activates a progress bar on the uploader screen. Basic image editing is available after upload is complete. Make sure you click <em>Save</em> before leaving this screen.') . '</p>' .
+       get_current_screen()->add_help_tab( array(
+       'id'            => 'overview',
+       'title'         => __('Overview'),
+       'content'       =>
+               '<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
+               '<ul>' .
+                       '<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
+                       '<li>' . __('<strong>Select Files</strong> will open the multi-file uploader, or you can use the <strong>Browser Uploader</strong>.') . '</li>' .
+                       '<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
+               '</ul>' .
+               '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
+       ) );
+       get_current_screen()->set_help_sidebar(
                '<p><strong>' . __('For more information:') . '</strong></p>' .
-               '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_SubPanel" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
+               '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
                '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
        );
 
-       require_once('./admin-header.php'); ?>
+       require_once('./admin-header.php');
+
+       $form_class = 'media-upload-form type-form validate';
+
+       if ( get_user_setting('uploader') )
+               $form_class .= ' html-uploader';
+       ?>
        <div class="wrap">
        <?php screen_icon(); ?>
        <h2><?php echo esc_html( $title ); ?></h2>
 
-       <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="media-upload-form type-form validate" id="file-form">
+       <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">
 
        <?php media_upload_form(); ?>
 
@@ -88,10 +106,8 @@ if ( isset($_GET['inline']) ) {
        </script>
        <input type="hidden" name="post_id" id="post_id" value="0" />
        <?php wp_nonce_field('media-form'); ?>
-       <div id="media-items" class="hide-if-no-js"> </div>
-       <p>
-       <input type="submit" class="button savebutton hide-if-no-js" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
-       </p>
+       <div id="media-items" class="hide-if-no-js"></div>
+       <?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>
        </form>
        </div>
 
@@ -115,7 +131,7 @@ if ( isset($_GET['inline']) ) {
        $body_id = 'media-upload';
 
        // let the action code decide how to handle the request
-       if ( $tab == 'type' || $tab == 'type_url' )
+       if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) )
                do_action("media_upload_$type");
        else
                do_action("media_upload_$tab");