Ticket #28850: 28850.patch

src/wp-admin/js/media.js

@@ -75 +75 @@
                 // Open up a manage media frame into the grid.
                 wp.media && wp.media({
                         frame: 'manage',
-                        container: $('#wpbody-content')
+                        container: $('.wrap')
                 }).open();
 
                 $( '#find-posts-submit' ).click( function( event ) {

src/wp-admin/upload.php

@@ -32 +32 @@
         add_screen_option( 'dateFormatted', array( 'label' => __( 'Date' ) ) );
         add_screen_option( 'mime', array( 'label' => __( 'Mime-type' ) ) );
 
+        get_current_screen()->add_help_tab( array(
+        'id'            => 'overview',
+        'title'         => __('Overview'),
+        'content'       =>
+                '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
+                '<p>' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '</p>'
+        ) );
+
+        get_current_screen()->set_help_sidebar(
+                '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+                '<p>' . __( '<a href="http://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>' .
+                '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+        );
+
+        $title = __('Media Library');
+        $parent_file = 'upload.php';
+
         require_once( ABSPATH . 'wp-admin/admin-header.php' );
+        ?>
+        <div class="wrap">
+                <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>
+        </div>
+        <?php
         include( ABSPATH . 'wp-admin/admin-footer.php' );
         exit;
 }

src/wp-includes/css/media-views.css

@@ -1002 +1002 @@
         outline: none;
 }
 
-.attachments-browser .uploader-inline:not(.hidden) + .attachments {
-        top: 350px;
-}
-
 .attachments-browser .uploader-inline.hidden {
         display: none;
 }
@@ -2572 +2568 @@
 /**
  * Media Grid
  */
+.media-grid-view,
+.media-grid-view .media-frame-content,
+.media-grid-view .attachments-browser .attachments,
+.media-grid-view .attachments-browser .uploader-inline,
+.media-grid-view .uploader-inline-content {
+        position: static;
+}
 
-.media-grid-view h1 {
-        color: #222;
-        font-size: 23px;
-        font-weight: 400;
-        margin: 10px 0 0;
-        padding: 9px 15px 4px 22px;
-        line-height: 29px;
+/* Regions we don't use at all */
+.media-grid-view .media-frame-title,
+.media-grid-view .media-frame-toolbar,
+.media-grid-view .media-frame-menu {
+        display: none;
 }
 
 .media-grid-view .view-switch {
@@ -2589 +2590 @@
         vertical-align: middle;
 }
 
-/**
- * Position both the frame and the uploader window into the content
- * area of the screen.
- */
-.media-grid-view {
-        z-index: 1;
-        position: fixed;
-        bottom: 0;
-        left: 160px;
-        right: 0;
-        top: 32px;
-        -webkit-transition: 200ms ease-in-out;
-        transition: 200ms ease-in-out;
+.media-grid-view .media-frame-content {
+        border: none;
 }
 
-.media-grid-view-options {
-        top: 120px;
+.media-grid-view .uploader-inline {
+        padding-top: 0;
+        margin-top: 0;
 }
 
-@media screen and (max-width: 900px) {
-        .auto-fold .media-grid-view {
-                left: 36px;
-        }
-}
-@media screen and (max-width: 782px) {
-        .media-grid-view {
-                top: 46px;
-        }
-        .auto-fold .media-grid-view {
-                left: 0px;
-                bottom: 0px;
-        }
-}
-
-/* Regions we don't use at all */
-.media-grid-view .media-frame-toolbar,
-.media-grid-view .media-frame-menu {
-        display: none;
-}
-
 /**
  * Copied styles from the Add theme toolbar.
  *
@@ -2644 +2614 @@
         color: #555;
         display: inline-block;
         font-size: 13px;
+        margin: 20px 0 30px;
         padding: 0 20px;
         position: relative;
         width: 100%;
 }
 
+.media-grid-view .attachments-browser {
+        padding: 0;
+}
+
 /**
  * The left and right buttons are copied from the expanded theme details modal.
  *
@@ -2849 +2824 @@
         margin-top: 3px;
 }
 
-.media-grid-view.hide-router .media-frame-title {
-        -webkit-box-shadow: none;
-        box-shadow: none;
-}
-
 .media-grid-view .media-frame-content {
         background-color: transparent;
         bottom: 40px;
 }
+
 @media screen and (max-width: 782px) {
         .media-grid-view .media-frame-content {
                 border-bottom: none;
                 bottom: 0;
         }
 }
-
-@media only screen and (max-width: 640px), screen and (max-height: 400px) {
-        .media-grid-view .media-frame-title {
-                display: block;
-                width: auto;
-                bottom: auto;
-                right: 0;
-                top: 0;
-                height: 60px;
-        }
-}

src/wp-includes/js/media-grid.js

@@ -124 +124 @@
                                         }
                                 }).render();
                                 this.uploader.ready();
-                                $('body').append( this.uploader.el );
+                                //$('body').append( this.uploader.el );
 
                                 this.options.uploader = false;
                         }
@@ -201 +201 @@
                         libraryState = new media.controller.Library({
                                 library:    media.query( options.library ),
                                 multiple:   options.multiple,
-                                title:      options.title,
                                 priority:   20,
                                 toolbar:    false,
                                 router:     false,
@@ -209 +208 @@
                                 filterable: 'mime-types'
                         });
 
-                        libraryState._renderTitle = function( view ) {
-                                var text = this.get('title') || '';
-                                view.$el.addClass( 'wrap' );
-                                text += '<a class="add-new-h2">Add New</a>';
-                                view.$el.html( text );
+                        libraryState._renderTitle = function() {
+                                return;
                         };
                         // Add the default states.
                         this.states.add([
@@ -229 +225 @@
                         this.on( 'edit:attachment', this.editAttachment, this );
                 },
 
-                addNewClickHandler: function() {
+                addNewClickHandler: function( event ) {
+                        event.preventDefault();
                         this.trigger( 'toggle:upload:attachment' );
                 },
 
@@ -693 +690 @@
                 }
         });
 
-}(jQuery, _, Backbone, wp));
- No newline at end of file
+}(jQuery, _, Backbone, wp));