Changeset 22529

Timestamp:

11/10/2012 09:11:33 AM (12 years ago)

Author:

koopersmith

Message:

Media: Add instructions to drag and drop to reorder images on gallery and batch edit pages.

Removes search boxes from these pages as well.

see #21390.

Location:

trunk/wp-includes

Files:

• css/media-views.css (modified) (2 diffs)
• js/media-views.js (modified) (5 diffs)
• media.php (modified) (1 diff)

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

@@ -276 +276 @@
     color: #464646;
     font-family: sans-serif;
+}
+
+.media-toolbar-secondary .search {
+    margin-right: 16px;
 }
 
@@ -497 +501 @@
 }
 
+.attachments-browser .instructions {
+    display: inline-block;
+    margin-top: 16px;
+    line-height: 18px;
+    font-size: 13px;
+    color: #999;
+}
+
 
 /**

trunk/wp-includes/js/media-views.js

@@ -264 +264 @@
     media.controller.Library = media.controller.State.extend({
         defaults: {
-            id:       'library',
-            multiple: false,
-            describe: false,
-            toolbar:  'main-attachments',
-            sidebar:  'settings'
+            id:         'library',
+            multiple:   false,
+            describe:   false,
+            toolbar:    'main-attachments',
+            sidebar:    'settings',
+            searchable: true
         },
 
@@ -502 +503 @@
             editing:    false,
             sortable:   true,
+            searchable: false,
             toolbar:    'gallery-edit',
             sidebar:    'settings'
@@ -810 +812 @@
                 model:      state,
                 sortable:   state.get('sortable'),
+                search:     state.get('searchable'),
 
                 AttachmentView: state.get('AttachmentView')
@@ -946 +949 @@
                 // Batch states.
                 new media.controller.Library({
-                    id:       'batch-edit',
-                    multiple: false,
-                    describe: true,
-                    edge:     199,
-                    sortable: true,
-                    menu:     'batch',
-                    toolbar:  'batch-edit',
-                    sidebar:  'attachment-settings'
+                    id:         'batch-edit',
+                    multiple:   false,
+                    describe:   true,
+                    edge:       199,
+                    sortable:   true,
+                    searchable: false,
+                    menu:       'batch',
+                    toolbar:    'batch-edit',
+                    sidebar:    'attachment-settings'
                 }),
 
@@ -2317 +2321 @@
                     controller: this.controller,
                     model:      this.collection.props,
-                    priority:   -40
+                    priority:   -60
                 }).render() );
+            }
+
+            if ( this.options.sortable ) {
+                this.toolbar.add( 'dragInfo', new Backbone.View({
+                    el: $( '<div class="instructions">' + l10n.dragInfo + '</div>' )[0],
+                    priority: -40
+                }) );
             }
 

trunk/wp-includes/media.php

@@ -1329 +1329 @@
         'addImages'   => __( 'Add images' ),
         'selected'    => __( 'selected' ),
+        'dragInfo'    => __( 'Drag and drop to reorder images.' ),
 
         // Upload