WordPress 3.4

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

diff --git a/wp-admin/media.php b/wp-admin/media.php
index 6715773b7a5eaf7fd42adac93ee7e3f0f7cb06f9..15d4323876a0b351ca664591564b260d2220c828 100644 (file)
--- a/wp-admin/media.php
+++ b/wp-admin/media.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'];
@@ -59,6 +59,7 @@ case 'edit' :
        $att = get_post($att_id);
 
        if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
+       if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
        if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
 
        add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
@@ -67,6 +68,22 @@ case 'edit' :
        wp_enqueue_script('image-edit');
        wp_enqueue_style('imgareaselect');
 
+       get_current_screen()->add_help_tab( array(
+               'id'      => 'overview',
+               'title'   => __('Overview'),
+               'content' =>
+                       '<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>'
+       ) );
+
+       get_current_screen()->set_help_sidebar(
+       '<p><strong>' . __('For more information:') . '</strong></p>' .
+       '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen#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';
@@ -87,27 +104,32 @@ case 'edit' :
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e( 'Edit Media' ); ?></h2>
+<h2>
+<?php
+echo esc_html( $title );
+if ( current_user_can( 'upload_files' ) ) { ?>
+       <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a>
+<?php } ?>
+</h2>
 
 <form method="post" action="" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
-<input type="submit" class="button-primary" name="save" value="<?php esc_attr_e('Update Media'); ?>" />
+<?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>
@@ -119,10 +141,7 @@ case 'edit' :
        exit;
 
 default:
-       wp_redirect( 'upload.php' );
+       wp_redirect( admin_url('upload.php') );
        exit;
 
 endswitch;
-
-
-?>