Changeset 29225

Timestamp:

07/18/2014 07:34:47 PM (9 years ago)

Author:

helen

Message:

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

Location:

trunk/src/wp-admin

Files:

• css/list-tables.css (modified) (1 diff)
• includes/class-wp-plugin-install-list-table.php (modified) (5 diffs)

trunk/src/wp-admin/css/list-tables.css

@@ -1217 +1217 @@
 
 /* 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;

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

@@ -10 +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');
@@ -86 +90 @@
 
             case 'featured':
+                $args['fields']['group'] = true;
+                $this->orderby = 'group';
+                // No break!
             case 'popular':
             case 'new':
@@ -131 +138 @@
         $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'];
     }
 
@@ -244 +258 @@
     }
 
+    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(
@@ -259 +292 @@
         }
 
+        $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 );