Changeset 22755

Timestamp:

11/21/2012 01:05:44 PM (14 years ago)

Author:

nacin

Message:

Have media-new.php return simple rows of basic attachment data, with an 'Edit' link next to each taking them to post.php (in a new window). Not ideal, but this is largely a fallback screen at this point.

This is bolted on to existing code, the vast majority of which is destined to be ripped out in 3.6 once things settle.

see #22083.

Location:

trunk

Files:

• wp-admin/async-upload.php (modified) (1 diff)
• wp-admin/css/wp-admin-rtl.css (modified) (1 diff)
• wp-admin/css/wp-admin.css (modified) (3 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/media-new.php (modified) (1 diff)
• wp-includes/js/plupload/handlers.js (modified) (2 diffs)

trunk/wp-admin/async-upload.php

@@ -38 +38 @@
                 wp_die( __( 'You are not allowed to edit this item.' ) );
 
-        if ( 2 == $_REQUEST['fetch'] ) {
-                add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-                echo get_media_item($id, array( 'send' => false, 'delete' => true ));
-        } else {
-                add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
-                echo get_media_item($id);
+        switch ( $_REQUEST['fetch'] ) {
+                case 3 :
+                        if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
+                                echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+                        echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
+                        $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e
+                        echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60 ) ) . '</span></div>';
+                        break;
+                case 2 :
+                        add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+                        echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+                        break;
+                default:
+                        add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
+                        echo get_media_item($id);
+                        break;
         }
         exit;

trunk/wp-admin/css/wp-admin-rtl.css

@@ -1050 +1050 @@
 }
 
+.media-item .edit-attachment,
 .media-item .error-div a.dismiss,
 .describe-toggle-on,

trunk/wp-admin/css/wp-admin.css

@@ -3818 +3818 @@
 }
 
+.media-item .edit-attachment,
 .describe-toggle-on,
 .describe-toggle-off {
@@ -3847 +3848 @@
 #media-items {
         width: 623px;
+}
+
+.media-new-php #media-items {
+        margin: 1em 0;
 }
 
@@ -5534 +5539 @@
 }
 
-.wp-full-overlay-sidebar .wp-full-overlay-header { 
-        border-top: 0;  
-        border-bottom: 1px solid #fff;  
-        box-shadow: inset 0 -1px 0 0px #dfdfdf;  
+.wp-full-overlay-sidebar .wp-full-overlay-header {
+        border-top: 0;
+        border-bottom: 1px solid #fff;
+        box-shadow: inset 0 -1px 0 0px #dfdfdf;
 }
 

trunk/wp-admin/includes/media.php

@@ -1056 +1056 @@
         global $redir_tab;
 
+        echo "<a class='toggle describe-toggle-on' href='#'>$toggle_on</a>";
+
         if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) )
                 $thumb_url = $thumb_url[0];
         else
                 $thumb_url = false;
+
+        $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
+        $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60 ) . "</span></div>" : '';
+
+        echo "<p><a href='$attachment_url' target='_blank'><img class='thumbnail' src='$thumb_url' alt='' /></a></p>";
 
         $post = get_post( $attachment_id );

trunk/wp-admin/media-new.php

@@ -91 +91 @@
                 updateMediaForm();
                 post_id = 0;
-                shortform = 1;
+                shortform = 3;
         });
         </script>

trunk/wp-includes/js/plupload/handlers.js

@@ -113 +113 @@
 function prepareMediaItem(fileObj, serverData) {
         var f = ( typeof shortform == 'undefined' ) ? 1 : 2, item = jQuery('#media-item-' + fileObj.id);
+        if ( f == 2 && shortform > 2 )
+                f = shortform;
 
         try {
@@ -430 +432 @@
                         }
 
-                        if ( up.runtime == 'html4' ) 
+                        if ( up.runtime == 'html4' )
                                 $('.upload-flash-bypass').hide();
                 });