Plugins: Improve error messages on plugins screen.

This unifies the layout and wording of error messages on both the plugins screen and the themes screen.

Props tinkerbelly, juhise, Ankit K Gupta, m1tk00, swissspidy, mrahmadawais, danieltj.
Fixes #37430.

Built from https://develop.svn.wordpress.org/trunk@41608


git-svn-id: http://core.svn.wordpress.org/trunk@41443 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -230,11 +230,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 	 */
 	public function no_items() {
 		if ( isset( $this->error ) ) {
-			$message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+			echo '<div class="inline error"><p>' . $this->error->get_error_message() . '</p><p class="hide-if-no-js"><button class="button try-again">' . __( 'Try Again' ) . '</button></p></div>';
 		} else {
-			$message = __( 'No plugins match your request.' );
+			echo '<div class="no-plugin-results">' . __( 'No plugins found. Try a different search query.' ) . '</div>';
 		}
-		echo '<div class="no-plugin-results">' . $message . '</div>';
 	}
 
 	/**

wp-admin/js/theme.js

@@ -1603,7 +1603,11 @@ themes.view.Installer = themes.view.Appearance.extend({
 		this.listenTo( this.collection, 'query:fail', function() {
 			$( 'body' ).removeClass( 'loading-content' );
 			$( '.theme-browser' ).find( 'div.error' ).remove();
-			$( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + l10n.error + '</p></div>' );
+			$( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + l10n.error + '</p><p><button class="button try-again">' + l10n.tryAgain + '</button></p></div>' ); 
+			$( '.theme-browser .error .try-again' ).on( 'click', function( e ) { 
+				e.preventDefault(); 
+				$( 'input.wp-filter-search' ).trigger( 'input' ); 
+			} );
 		});
 
 		if ( this.view ) {

wp-admin/js/updates.js

@@ -2291,6 +2291,16 @@
 			$( 'input.wp-filter-search' ).trigger( 'input' );
 		} );
 
+		/** 
+		 * Trigger a search event when the "Try Again" button is clicked. 
+		 * 
+		 * @since 4.8.0
+		 */ 
+		$document.on( 'click', '.try-again', function( event ) { 
+			event.preventDefault(); 
+			$pluginInstallSearch.trigger( 'input' ); 
+		} );
+
 		/**
 		 * Trigger a search event when the search type gets changed.
 		 *

wp-admin/theme-install.php

@@ -58,8 +58,9 @@ wp_localize_script( 'theme', '_wpThemeSettings', array(
 			__( '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="%s">support forums</a>.' ),
 			__( 'https://wordpress.org/support/' )
 		),
+		'tryAgain'            => __( 'Try Again' ),
 		'themesFound'         => __( 'Number of Themes found: %d' ),
-		'noThemesFound'       => __( 'No themes found. Try a different search.' ),
+		'noThemesFound'       => __( 'No themes found. Try a different search query.' ),
 		'collapseSidebar'     => __( 'Collapse Sidebar' ),
 		'expandSidebar'       => __( 'Expand Sidebar' ),
 		/* translators: accessibility text */
@@ -227,7 +228,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 	<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>
+	<p class="no-themes"><?php _e( 'No themes found. Try a different search query.' ); ?></p>
 	<span class="spinner"></span>
 
 <?php

wp-admin/themes.php

@@ -139,7 +139,7 @@ wp_localize_script( 'theme', '_wpThemeSettings', array(
  		'search'            => __( 'Search Installed Themes' ),
  		'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
 		'themesFound'       => __( 'Number of Themes found: %d' ),
-		'noThemesFound'     => __( 'No themes found. Try a different search.' ),
+		'noThemesFound'     => __( 'No themes found. Try a different search query.' ),
   	),
 ) );
 
@@ -303,7 +303,7 @@ foreach ( $themes as $theme ) :
 </div>
 <div class="theme-overlay"></div>
 
-<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+<p class="no-themes"><?php _e( 'No themes found. Try a different search query.' ); ?></p>
 
 <?php
 // List broken themes, if any.

wp-includes/script-loader.php

@@ -812,7 +812,7 @@ function wp_default_scripts( &$scripts ) {
 				'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
 				'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
 				'pluginsFound'               => __( 'Number of plugins found: %d' ),
-				'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),
+				'noPluginsFound'             => __( 'No plugins found. Try a different search query.' ),
 			),
 		) );
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41607';
+$wp_version = '4.9-alpha-41608';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.