From 9252fbec58a57fcc5f46b4a901a5ca88c1a50e8c Mon Sep 17 00:00:00 2001
From: Helen Hou-Sandi <helen@git.wordpress.org>
Date: Mon, 25 Aug 2014 16:02:43 +0000
Subject: [PATCH] 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.


git-svn-id: https://develop.svn.wordpress.org/trunk@29597 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/list-tables.css                       |  9 +++++++++
 .../includes/class-wp-plugin-install-list-table.php    | 10 ++++------
 src/wp-admin/includes/plugin-install.php               |  5 ++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 0e65e39322..abdf01e586 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -1383,6 +1383,15 @@ div.action-links,
 	margin: 0 20px 20px 0;
 }
 
+.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 */
 .wp-list-table .site-deleted {
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index 3d8d767972..84c34c714f 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -121,7 +121,6 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 						break;
 				}
 
-				add_action( 'install_plugins_table_header', 'install_search_form', 10, 0 );
 				break;
 
 			case 'featured':
@@ -195,7 +194,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		} else {
 			$message = __( 'No plugins match your request.' );
 		}
-		echo '<div class="wp-filter-no-results">' . $message . '</div>';
+		echo '<div class="no-plugin-results">' . $message . '</div>';
 	}
 
 	protected function get_views() {
@@ -203,8 +202,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		$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>";
 		}
@@ -223,7 +221,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 ?>
 <div class="wp-filter">
-	<ul class="wp-filter-links">
+	<ul class="filter-links">
 		<?php
 		if ( ! empty( $views ) ) {
 			foreach ( $views as $class => $view ) {
@@ -234,7 +232,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		?>
 	</ul>
 
-	<?php install_search_form( false ); ?>
+	<?php install_search_form( isset( $views['plugin-install-search'] ) ); ?>
 </div>
 <?php
 	}
diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
index 134bd8998a..3113e28dc5 100644
--- a/src/wp-admin/includes/plugin-install.php
+++ b/src/wp-admin/includes/plugin-install.php
@@ -164,15 +164,14 @@ function install_search_form( $type_selector = true ) {
 	$type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 	$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 ) : ?>
 		<select name="type" id="typeselector">