Changeset 41608

Timestamp:

09/27/2017 08:45:46 AM (9 years ago)

Author:

swissspidy

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• wp-admin/js/theme.js (modified) (1 diff)
• wp-admin/js/updates.js (modified) (1 diff)
• wp-admin/theme-install.php (modified) (2 diffs)
• wp-admin/themes.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -231 +231 @@
         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">' . $message . '</div>';
+                        echo '<div class="no-plugin-results">' . __( 'No plugins found. Try a different search query.' ) . '</div>';
+                }
         }
 

trunk/src/wp-admin/js/theme.js

@@ -1604 +1604 @@
                         $( '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' ); 
+                        } );
                 });
 

trunk/src/wp-admin/js/updates.js

@@ -2292 +2292 @@
                 } );
 
+                /** 
+                 * 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.

trunk/src/wp-admin/theme-install.php

@@ -59 +59 @@
                         __( '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' ),
@@ -228 +229 @@
         <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>
 

trunk/src/wp-admin/themes.php

@@ -140 +140 @@
                 '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.' ),
         ),
 ) );
@@ -304 +304 @@
 <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

trunk/src/wp-includes/script-loader.php

@@ -813 +813 @@
                                 '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.' ),
                         ),
                 ) );