<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16345] trunk/wp-admin: Begin rework of plugins list table.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16345">16345</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-13 15:58:23 +0000 (Sat, 13 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin rework of plugins list table. Props edward mindreantre. See <a href="http://trac.wordpress.org/ticket/15318">#15318</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjslisttabledevjs">trunk/wp-admin/js/list-table.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (16344 => 16345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-11-13 15:33:12 UTC (rev 16344)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-11-13 15:58:23 UTC (rev 16345)
</span><span class="lines">@@ -383,7 +383,8 @@
</span><span class="cx"> $actions = apply_filters( "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
</span><span class="cx">
</span><span class="cx"> $class = $is_active ? 'active' : 'inactive';
</span><del>- $checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' />";
</del><ins>+ $checkbox_id = md5($plugin_data['Name']) . "_checkbox";
+ $checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $plugin_data['Name'] . "</label>";
</ins><span class="cx"> if ( 'dropins' != $status ) {
</span><span class="cx"> $description = '<p>' . $plugin_data['Description'] . '</p>';
</span><span class="cx"> $plugin_name = $plugin_data['Name'];
</span><span class="lines">@@ -394,33 +395,41 @@
</span><span class="cx"> echo "
</span><span class="cx"> <tr id='$id' class='$class'>
</span><span class="cx"> <th scope='row' class='check-column'>$checkbox</th>
</span><del>- <td class='plugin-title'><strong>$plugin_name</strong></td>
- <td class='desc'>$description</td>
- </tr>
- <tr class='$class second'>
- <td></td>
- <td class='plugin-title'>";
-
</del><ins>+ <td class='plugin-title'>
+ <strong>$plugin_name</strong>
+ ";
+
</ins><span class="cx"> echo $this->row_actions( $actions, true );
</span><span class="cx">
</span><del>- echo "</td>
- <td class='desc'>";
- $plugin_meta = array();
- if ( !empty( $plugin_data['Version'] ) )
- $plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
- if ( !empty( $plugin_data['Author'] ) ) {
- $author = $plugin_data['Author'];
- if ( !empty( $plugin_data['AuthorURI'] ) )
- $author = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
- $plugin_meta[] = sprintf( __( 'By %s' ), $author );
- }
- if ( ! empty( $plugin_data['PluginURI'] ) )
- $plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
</del><ins>+ echo "
+ </td>
+ <td class='column-description desc'>
+ <div class='plugin-description'>
+ $description
+ </div>
+ <div class='$class second plugin-version-author-uri'>
+ ";
+
+ $plugin_meta = array();
+ if ( !empty( $plugin_data['Version'] ) )
+ $plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+ if ( !empty( $plugin_data['Author'] ) ) {
+ $author = $plugin_data['Author'];
+ if ( !empty( $plugin_data['AuthorURI'] ) )
+ $author = '<a href="' . $plugin_data['AuthorURI'] . '" title="' . __( 'Visit author homepage' ) . '">' . $plugin_data['Author'] . '</a>';
+ $plugin_meta[] = sprintf( __( 'By %s' ), $author );
+ }
+ if ( ! empty( $plugin_data['PluginURI'] ) )
+ $plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
+
+ $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
+ echo implode( ' | ', $plugin_meta );
</ins><span class="cx">
</span><del>- $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
- echo implode( ' | ', $plugin_meta );
- echo "</td>
- </tr>\n";
</del><ins>+ echo "
+ </div>
+ </td>
+ </tr>
+";
</ins><span class="cx">
</span><span class="cx"> do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
</span><span class="cx"> do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (16344 => 16345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2010-11-13 15:33:12 UTC (rev 16344)
+++ trunk/wp-admin/js/common.dev.js 2010-11-13 15:58:23 UTC (rev 16345)
</span><span class="lines">@@ -123,17 +123,22 @@
</span><span class="cx"> // show/hide/save table columns
</span><span class="cx"> columns = {
</span><span class="cx"> init : function() {
</span><del>- var that = this;
</del><ins>+
+ this.toggleView( $('.hide-column-tog', '#adv-settings').attr('checked'), $('.hide-column-tog', '#adv-settings').val() );
+ $('.column-name').css("width", "auto"); // Otherwise it only wants 50% column width...
+
</ins><span class="cx"> $('.hide-column-tog', '#adv-settings').click( function() {
</span><del>- var $t = $(this), column = $t.val();
- if ( $t.attr('checked') )
- that.checked(column);
- else
- that.unchecked(column);
-
</del><ins>+ columns.toggleView( $(this).attr('checked'), $(this).val() );
</ins><span class="cx"> columns.saveManageColumnsState();
</span><span class="cx"> });
</span><span class="cx"> },
</span><ins>+
+ toggleView : function(checked, column) {
+ if ( checked )
+ this.checked(column);
+ else
+ this.unchecked(column);
+ },
</ins><span class="cx">
</span><span class="cx"> saveManageColumnsState : function() {
</span><span class="cx"> var hidden = this.hidden();
</span></span></pre></div>
<a id="trunkwpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.dev.js (16344 => 16345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.dev.js 2010-11-13 15:33:12 UTC (rev 16344)
+++ trunk/wp-admin/js/list-table.dev.js 2010-11-13 15:58:23 UTC (rev 16345)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> data = $.query.get();
</span><span class="cx">
</span><span class="cx"> this._callback = callback;
</span><del>-
</del><ins>+
</ins><span class="cx"> this.fetch_list(
</span><span class="cx"> data,
</span><span class="cx"> $.proxy(this, 'handle_success'),
</span><span class="lines">@@ -107,6 +107,8 @@
</span><span class="cx"> $('.current-page').val($.query.GET('paged'));
</span><span class="cx">
</span><span class="cx"> $('th.column-cb :input').attr('checked', false);
</span><ins>+
+ columns.init(); // To rehide the hidden columns.
</ins><span class="cx">
</span><span class="cx"> if ( this._callback )
</span><span class="cx"> this._callback();
</span></span></pre>
</div>
</div>
</body>
</html>