Changeset 29597

Timestamp:

08/25/2014 04:02:43 PM (10 years ago)

Author:

helen

Message:

Only show one search form for the plugin installer.

The field dropdown now appears in the filter bar only when doing a search.

see #28785.

Location:

trunk/src/wp-admin

Files:

• css/list-tables.css (modified) (1 diff)
• includes/class-wp-plugin-install-list-table.php (modified) (5 diffs)
• includes/plugin-install.php (modified) (1 diff)

trunk/src/wp-admin/css/list-tables.css

@@ -1384 +1384 @@
 }
 
+.no-plugin-results {
+    color: #999;
+    font-size: 18px;
+    font-style: normal;
+    margin: 0;
+    padding: 100px 0 0;
+    text-align: center;
+}
+
 /* ms */
 /* Background Color for Site Status */

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

@@ -122 +122 @@
                 }
 
-                add_action( 'install_plugins_table_header', 'install_search_form', 10, 0 );
                 break;
 
@@ -196 +195 @@
             $message = __( 'No plugins match your request.' );
         }
-        echo '<div class="wp-filter-no-results">' . $message . '</div>';
+        echo '<div class="no-plugin-results">' . $message . '</div>';
     }
 
@@ -204 +203 @@
         $display_tabs = array();
         foreach ( (array) $tabs as $action => $text ) {
-            $class = 'wp-filter-link';
-            $class .= ( $action == $tab ) ? ' current' : '';
+            $class = ( $action == $tab ) ? ' current' : '';
             $href = self_admin_url('plugin-install.php?tab=' . $action);
             $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
@@ -224 +222 @@
 ?>
 <div class="wp-filter">
-    <ul class="wp-filter-links">
+    <ul class="filter-links">
         <?php
         if ( ! empty( $views ) ) {
@@ -235 +233 @@
     </ul>
 
-    <?php install_search_form( false ); ?>
+    <?php install_search_form( isset( $views['plugin-install-search'] ) ); ?>
 </div>
 <?php

trunk/src/wp-admin/includes/plugin-install.php

@@ -165 +165 @@
     $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : '';
     $input_attrs = '';
-    $button_type = 'button';
+    $button_type = 'button screen-reader-text';
 
     // assume no $type_selector means it's a simplified search form
     if ( ! $type_selector ) {
         $input_attrs = 'class="wp-filter-search" placeholder="' . esc_attr__( 'Search Plugins' ) . '" ';
-        $button_type .= ' screen-reader-text';
-    }
-
-    ?><form class="search-plugins" method="get" action="">
+    }
+
+    ?><form class="search-form search-plugins" method="get" action="">
         <input type="hidden" name="tab" value="search" />
         <?php if ( $type_selector ) : ?>