Wordpress 3.1.2

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

diff --git a/wp-admin/media.php b/wp-admin/media.php
index 09776b48512fca2785a403463fc50ecebfdce335..b70b38a2076732b496d180f5eedbb2bcb845fa72 100644 (file)
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -7,7 +7,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
 
 $parent_file = 'upload.php';
 $submenu_file = 'upload.php';
@@ -48,7 +48,7 @@ case 'edit' :
                $errors = null;
 
        if ( empty( $_GET['attachment_id'] ) ) {
-               wp_redirect('upload.php');
+               wp_redirect( admin_url('upload.php') );
                exit();
        }
        $att_id = (int) $_GET['attachment_id'];
@@ -67,7 +67,17 @@ case 'edit' :
        wp_enqueue_script('image-edit');
        wp_enqueue_style('imgareaselect');
 
-       require( 'admin-header.php' );
+       add_contextual_help( $current_screen,
+       '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
+       '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
+       '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
+       '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>' .
+       '<p><strong>' . __('For more information:') . '</strong></p>' .
+       '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_SubPanel#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
+       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+
+       require( './admin-header.php' );
 
        $parent_file = 'upload.php';
        $message = '';
@@ -76,7 +86,7 @@ case 'edit' :
                switch ( $_GET['message'] ) :
                case 'updated' :
                        $message = __('Media attachment updated.');
-                       $class = 'updated fade';
+                       $class = 'updated';
                        break;
                endswitch;
        }
@@ -89,33 +99,36 @@ case 'edit' :
 <?php screen_icon(); ?>
 <h2><?php _e( 'Edit Media' ); ?></h2>
 
-<form method="post" action="<?php echo esc_url( remove_query_arg( 'message' ) ); ?>" class="media-upload-form" id="media-single-form">
+<form method="post" action="" class="media-upload-form" id="media-single-form">
+<p class="submit" style="padding-bottom: 0;">
+<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
+</p>
+
 <div class="media-single">
 <div id='media-item-<?php echo $att_id; ?>' class='media-item'>
-<?php echo get_media_item( $att_id, array( 'toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => $errors ) ); ?>
+<?php echo get_media_item( $att_id, array( 'toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => !empty($errors[$att_id]) ? $errors[$att_id] : null ) ); ?>
 </div>
 </div>
 
-<p class="submit">
-<input type="submit" class="button-primary" name="save" value="<?php esc_attr_e('Update Media'); ?>" />
+<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? esc_attr($post_id) : ''; ?>" />
 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($att_id); ?>" />
 <input type="hidden" name="action" value="editattachment" />
 <?php wp_original_referer_field(true, 'previous'); ?>
 <?php wp_nonce_field('media-form'); ?>
-</p>
+
 </form>
 
 </div>
 
 <?php
 
-       require( 'admin-footer.php' );
+       require( './admin-footer.php' );
 
        exit;
 
 default:
-       wp_redirect( 'upload.php' );
+       wp_redirect( admin_url('upload.php') );
        exit;
 
 endswitch;