<!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>[29225] trunk/src/wp-admin: Plugin install: display cards in groups if the API returns them with the appropriate information.</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/29225">29225</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-07-18 19:34:47 +0000 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Plugin install: display cards in groups if the API returns them with the appropriate information. props tellyworth. fixes <a href="http://core.trac.wordpress.org/ticket/28673">#28673</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsslisttablescss">trunk/src/wp-admin/css/list-tables.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsslisttablescss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/list-tables.css (29224 => 29225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/list-tables.css 2014-07-18 19:15:13 UTC (rev 29224)
+++ trunk/src/wp-admin/css/list-tables.css 2014-07-18 19:34:47 UTC (rev 29225)
</span><span class="lines">@@ -1216,6 +1216,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Plugin card table view */
</span><ins>+.plugin-group {
+ overflow: hidden; /* clearfix */
+ margin-top: 1.5em;
+}
+
+.plugin-group:first-of-type,
+.plugin-group h3 {
+ margin-top: 0;
+}
+
</ins><span class="cx"> .plugin-card {
</span><span class="cx"> float: left;
</span><span class="cx"> margin: 0 8px 16px;
</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 (29224 => 29225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2014-07-18 19:15:13 UTC (rev 29224)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2014-07-18 19:34:47 UTC (rev 29225)
</span><span class="lines">@@ -9,6 +9,10 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Plugin_Install_List_Table extends WP_List_Table {
</span><span class="cx">
</span><ins>+ var $order = 'ASC';
+ var $orderby = null;
+ var $groups = array();
+
</ins><span class="cx"> public function ajax_user_can() {
</span><span class="cx"> return current_user_can('install_plugins');
</span><span class="cx"> }
</span><span class="lines">@@ -85,6 +89,9 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'featured':
</span><ins>+ $args['fields']['group'] = true;
+ $this->orderby = 'group';
+ // No break!
</ins><span class="cx"> case 'popular':
</span><span class="cx"> case 'new':
</span><span class="cx"> case 'beta':
</span><span class="lines">@@ -130,10 +137,17 @@
</span><span class="cx">
</span><span class="cx"> $this->items = $api->plugins;
</span><span class="cx">
</span><ins>+ if ( $this->orderby ) {
+ uasort( $this->items, array( $this, '_order_callback' ) );
+ }
+
</ins><span class="cx"> $this->set_pagination_args( array(
</span><span class="cx"> 'total_items' => $api->info['results'],
</span><span class="cx"> 'per_page' => $args['per_page'],
</span><span class="cx"> ) );
</span><ins>+
+ if ( isset( $api->info['groups'] ) )
+ $this->groups = $api->info['groups'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function no_items() {
</span><span class="lines">@@ -243,6 +257,25 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ 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;
+ }
+
+
</ins><span class="cx"> public function display_rows() {
</span><span class="cx"> $plugins_allowedtags = array(
</span><span class="cx"> 'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
</span><span class="lines">@@ -258,10 +291,30 @@
</span><span class="cx"> $style[ $column_name ] = in_array( $column_name, $hidden ) ? 'style="display:none;"' : '';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $group = null;
+
</ins><span class="cx"> foreach ( (array) $this->items as $plugin ) {
</span><span class="cx"> if ( is_object( $plugin ) )
</span><span class="cx"> $plugin = (array) $plugin;
</span><span class="cx">
</span><ins>+ // 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'];
+ }
</ins><span class="cx"> $title = wp_kses( $plugin['name'], $plugins_allowedtags );
</span><span class="cx">
</span><span class="cx"> //Remove any HTML from the description.
</span></span></pre>
</div>
</div>
</body>
</html>