--- a/wp/wp-admin/includes/class-wp-plugin-install-list-table.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-plugin-install-list-table.php Tue Jun 09 03:35:32 2015 +0200
@@ -9,11 +9,46 @@
*/
class WP_Plugin_Install_List_Table extends WP_List_Table {
- function ajax_user_can() {
+ public $order = 'ASC';
+ public $orderby = null;
+ public $groups = array();
+
+ private $error;
+
+ public function ajax_user_can() {
return current_user_can('install_plugins');
}
- function prepare_items() {
+ /**
+ * Return a list of slugs of installed plugins, if known.
+ *
+ * Uses the transient data from the updates API to determine the slugs of
+ * known installed plugins. This might be better elsewhere, perhaps even
+ * within get_plugins().
+ *
+ * @since 4.0.0
+ * @access protected
+ */
+ protected function get_installed_plugin_slugs() {
+ $slugs = array();
+
+ $plugin_info = get_site_transient( 'update_plugins' );
+ if ( isset( $plugin_info->no_update ) ) {
+ foreach ( $plugin_info->no_update as $plugin ) {
+ $slugs[] = $plugin->slug;
+ }
+ }
+
+ if ( isset( $plugin_info->response ) ) {
+ foreach ( $plugin_info->response as $plugin ) {
+ $slugs[] = $plugin->slug;
+ }
+ }
+
+ return $slugs;
+ }
+
+ public function prepare_items() {
include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
global $tabs, $tab, $paged, $type, $term;
@@ -26,24 +61,31 @@
// 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' );
+ $tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
$tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
+ if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+ $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
+ }
+ if ( current_user_can( 'upload_plugins' ) ) {
+ // No longer a real tab. Here for filter compatibility.
+ // Gets skipped in get_views().
+ $tabs['upload'] = __( 'Upload Plugin' );
+ }
- $nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
+ $nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
/**
* Filter the tabs shown on the Plugin Install screen.
*
* @since 2.7.0
*
- * @param array $tabs The tabs shown on the Plugin Install screen. Defaults are 'dashboard', 'search',
- * 'upload', 'featured', 'popular', 'new', and 'favorites'.
+ * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
+ * 'recommended', 'favorites', and 'upload'.
*/
$tabs = apply_filters( 'install_plugins_tabs', $tabs );
@@ -60,7 +102,18 @@
if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
$tab = key( $tabs );
- $args = array( 'page' => $paged, 'per_page' => $per_page );
+ $args = array(
+ 'page' => $paged,
+ 'per_page' => $per_page,
+ 'fields' => array(
+ 'last_updated' => true,
+ 'icons' => true,
+ 'active_installs' => true
+ ),
+ // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
+ 'locale' => get_locale(),
+ 'installed_plugins' => $this->get_installed_plugin_slugs(),
+ );
switch ( $tab ) {
case 'search':
@@ -79,12 +132,16 @@
break;
}
- add_action( 'install_plugins_table_header', 'install_search_form', 10, 0 );
break;
case 'featured':
+ $args['fields']['group'] = true;
+ $this->orderby = 'group';
+ // No break!
case 'popular':
case 'new':
+ case 'beta':
+ case 'recommended':
$args['browse'] = $tab;
break;
@@ -107,9 +164,8 @@
/**
* Filter API request arguments for each Plugin Install screen tab.
*
- * The dynamic portion of the hook name, $tab, refers to the plugin install tabs.
- * Default tabs are 'dashboard', 'search', 'upload', 'featured', 'popular', 'new',
- * and 'favorites'.
+ * The dynamic portion of the hook name, `$tab`, refers to the plugin install tabs.
+ * Default tabs include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.
*
* @since 3.7.0
*
@@ -122,36 +178,114 @@
$api = plugins_api( 'query_plugins', $args );
- if ( is_wp_error( $api ) )
- wp_die( $api->get_error_message() . '</p> <p class="hide-if-no-js"><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+ if ( is_wp_error( $api ) ) {
+ $this->error = $api;
+ return;
+ }
$this->items = $api->plugins;
+ if ( $this->orderby ) {
+ uasort( $this->items, array( $this, 'order_callback' ) );
+ }
+
$this->set_pagination_args( array(
'total_items' => $api->info['results'],
- 'per_page' => $per_page,
+ 'per_page' => $args['per_page'],
) );
+
+ if ( isset( $api->info['groups'] ) ) {
+ $this->groups = $api->info['groups'];
+ }
}
- function no_items() {
- _e( 'No plugins match your request.' );
+ public function no_items() {
+ if ( isset( $this->error ) ) {
+ $message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+ } else {
+ $message = __( 'No plugins match your request.' );
+ }
+ echo '<div class="no-plugin-results">' . $message . '</div>';
}
- function get_views() {
+ protected function get_views() {
global $tabs, $tab;
$display_tabs = array();
foreach ( (array) $tabs as $action => $text ) {
- $class = ( $action == $tab ) ? ' class="current"' : '';
+ $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>";
}
+ // No longer a real tab.
+ unset( $display_tabs['plugin-install-upload'] );
return $display_tabs;
}
- function display_tablenav( $which ) {
- if ( 'top' == $which ) { ?>
+ /**
+ * 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="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( isset( $views['plugin-install-search'] ) ); ?>
+</div>
+<?php
+ }
+
+ /**
+ * Override the parent display() so we can provide a different container.
+ */
+ public function display() {
+ $singular = $this->_args['singular'];
+
+ $data_attr = '';
+
+ if ( $singular ) {
+ $data_attr = " data-wp-lists='list:$singular'";
+ }
+
+ $this->display_tablenav( 'top' );
+
+?>
+<div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+
+ <div id="the-list"<?php echo $data_attr; ?>>
+ <?php $this->display_rows_or_placeholder(); ?>
+ </div>
+</div>
+<?php
+ $this->display_tablenav( 'bottom' );
+ }
+
+ /**
+ * @param string $which
+ */
+ protected function display_tablenav( $which ) {
+ if ( $GLOBALS['tab'] === 'featured' ) {
+ return;
+ }
+
+ if ( 'top' == $which ) {
+ wp_referer_field();
+ ?>
<div class="tablenav top">
<div class="alignleft actions">
<?php
@@ -174,22 +308,40 @@
}
}
- function get_table_classes() {
- extract( $this->_args );
+ protected function get_table_classes() {
+ return array( 'widefat', $this->_args['plural'] );
+ }
- return array( 'widefat', $plural );
+ public function get_columns() {
+ return array();
}
- function get_columns() {
- return array(
- 'name' => _x( 'Name', 'plugin name' ),
- 'version' => __( 'Version' ),
- 'rating' => __( 'Rating' ),
- 'description' => __( 'Description' ),
- );
+ /**
+ * @param object $plugin_a
+ * @param object $plugin_b
+ * @return int
+ */
+ private function order_callback( $plugin_a, $plugin_b ) {
+ $orderby = $this->orderby;
+ if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+ return 0;
+ }
+
+ $a = $plugin_a->$orderby;
+ $b = $plugin_b->$orderby;
+
+ if ( $a == $b ) {
+ return 0;
+ }
+
+ if ( 'DESC' == $this->order ) {
+ return ( $a < $b ) ? 1 : -1;
+ } else {
+ return ( $a < $b ) ? -1 : 1;
+ }
}
- function display_rows() {
+ public function display_rows() {
$plugins_allowedtags = array(
'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
@@ -197,63 +349,97 @@
'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
);
- list( $columns, $hidden ) = $this->get_column_info();
+ $plugins_group_titles = array(
+ 'Performance' => _x( 'Performance', 'Plugin installer group title' ),
+ 'Social' => _x( 'Social', 'Plugin installer group title' ),
+ 'Tools' => _x( 'Tools', 'Plugin installer group title' ),
+ );
- $style = array();
- foreach ( $columns as $column_name => $column_display_name ) {
- $style[ $column_name ] = in_array( $column_name, $hidden ) ? 'style="display:none;"' : '';
- }
+ $group = null;
foreach ( (array) $this->items as $plugin ) {
- if ( is_object( $plugin ) )
+ if ( is_object( $plugin ) ) {
$plugin = (array) $plugin;
+ }
+ // Display the group heading if there is one
+ if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
+ if ( isset( $this->groups[ $plugin['group'] ] ) ) {
+ $group_name = $this->groups[ $plugin['group'] ];
+ if ( isset( $plugins_group_titles[ $group_name ] ) ) {
+ $group_name = $plugins_group_titles[ $group_name ];
+ }
+ } else {
+ $group_name = $plugin['group'];
+ }
+
+ // Starting a new group, close off the divs of the last one
+ if ( ! empty( $group ) ) {
+ echo '</div></div>';
+ }
+
+ echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
+ // needs an extra wrapping div for nth-child selectors to work
+ echo '<div class="plugin-items">';
+
+ $group = $plugin['group'];
+ }
$title = wp_kses( $plugin['name'], $plugins_allowedtags );
- //Limit description to 400char, and remove any HTML.
- $description = strip_tags( $plugin['description'] );
- if ( strlen( $description ) > 400 )
- $description = mb_substr( $description, 0, 400 ) . '…';
- //remove any trailing entities
- $description = preg_replace( '/&[^;\s]{0,6}$/', '', $description );
- //strip leading/trailing & multiple consecutive lines
- $description = trim( $description );
- $description = preg_replace( "|(\r?\n)+|", "\n", $description );
- //\n => <br>
- $description = nl2br( $description );
+
+ // Remove any HTML from the description.
+ $description = strip_tags( $plugin['short_description'] );
$version = wp_kses( $plugin['version'], $plugins_allowedtags );
$name = strip_tags( $title . ' ' . $version );
- $author = $plugin['author'];
- if ( ! empty( $plugin['author'] ) )
- $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '.</cite>';
-
- $author = wp_kses( $author, $plugins_allowedtags );
+ $author = wp_kses( $plugin['author'], $plugins_allowedtags );
+ if ( ! empty( $author ) ) {
+ $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
+ }
$action_links = array();
- $action_links[] = '<a href="' . self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
- '&TB_iframe=true&width=600&height=550' ) . '" class="thickbox" title="' .
- esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
$status = install_plugin_install_status( $plugin );
switch ( $status['status'] ) {
case 'install':
- if ( $status['url'] )
- $action_links[] = '<a class="install-now" href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+ if ( $status['url'] ) {
+ /* translators: 1: Plugin name and version. */
+ $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
+ }
+
break;
case 'update_available':
- if ( $status['url'] )
- $action_links[] = '<a href="' . $status['url'] . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $status['version'] ) ) . '">' . sprintf( __( 'Update Now' ), $status['version'] ) . '</a>';
+ if ( $status['url'] ) {
+ /* translators: 1: Plugin name and version */
+ $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+ }
+
break;
case 'latest_installed':
case 'newer_installed':
- $action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+ $action_links[] = '<span class="button button-disabled" title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
break;
}
}
+ $details_link = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
+ '&TB_iframe=true&width=600&height=550' );
+
+ /* translators: 1: Plugin name and version. */
+ $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+
+ if ( !empty( $plugin['icons']['svg'] ) ) {
+ $plugin_icon_url = $plugin['icons']['svg'];
+ } elseif ( !empty( $plugin['icons']['2x'] ) ) {
+ $plugin_icon_url = $plugin['icons']['2x'];
+ } elseif ( !empty( $plugin['icons']['1x'] ) ) {
+ $plugin_icon_url = $plugin['icons']['1x'];
+ } else {
+ $plugin_icon_url = $plugin['icons']['default'];
+ }
+
/**
* Filter the install action links for a plugin.
*
@@ -263,20 +449,67 @@
* @param array $plugin The plugin currently being listed.
*/
$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+
+ $date_format = __( 'M j, Y @ H:i' );
+ $last_updated_timestamp = strtotime( $plugin['last_updated'] );
?>
- <tr>
- <td class="name column-name"<?php echo $style['name']; ?>><strong><?php echo $title; ?></strong>
- <div class="action-links"><?php if ( !empty( $action_links ) ) echo implode( ' | ', $action_links ); ?></div>
- </td>
- <td class="vers column-version"<?php echo $style['version']; ?>><?php echo $version; ?></td>
- <td class="vers column-rating"<?php echo $style['rating']; ?>>
- <div class="star-holder" title="<?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings'] ), number_format_i18n( $plugin['num_ratings'] ) ) ?>">
- <div class="star star-rating" style="width: <?php echo esc_attr( str_replace( ',', '.', $plugin['rating'] ) ); ?>px"></div>
+ <div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
+ <div class="plugin-card-top">
+ <a href="<?php echo esc_url( $details_link ); ?>" class="thickbox plugin-icon"><img src="<?php echo esc_attr( $plugin_icon_url ) ?>" /></a>
+ <div class="name column-name">
+ <h4><a href="<?php echo esc_url( $details_link ); ?>" class="thickbox"><?php echo $title; ?></a></h4>
+ </div>
+ <div class="action-links">
+ <?php
+ if ( $action_links ) {
+ echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+ }
+ ?>
+ </div>
+ <div class="desc column-description">
+ <p><?php echo $description; ?></p>
+ <p class="authors"><?php echo $author; ?></p>
+ </div>
+ </div>
+ <div class="plugin-card-bottom">
+ <div class="vers column-rating">
+ <?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
+ <span class="num-ratings">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+ </div>
+ <div class="column-updated">
+ <strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
+ <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+ </span>
</div>
- </td>
- <td class="desc column-description"<?php echo $style['description']; ?>><?php echo $description, $author; ?></td>
- </tr>
+ <div class="column-downloaded">
+ <?php
+ if ( $plugin['active_installs'] >= 1000000 ) {
+ $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+ } else {
+ $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+ }
+ printf( __( '%s Active Installs' ), $active_installs_text );
+ ?>
+ </div>
+ <div class="column-compatibility">
+ <?php
+ if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
+ echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
+ } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
+ echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
+ } else {
+ echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
+ }
+ ?>
+ </div>
+ </div>
+ </div>
<?php
}
+
+ // Close off the group divs of the last one
+ if ( ! empty( $group ) ) {
+ echo '</div></div>';
+ }
}
}