Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

Plugin install: display cards in groups if the API returns them with the appropriate information. props tellyworth. fixes #28673.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@29225


git-svn-id: http://core.svn.wordpress.org/trunk@29009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2014-07-18 19:35:14 +00:00
parent 84fb6743fe
commit 4da975b68f
5 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/css/list-tables-rtl.css
View File

@ -1216,6 +1216,16 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
}
/* Plugin card table view */
.plugin-group {
overflow: hidden; /* clearfix */
margin-top: 1.5em;
}
.plugin-group:first-of-type,
.plugin-group h3 {
margin-top: 0;
}
.plugin-card {
float: right;
margin: 0 8px 16px;

10
wp-admin/css/list-tables.css
View File

@ -1216,6 +1216,16 @@ tr.active + tr.plugin-update-tr .plugin-update .update-message {
}
/* Plugin card table view */
.plugin-group {
overflow: hidden; /* clearfix */
margin-top: 1.5em;
}
.plugin-group:first-of-type,
.plugin-group h3 {
margin-top: 0;
}
.plugin-card {
float: left;
margin: 0 8px 16px;

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

53
wp-admin/includes/class-wp-plugin-install-list-table.php
View File

@ -9,6 +9,10 @@
*/
class WP_Plugin_Install_List_Table extends WP_List_Table {
var $order = 'ASC';
var $orderby = null;
var $groups = array();
public function ajax_user_can() {
return current_user_can('install_plugins');
}
@ -85,6 +89,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
break;
case 'featured':
$args['fields']['group'] = true;
$this->orderby = 'group';
// No break!
case 'popular':
case 'new':
case 'beta':
@ -130,10 +137,17 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
$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' => $args['per_page'],
) );
if ( isset( $api->info['groups'] ) )
$this->groups = $api->info['groups'];
}
public function no_items() {
@ -243,6 +257,25 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
);
}
public 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;
}
public function display_rows() {
$plugins_allowedtags = array(
'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
@ -258,10 +291,30 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
$style[ $column_name ] = in_array( $column_name, $hidden ) ? 'style="display:none;"' : '';
}
$group = null;
foreach ( (array) $this->items as $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 = translate( $this->groups[ $plugin['group'] ] ); // Does this need context?
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 );
//Remove any HTML from the description.