Ticket #28673: 28673.4.diff

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

@@ -26 +26 @@
 
                 // These are the tabs which are shown on the page
                 $tabs = array();
-                $tabs['dashboard'] = __( 'Search' );
+
                 if ( 'search' == $tab )
                         $tabs['search'] = __( 'Search Results' );
-                $tabs['upload']    = __( 'Upload' );
                 $tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
                 $tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
                 $tabs['new']       = _x( 'Newest', 'Plugin Installer' );
@@ -38 +37 @@
                         $tabs['beta']      = _x( 'Beta Testing', 'Plugin Installer' );
                 }
 
-                $nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
+                $nonmenu_tabs = array( 'upload', 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
 
                 /**
                  * Filter the tabs shown on the Plugin Install screen.
@@ -146 +145 @@
 
                 $display_tabs = array();
                 foreach ( (array) $tabs as $action => $text ) {
-                        $class = ( $action == $tab ) ? ' class="current"' : '';
+                        $class = 'wp-filter-link';
+                        $class .= ( $action == $tab ) ? ' current' : '';
                         $href = self_admin_url('plugin-install.php?tab=' . $action);
-                        $display_tabs['plugin-install-'.$action] = "<a href='$href'$class>$text</a>";
+                        $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
                 }
 
                 return $display_tabs;
         }
 
         /**
+         * Override parent views so we can use the filter bar display.
+         */
+        public function views() {
+                $views = $this->get_views();
+
+                /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+                $views = apply_filters( "views_{$this->screen->id}", $views );
+
+?>
+<div class="wp-filter">
+        <ul class="wp-filter-links">
+                <?php
+                if ( ! empty( $views ) ) {
+                        foreach ( $views as $class => $view ) {
+                                $views[ $class ] = "\t<li class='$class'>$view";
+                        }
+                        echo implode( " </li>\n", $views ) . "</li>\n";
+                }
+                ?>
+        </ul>
+
+        <?php install_search_form( false ); ?>
+</div>
+<?php
+        }
+
+        /**
          * Override the parent display() so we can provide a different container.
          */
         public function display() {

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

@@ -163 +163 @@
 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';
 
+        // 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 id="search-plugins" method="get" action="">
                 <input type="hidden" name="tab" value="search" />
                 <?php if ( $type_selector ) : ?>
@@ -173 +181 @@
                         <option value="tag"<?php selected('tag', $type) ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
                 </select>
                 <?php endif; ?>
-                <input type="search" name="s" id="plugin-search-input" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
+                <input type="search" name="s" id="plugin-search-input" value="<?php echo esc_attr($term) ?>" <?php echo $input_attrs; ?>/>
                 <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
-                <?php submit_button( __( 'Search Plugins' ), 'button', false, false, array( 'id' => 'search-submit' ) ); ?>
+                <?php submit_button( __( 'Search Plugins' ), $button_type, false, false, array( 'id' => 'search-submit' ) ); ?>
         </form><?php
 }
 

src/wp-admin/plugin-install.php

@@ -73 +73 @@
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2>
+        <?php
+                echo esc_html( $title );
+                $href = self_admin_url( 'plugin-install.php?tab=upload' );
+        ?>
+        <a href="<?php echo $href; ?>" class="upload add-new-h2"><?php _e( 'Upload Plugin' ); ?></a>
+</h2>
 
 <?php $wp_list_table->views(); ?>