<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29218] trunk/src/wp-admin: Install Plugins screen:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29218">29218</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-07-18 04:49:19 +0000 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Install Plugins screen:
* Utilize the (currently-named) filter bar from the Add Themes screen.
* Move the upload link to the h2, also like the Add Themes screen.
see <a href="http://core.trac.wordpress.org/ticket/28673">#28673</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssformscss">trunk/src/wp-admin/css/forms.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssformscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/forms.css (29217 => 29218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/forms.css 2014-07-18 03:39:04 UTC (rev 29217)
+++ trunk/src/wp-admin/css/forms.css 2014-07-18 04:49:19 UTC (rev 29218)
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .search-box input[name="s"],
</span><del>-#search-plugins input[name="s"],
</del><ins>+.tablenav .search-plugins input[name="s"],
</ins><span class="cx"> .tagsdiv .newtag {
</span><span class="cx"> float: left;
</span><span class="cx"> height: 28px;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php (29217 => 29218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2014-07-18 03:39:04 UTC (rev 29217)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2014-07-18 04:49:19 UTC (rev 29218)
</span><span class="lines">@@ -26,10 +26,9 @@
</span><span class="cx">
</span><span class="cx"> // These are the tabs which are shown on the page
</span><span class="cx"> $tabs = array();
</span><del>- $tabs['dashboard'] = __( 'Search' );
</del><ins>+
</ins><span class="cx"> if ( 'search' == $tab )
</span><span class="cx"> $tabs['search'] = __( 'Search Results' );
</span><del>- $tabs['upload'] = __( 'Upload' );
</del><span class="cx"> $tabs['featured'] = _x( 'Featured', 'Plugin Installer' );
</span><span class="cx"> $tabs['popular'] = _x( 'Popular', 'Plugin Installer' );
</span><span class="cx"> $tabs['new'] = _x( 'Newest', 'Plugin Installer' );
</span><span class="lines">@@ -38,7 +37,7 @@
</span><span class="cx"> $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
</del><ins>+ $nonmenu_tabs = array( 'upload', 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the tabs shown on the Plugin Install screen.
</span><span class="lines">@@ -146,15 +145,43 @@
</span><span class="cx">
</span><span class="cx"> $display_tabs = array();
</span><span class="cx"> foreach ( (array) $tabs as $action => $text ) {
</span><del>- $class = ( $action == $tab ) ? ' class="current"' : '';
</del><ins>+ $class = 'wp-filter-link';
+ $class .= ( $action == $tab ) ? ' current' : '';
</ins><span class="cx"> $href = self_admin_url('plugin-install.php?tab=' . $action);
</span><del>- $display_tabs['plugin-install-'.$action] = "<a href='$href'$class>$text</a>";
</del><ins>+ $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $display_tabs;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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
+ }
+
+ /**
</ins><span class="cx"> * Override the parent display() so we can provide a different container.
</span><span class="cx"> */
</span><span class="cx"> public function display() {
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/plugin-install.php (29217 => 29218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/plugin-install.php 2014-07-18 03:39:04 UTC (rev 29217)
+++ trunk/src/wp-admin/includes/plugin-install.php 2014-07-18 04:49:19 UTC (rev 29218)
</span><span class="lines">@@ -163,8 +163,16 @@
</span><span class="cx"> function install_search_form( $type_selector = true ) {
</span><span class="cx"> $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term';
</span><span class="cx"> $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : '';
</span><ins>+ $input_attrs = '';
+ $button_type = 'button';
</ins><span class="cx">
</span><del>- ?><form id="search-plugins" method="get" action="">
</del><ins>+ // 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="">
</ins><span class="cx"> <input type="hidden" name="tab" value="search" />
</span><span class="cx"> <?php if ( $type_selector ) : ?>
</span><span class="cx"> <select name="type" id="typeselector">
</span><span class="lines">@@ -173,9 +181,10 @@
</span><span class="cx"> <option value="tag"<?php selected('tag', $type) ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
</span><span class="cx"> </select>
</span><span class="cx"> <?php endif; ?>
</span><del>- <input type="search" name="s" id="plugin-search-input" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
- <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' ) ); ?>
</del><ins>+ <label><span class="screen-reader-text"><?php _e('Search Plugins'); ?></span>
+ <input type="search" name="s" value="<?php echo esc_attr($term) ?>" <?php echo $input_attrs; ?>/>
+ </label>
+ <?php submit_button( __( 'Search Plugins' ), $button_type, false, false, array( 'id' => 'search-submit' ) ); ?>
</ins><span class="cx"> </form><?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/plugin-install.php (29217 => 29218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/plugin-install.php 2014-07-18 03:39:04 UTC (rev 29217)
+++ trunk/src/wp-admin/plugin-install.php 2014-07-18 04:49:19 UTC (rev 29218)
</span><span class="lines">@@ -73,7 +73,13 @@
</span><span class="cx"> include(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<h2><?php echo esc_html( $title ); ?></h2>
</del><ins>+<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>
</ins><span class="cx">
</span><span class="cx"> <?php $wp_list_table->views(); ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>