<!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>[31181] trunk/src/wp-admin: List tables: Use CSS :nth-child() selectors for zebra striping.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31181">31181</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31181","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-14 22:13:03 +0000 (Wed, 14 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>List tables: Use CSS :nth-child() selectors for zebra striping.
Note that this does not fix issues related to comment quick edit. Internal linking also continues to use the `.alternate` class for now. IE8 and below gracefully degrade by not having zebra striping.
There is some hoop jumping with adding an extra table row to maintain zebra striping during quick edit. Documenting that here for future reference; it is also in the inline documentation.
fixes <a href="https://core.trac.wordpress.org/ticket/30981">#30981</a> and <a href="https://core.trac.wordpress.org/ticket/26060">#26060</a>. see <a href="https://core.trac.wordpress.org/ticket/25060">#25060</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincssdashboardcss">trunk/src/wp-admin/css/dashboard.css</a></li>
<li><a href="#trunksrcwpadmincsslisttablescss">trunk/src/wp-admin/css/list-tables.css</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminjsinlineeditpostjs">trunk/src/wp-admin/js/inline-edit-post.js</a></li>
<li><a href="#trunksrcwpadminjsinlineedittaxjs">trunk/src/wp-admin/js/inline-edit-tax.js</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/css/common.css 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,8 +627,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #000;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.alternate,
-.alt {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.striped > tbody > :nth-child(odd),
+.alternate {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #f9f9f9;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmincssdashboardcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/dashboard.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/dashboard.css 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/css/dashboard.css 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -694,11 +694,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 12px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#activity-widget #the-comment-list .alternate,
-#activity-widget #the-comment-list .alt {
- background: none;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #activity-widget #the-comment-list .comment-item {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #fafafa;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 12px;
</span></span></pre></div>
<a id="trunksrcwpadmincsslisttablescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/list-tables.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/list-tables.css 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/css/list-tables.css 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1433,16 +1433,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* ms */
</span><span class="cx" style="display: block; padding: 0 10px"> /* Background Color for Site Status */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-list-table .site-deleted {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-list-table tr.site-deleted {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #ff8573;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-list-table .site-spammed {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-list-table tr.site-spammed {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #faafaa;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-list-table .site-archived {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-list-table tr.site-archived {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #ffebe8;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wp-list-table .site-mature {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-list-table tr.site-mature {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #fecac2;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/import.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,10 +76,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> uasort( $importers, '_usort_by_first_member' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<table class="widefat importers">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<table class="widefat importers striped">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = '';
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ($importers as $importer_id => $data) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $data['install'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,9 +107,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = $alt ? '' : ' class="alternate"';
</del><span class="cx" style="display: block; padding: 0 10px"> echo "
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr$alt>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class='import-system row-title'>$action</td>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class='desc'>{$data[1]}</td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>";
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-links-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-links-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,8 +111,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function display_rows() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $cat_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = 0;
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->items as $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = sanitize_bookmark( $link );
</span><span class="cx" style="display: block; padding: 0 10px"> $link->link_name = esc_attr( $link->link_name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,11 +120,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $visible = ( $link->link_visible == 'Y' ) ? __( 'Yes' ) : __( 'No' );
</span><span class="cx" style="display: block; padding: 0 10px"> $rating = $link->link_rating;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style = ( $alt++ % 2 ) ? '' : ' class="alternate"';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $edit_link = get_edit_bookmark_link( $link );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr id="link-<?php echo $link->link_id; ?>" <?php echo $style; ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr id="link-<?php echo $link->link_id; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $columns, $hidden ) = $this->get_column_info();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -953,7 +953,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of CSS classes for the table tag.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array( 'widefat', 'fixed', $this->_args['plural'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array( 'widefat', 'fixed', 'striped', $this->_args['plural'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1028,10 +1028,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $item The current item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $row_class = '';
- $row_class = ( $row_class == '' ? ' class="alternate"' : '' );
-
- echo '<tr' . $row_class . '>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<tr>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->single_row_columns( $item );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</tr>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title','esc_html' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( have_posts() ) : the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> $user_can_edit = current_user_can( 'edit_post', $post->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,11 +276,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> || !$this->is_trash && $post->post_status == 'trash' )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = ( 'alternate' == $alt ) ? '' : 'alternate';
</del><span class="cx" style="display: block; padding: 0 10px"> $post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
</span><span class="cx" style="display: block; padding: 0 10px"> $att_title = _draft_or_post_title();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $columns, $hidden ) = $this->get_column_info();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,15 +208,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $date = 'Y/m/d \<\b\r \/\> g:i:s a';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = '';
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->items as $blog ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( 'alternate' == $class ) ? '' : 'alternate';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> reset( $status_list );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_states = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $status_list as $status => $col ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = $col[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = " class='{$col[0]}'";
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_states[] = $col[1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_state .= "<span class='post-state'>$state$sep</span>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<tr class='$class'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<tr{$class}>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blogname = ( is_subdomain_install() ) ? str_replace( '.' . get_current_site()->domain, '', $blog['domain'] ) : $blog['path'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,20 +149,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function display_rows() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = '';
</del><span class="cx" style="display: block; padding: 0 10px"> $super_admins = get_super_admins();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->items as $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = ( 'alternate' == $alt ) ? '' : 'alternate';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $status_list as $status => $col ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user->$status )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt .= " $col";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class .= " $col";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr class="<?php echo $alt; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="<?php echo trim( $class ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $columns, $hidden ) = $this->get_column_info();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,13 +572,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $mode
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @staticvar string $alternate
</del><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $level
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $post, $level = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $alternate;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $global_post = get_post();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['post'] = $post;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,8 +587,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post->post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_edit_post = current_user_can( 'edit_post', $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alternate = 'alternate' == $alternate ? '' : 'alternate';
- $classes = $alternate . ' iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $lock_holder = wp_check_post_lock( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lock_holder ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $taxonomy
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @staticvar string $row_class
</del><span class="cx" style="display: block; padding: 0 10px"> * @param object $tag
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $level
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,12 +275,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = sanitize_term( $tag, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $row_class = '';
- $row_class = ( $row_class == '' ? ' class="alternate"' : '' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->level = $level;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<tr id="tag-' . $tag->term_id . '">';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->single_row_columns( $tag );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</tr>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editable_roles = array_keys( get_editable_roles() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style = '';
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->items as $userid => $user_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $user_object->roles ) <= 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $role = reset( $user_object->roles );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,8 +318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && empty( $user_object->allcaps ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
- echo "\n\t" . $this->single_row( $user_object, $style, $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "\n\t" . $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,11 +326,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Generate HTML for a single row on the users.php admin panel.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 `$style` argument was deprecated.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $user_object The current user object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $style Optional. Style attributes added to the `<tr>` element.
- * Must be sanitized. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $style Deprecated. Not used.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $role Optional. Key for the $wp_roles array. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $numposts Optional. Post count to display for this user. Defaults
</span><span class="cx" style="display: block; padding: 0 10px"> * to zero, as in, a new user has made zero posts.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +393,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' );
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $user_object->ID, 32 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = "<tr id='user-$user_object->ID'$style>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = "<tr id='user-$user_object->ID'>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $columns, $hidden ) = $this->get_column_info();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/includes/template.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,10 +589,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = '';
</span><span class="cx" style="display: block; padding: 0 10px"> ++ $count;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $count % 2 )
- $style = 'alternate';
- else
- $style = '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_serialized( $entry['meta_value'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_serialized_string( $entry['meta_value'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,7 +607,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r .= "\n\t<tr id='meta-{$entry['meta_id']}'>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= "\n\t\t<div class='submit'>";
</span></span></pre></div>
<a id="trunksrcwpadminjsinlineeditpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/inline-edit-post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/inline-edit-post.js 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/js/inline-edit-post.js 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.revert();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('#bulk-edit td').attr('colspan', $('.widefat:first thead th:visible').length);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('table.widefat tbody').prepend( $('#bulk-edit') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Insert the editor at the top of the table with an empty row above to maintain zebra striping.
+ $('table.widefat tbody').prepend( $('#bulk-edit') ).prepend('<tr class="hidden"></tr>');
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#bulk-edit').addClass('inline-editor').show();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'tbody th.check-column input[type="checkbox"]' ).each( function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,14 +129,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fields.push('post_parent', 'page_template');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // add the new blank row
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // add the new edit row with an extra blank row underneath to maintain zebra striping.
</ins><span class="cx" style="display: block; padding: 0 10px"> editRow = $('#inline-edit').clone(true);
</span><span class="cx" style="display: block; padding: 0 10px"> $('td', editRow).attr('colspan', $('.widefat:first thead th:visible').length);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $( t.what + id ).hasClass( 'alternate' ) ) {
- $(editRow).addClass('alternate');
- }
- $(t.what+id).hide().after(editRow);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $(t.what+id).hide().before(editRow).before('<tr class="hidden"></tr>');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // populate the data
</span><span class="cx" style="display: block; padding: 0 10px"> rowData = $('#inline_'+id);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (r) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 !== r.indexOf( '<tr' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(inlineEditPost.what+id).remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $(inlineEditPost.what+id).siblings('tr.hidden').addBack().remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#edit-'+id).before(r).remove();
</span><span class="cx" style="display: block; padding: 0 10px"> $(inlineEditPost.what+id).hide().fadeIn();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,10 +273,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( $('#post-'+id).prev().hasClass('alternate') ) {
- $('#post-'+id).removeClass('alternate');
- }
</del><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> 'html');
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,11 +285,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $('table.widefat .spinner').hide();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'bulk-edit' === id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('table.widefat #bulk-edit').removeClass('inline-editor').hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('table.widefat #bulk-edit').removeClass('inline-editor').hide().siblings('tr.hidden').remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#bulk-titles').html('');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#inlineedit').append( $('#bulk-edit') );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#'+id).remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#'+id).siblings('tr.hidden').addBack().remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> id = id.substr( id.lastIndexOf('-') + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $(this.what+id).show();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminjsinlineedittaxjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/inline-edit-tax.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/inline-edit-tax.js 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/js/inline-edit-tax.js 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,12 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editRow = $('#inline-edit').clone(true), rowData = $('#inline_'+id);
</span><span class="cx" style="display: block; padding: 0 10px"> $('td', editRow).attr('colspan', $('.widefat:first thead th:visible').length);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $( t.what + id ).hasClass( 'alternate' ) ) {
- $(editRow).addClass('alternate');
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $(t.what+id).hide().before(editRow).before('<tr class="hidden"></tr>');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(t.what+id).hide().after(editRow);
-
</del><span class="cx" style="display: block; padding: 0 10px"> $(':input[name="name"]', editRow).val( $('.name', rowData).text() );
</span><span class="cx" style="display: block; padding: 0 10px"> $(':input[name="slug"]', editRow).val( $('.slug', rowData).text() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (r) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 !== r.indexOf( '<tr' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(inlineEditTax.what+id).remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $(inlineEditTax.what+id).siblings('tr.hidden').addBack().remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> new_id = $(r).attr('id');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edit-'+id).before(r).remove();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,10 +106,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( $( row ).prev( 'tr' ).hasClass( 'alternate' ) ) {
- $(row).removeClass('alternate');
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $('table.widefat .spinner').hide();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#'+id).remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#'+id).siblings('tr.hidden').addBack().remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> id = id.substr( id.lastIndexOf('-') + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $(this.what+id).show();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2015-01-14 21:32:23 UTC (rev 31180)
+++ trunk/src/wp-admin/my-sites.php 2015-01-14 22:13:03 UTC (rev 31181)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'myblogs_allblogs_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <br clear="all" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table class="widefat fixed">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="widefat fixed striped">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Enable the Global Settings section on the My Sites screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,10 +109,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $split = $split + $cols;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = '';
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $rows as $row ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = $c == 'alternate' ? '' : 'alternate';
- echo "<tr class='$c'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<tr>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $row as $user_blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $s = $i == 3 ? '' : 'border-right: 1px solid #ccc;';
</span></span></pre>
</div>
</div>
</body>
</html>