<!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>[20592] trunk/wp-admin/includes: Reduce clutter and repetive functionality from the initial landing page for installing plugins and themes by removing the tag/author/term dropdown.</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, #logmsg > ol { margin-left: 0; 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/20592">20592</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-25 19:37:19 +0000 (Wed, 25 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce clutter and repetive functionality from the initial landing page for installing plugins and themes by removing the tag/author/term dropdown.
The tag cloud (plugins) and feature filter (themes) is sufficient for tag functionality. All three "search by" fields are already weighted for a standard keyword search through the WP.org API.
fixes <a href="http://core.trac.wordpress.org/ticket/19619">#19619</a> for 3.4.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpplugininstalllisttablephp">trunk/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeinstalllisttablephp">trunk/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugin-install-list-table.php (20591 => 20592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2012-04-25 17:49:48 UTC (rev 20591)
+++ trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2012-04-25 19:37:19 UTC (rev 20592)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- add_action( 'install_plugins_table_header', 'install_search_form' );
</del><ins>+ add_action( 'install_plugins_table_header', 'install_search_form', 10, 0 );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'featured':
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (20591 => 20592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-04-25 17:49:48 UTC (rev 20591)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-04-25 19:37:19 UTC (rev 20592)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> $_REQUEST['type'] = 'tag';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- add_action( 'install_themes_table_header', 'install_theme_search_form' );
</del><ins>+ add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'featured':
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (20591 => 20592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2012-04-25 17:49:48 UTC (rev 20591)
+++ trunk/wp-admin/includes/plugin-install.php 2012-04-25 19:37:19 UTC (rev 20592)
</span><span class="lines">@@ -84,8 +84,7 @@
</span><span class="cx"> <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%s">this page</a>.' ), self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
</span><span class="cx">
</span><span class="cx"> <h4><?php _e('Search') ?></h4>
</span><del>- <p class="install-help"><?php _e('Search for plugins by keyword, author, or tag.') ?></p>
- <?php install_search_form(); ?>
</del><ins>+ <?php install_search_form( false ); ?>
</ins><span class="cx">
</span><span class="cx"> <h4><?php _e('Popular tags') ?></h4>
</span><span class="cx"> <p class="install-help"><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
</span><span class="lines">@@ -116,17 +115,19 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> */
</span><del>-function install_search_form(){
</del><ins>+function install_search_form( $type_selector = true ) {
</ins><span class="cx"> $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
</span><span class="cx"> $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
</span><span class="cx">
</span><span class="cx"> ?><form id="search-plugins" method="get" action="">
</span><span class="cx"> <input type="hidden" name="tab" value="search" />
</span><ins>+ <?php if ( $type_selector ) : ?>
</ins><span class="cx"> <select name="type" id="typeselector">
</span><span class="cx"> <option value="term"<?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
</span><span class="cx"> <option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
</span><span class="cx"> <option value="tag"<?php selected('tag', $type) ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
</span><span class="cx"> </select>
</span><ins>+ <?php endif; ?>
</ins><span class="cx"> <input type="search" name="s" value="<?php echo esc_attr($term) ?>" />
</span><span class="cx"> <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
</span><span class="cx"> <?php submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false ); ?>
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (20591 => 20592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2012-04-25 17:49:48 UTC (rev 20591)
+++ trunk/wp-admin/includes/theme-install.php 2012-04-25 19:37:19 UTC (rev 20592)
</span><span class="lines">@@ -49,19 +49,21 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><del>-function install_theme_search_form() {
</del><ins>+function install_theme_search_form( $type_selector = true ) {
</ins><span class="cx"> $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
</span><span class="cx"> $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
</span><ins>+ if ( ! $type_selector )
+ echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
</ins><span class="cx"> ?>
</span><del>-<p class="install-help"><?php _e('Search for themes by keyword, author, or tag.') ?></p>
-
</del><span class="cx"> <form id="search-themes" method="get" action="">
</span><span class="cx"> <input type="hidden" name="tab" value="search" />
</span><ins>+ <?php if ( $type_selector ) : ?>
</ins><span class="cx"> <select name="type" id="typeselector">
</span><span class="cx"> <option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
</span><span class="cx"> <option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
</span><span class="cx"> <option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
</span><span class="cx"> </select>
</span><ins>+ <?php endif; ?>
</ins><span class="cx"> <input type="search" name="s" size="30" value="<?php echo esc_attr($term) ?>" />
</span><span class="cx"> <?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
</span><span class="cx"> </form>
</span><span class="lines">@@ -74,10 +76,10 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> function install_themes_dashboard() {
</span><del>- install_theme_search_form();
</del><ins>+ install_theme_search_form( false );
</ins><span class="cx"> ?>
</span><span class="cx"> <h4><?php _e('Feature Filter') ?></h4>
</span><del>-<p class="install-help"><?php _e('Find a theme based on specific features') ?></p>
</del><ins>+<p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <form method="get" action="">
</span><span class="cx"> <input type="hidden" name="tab" value="search" />
</span></span></pre>
</div>
</div>
</body>
</html>