Ticket #26600: 26600.2.patch

src/wp-admin/css/themes.css

@@ -1140 +1140 @@
         font-size: 18px;
         font-style: normal;
         margin: 0;
-        padding: 100px 0 0;
+        padding: 0;
         text-align: center;
         display: none;
 }

src/wp-admin/js/theme.js

@@ -79 +79 @@
 
                 // Render and append
                 this.view.render();
-                this.$el.find( '.themes' ).remove();
-                this.$el.append( this.view.el ).addClass( 'rendered' );
+                this.$el.empty().append( this.view.el ).addClass('rendered');
                 this.$el.append( '<br class="clear"/>' );
         },
 
@@ -157 +156 @@
                 // Useful for resetting the views when you clean the input
                 if ( this.terms === '' ) {
                         this.reset( themes.data.themes );
+                        $( 'body' ).removeClass( 'no-results' );
                 }
 
                 // Trigger an 'update' event
@@ -831 +831 @@
         // The theme count element
         count: $( '.wp-core-ui .theme-count' ),
 
+        // The live themes count
+        liveThemeCount: 0,
+
         initialize: function( options ) {
                 var self = this;
 
@@ -854 +857 @@
                 this.listenTo( self.collection, 'query:success', function( count ) {
                         if ( _.isNumber( count ) ) {
                                 self.count.text( count );
+                                self.announceSearchResults( count );
                         } else {
                                 self.count.text( self.collection.length );
+                                self.announceSearchResults( self.collection.length );
                         }
                 });
 
@@ -926 +931 @@
                 }
 
                 // Display a live theme count for the collection
-                this.count.text( this.collection.count ? this.collection.count : this.collection.length );
+                this.liveThemeCount = this.collection.count ? this.collection.count : this.collection.length;
+                this.count.text( this.liveThemeCount );
+
+                this.announceSearchResults( this.liveThemeCount );
         },
 
         // Iterates through each instance of the collection
@@ -1078 +1086 @@
                         self.theme.trigger( 'theme:expand', previousModel.cid );
 
                 }
+        },
+
+        // Dispatch audible search results feedback message
+        announceSearchResults: function( count ) {
+                if ( 0 === count ) {
+                        wp.a11y.speak( l10n.noThemesFound );
+                } else {
+                        wp.a11y.speak( l10n.themesFound + ' ' + count );
+                }
         }
 });
 

src/wp-admin/theme-install.php

@@ -44 +44 @@
         ),
         'l10n' => array(
                 'addNew' => __( 'Add New Theme' ),
-                'search'  => __( 'Search Themes' ),
+                'search' => __( 'Search Themes' ),
                 'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
                 'upload' => __( 'Upload Theme' ),
                 'back'   => __( 'Back' ),
-                'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' )
+                'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
+                'themesFound'   => __( 'Number of Themes found:' ),
+                'noThemesFound' => __( 'No themes found. Try a different search.' ),
         ),
         'installedThemes' => array_keys( $installed_themes ),
 ) );
@@ -166 +168 @@
                         </div>
                 </div>
         </div>
-        <div class="theme-browser content-filterable" aria-live="polite">
-                <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
-        </div>
+        <div class="theme-browser content-filterable"></div>
         <div class="theme-install-overlay wp-full-overlay expanded"></div>
+
+        <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
         <span class="spinner"></span>
 
         <br class="clear" />

src/wp-admin/themes.php

@@ -107 +107 @@
                 'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
         ),
         'l10n' => array(
-                'addNew' => __( 'Add New Theme' ),
-                'search'  => __( 'Search Installed Themes' ),
+                'addNew'            => __( 'Add New Theme' ),
+                'search'            => __( 'Search Installed Themes' ),
                 'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
+                'themesFound'       => __( 'Number of Themes found:' ),
+                'noThemesFound'     => __( 'No themes found. Try a different search.' ),
         ),
 ) );
 
@@ -198 +200 @@
 
 ?>
 
-<div class="theme-browser" aria-live="polite">
+<div class="theme-browser">
         <div class="themes">
 
 <?php
@@ -250 +252 @@
 <?php endforeach; ?>
         <br class="clear" />
         </div>
-        <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 </div>
 <div class="theme-overlay"></div>
 
+<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+
 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {

src/wp-includes/script-loader.php

@@ -496 +496 @@
 
                 $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
 
-                $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone' ), false, 1 );
+                $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 );
 
                 $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(