Plugin installer: Minor adjustments to aid with discovery.

nacin · nacin · commit 8564e3a49131 · 2014-08-27T02:52:29.000Z
fixes #29387. git-svn-id: https://develop.svn.wordpress.org/trunk@29636 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
@@ -1091,7 +1091,6 @@ input.newtag:focus ~ div.taghint {
 p.popular-tags {
 	border: none;
 	line-height: 2em;
-	max-width: 1000px;
 	padding: 8px 12px 12px;
 	text-align: justify;
 }
diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
@@ -1241,7 +1241,6 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
 	margin-top: 1.5em;
 }
 
-.plugin-group:first-of-type,
 .plugin-group h3 {
 	margin-top: 0;
 }
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
@@ -64,7 +64,6 @@ public function prepare_items() {
 			$tabs['search']	= __( 'Search Results' );
 		$tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
 		$tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
-		$tabs['new']       = _x( 'Newest', 'Plugin Installer' );
 		$tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
 		if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
 			$tabs['beta']      = _x( 'Beta Testing', 'Plugin Installer' );
@@ -273,6 +272,10 @@ public function display() {
 	}
 
 	protected function display_tablenav( $which ) {
+		if ( $GLOBALS['tab'] === 'featured' ) {
+			return;
+		}
+
 		if ( 'top' ==  $which ) { ?>
 			<div class="tablenav top">
 				<div class="alignleft actions">
diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
@@ -128,11 +128,10 @@ function install_dashboard() {
 	?>
 	<p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
 
-	<h4><?php _e('Search') ?></h4>
-	<?php install_search_form( false ); ?>
+	<?php display_plugins_table(); ?>
 
-	<h4><?php _e('Popular tags') ?></h4>
-	<p class="install-help"><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
+	<h3><?php _e( 'Popular tags' ) ?></h3>
+	<p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ) ?></p>
 	<?php
 
 	$api_tags = install_popular_tags();
@@ -153,7 +152,7 @@ function install_dashboard() {
 	}
 	echo '</p><br class="clear" />';
 }
-add_action('install_plugins_dashboard', 'install_dashboard');
+add_action( 'install_plugins_featured', 'install_dashboard' );
 
 /**
  * Display search form for searching plugins.
@@ -242,7 +241,6 @@ function display_plugins_table() {
 	$wp_list_table->display();
 }
 add_action( 'install_plugins_search',    'display_plugins_table' );
-add_action( 'install_plugins_featured',  'display_plugins_table' );
 add_action( 'install_plugins_popular',   'display_plugins_table' );
 add_action( 'install_plugins_new',       'display_plugins_table' );
 add_action( 'install_plugins_beta',      'display_plugins_table' );

Original file line number	Diff line number	Diff line change
`@@ -1091,7 +1091,6 @@ input.newtag:focus ~ div.taghint {`
`1091`	`1091`	`p.popular-tags {`
`1092`	`1092`	`border: none;`
`1093`	`1093`	`line-height: 2em;`
`1094`		`- max-width: 1000px;`
`1095`	`1094`	`padding: 8px 12px 12px;`
`1096`	`1095`	`text-align: justify;`
`1097`	`1096`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1241,7 +1241,6 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {`
`1241`	`1241`	`margin-top: 1.5em;`
`1242`	`1242`	`}`
`1243`	`1243`
`1244`		`-.plugin-group:first-of-type,`
`1245`	`1244`	`.plugin-group h3 {`
`1246`	`1245`	`margin-top: 0;`
`1247`	`1246`	`}`