Ticket #29026: 29026.patch

src/wp-admin/includes/class-wp-list-table.php

@@ -371 +371 @@
                 if ( empty( $this->_actions ) )
                         return;
 
-                echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select Bulk Action' ) . "</label>";
+                echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
                 echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
                 echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
 
@@ -469 +469 @@
 
                 $m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
-                <select name="m">
+                <label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
+                <select name="m" id="filter-by-date">
                         <option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
                 foreach ( $months as $arc_row ) {

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

@@ -584 +584 @@
          * @augments Backbone.View
          */
         media.view.BulkSelectionActionDropdown = media.View.extend({
-                tagName:   'select',
+                tagName: 'select',
+                id:      'bulk-select-dropdown',
 
                 initialize: function() {
                         media.view.Button.prototype.initialize.apply( this, arguments );

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

@@ -5730 +5730 @@
                         var filters,
                                 LibraryViewSwitcher,
                                 FiltersConstructor,
-                                screenReaderText;
+                                filterByTypeLabel,
+                                bulkActionsLabel,
+                                filterByDateLabel,
+                                searchLabel;
 
                         /**
                          * @member {wp.media.view.Toolbar}
@@ -5745 +5748 @@
                         // browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
                         // which the controller can tap into and add this view?
                         if ( this.controller.activeModes.where( { id: 'grid' } ).length ) {
+
                                 LibraryViewSwitcher = media.View.extend({
                                         className: 'view-switch media-grid-view-switch',
                                         template: media.template( 'media-library-view-switcher')
                                 });
+
                                 this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
                                         controller: this.controller,
                                         priority: -90
                                 }).render() );
 
-                                this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
-                                        controller: this.controller,
-                                        priority: -70
-                                }).render() );
                                 this.toolbar.set( 'dateFilter', new media.view.DateFilter({
                                         controller: this.controller,
                                         model:      this.collection.props,
                                         priority: -75
                                 }).render() );
+
+                                this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
+                                        controller: this.controller,
+                                        priority: -70
+                                }).render() );
+
+                                this.toolbar.set( 'spinner', new media.view.Spinner({
+                                        priority: -60
+                                }) );
+
                         }
 
                         filters = this.options.filters;
@@ -5781 +5792 @@
                                         priority:   -80
                                 }).render() );
 
-                                screenReaderText = $( '<label class="screen-reader-text" for="media-attachment-filters">' + l10n.select + '</label>' );
-                                this.toolbar.get( 'filters' ).$el.before( screenReaderText );
+                                filterByTypeLabel = $( '<label class="screen-reader-text" for="media-attachment-filters">' + l10n.filterByType + '</label>' );
+                                this.toolbar.get( 'filters' ).$el.before( filterByTypeLabel );
+
+                                filterByDateLabel = $( '<label class="screen-reader-text" for="media-attachment-date-filters">' + l10n.filterByDate + '</label>' );
+                                this.toolbar.get( 'dateFilter' ).$el.before( filterByDateLabel );
+
+                                bulkActionsLabel = $( '<label class="screen-reader-text" for="bulk-select-dropdown">' + l10n.bulkActionsLabel + '</label>' );
+                                this.toolbar.get( 'bulkSelection' ).$el.before( bulkActionsLabel );
                         }
 
-                        this.toolbar.set( 'spinner', new media.view.Spinner({
-                                priority: -70
-                        }) );
-
                         if ( this.options.search ) {
                                 this.toolbar.set( 'search', new media.view.Search({
                                         controller: this.controller,
@@ -5795 +5808 @@
                                         model:      this.collection.props,
                                         priority:   60
                                 }).render() );
-                                screenReaderText = $( '<label class="screen-reader-text" for="media-search-input">' + l10n.search + '</label>' );
-                                this.toolbar.get( 'search' ).$el.before( screenReaderText );
+                                searchLabel = $( '<label class="screen-reader-text" for="media-search-input">' + l10n.searchMediaLabel + '</label>' );
+                                this.toolbar.get( 'search' ).$el.before( searchLabel );
                         }
 
                         if ( this.options.dragInfo ) {

src/wp-includes/media.php

@@ -2924 +2924 @@
                 'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
                 'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
                 'bulkActions'            => __( 'Bulk Actions' ),
+                'bulkActionsLabel'       => __( 'Select bulk action' ),
                 'deletePermanently'      => __( 'Delete Permanently' ),
                 'apply'                  => __( 'Apply' ),
+                'filterByDate'           => __( 'Filter by date' ),
+                'filterByType'           => __( 'Filter by type' ),
+                'searchMediaLabel'       => __( 'Search Media' ),
 
                 // Library Details
                 'attachmentDetails'  => __( 'Attachment Details' ),