Implement proper column show/hide behaviour based on screen options for the Network Admin Sites table.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-11-23 11:39:50 +00:00
parent d941809a3c
commit 93e23a7101
1 changed files with 18 additions and 19 deletions

View File

@ -200,6 +200,10 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
list( $columns, $hidden ) = $this->get_column_info(); list( $columns, $hidden ) = $this->get_column_info();
foreach ( $columns as $column_name => $column_display_name ) { foreach ( $columns as $column_name => $column_display_name ) {
$style = '';
if ( in_array( $column_name, $hidden ) )
$style = ' style="display:none;"';
switch ( $column_name ) { switch ( $column_name ) {
case 'cb': ?> case 'cb': ?>
<th scope="row" class="check-column"> <th scope="row" class="check-column">
@ -208,15 +212,15 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
<?php <?php
break; break;
case 'id': ?> case 'id':?>
<th valign="top" scope="row"> <th valign="top" scope="row">
<?php echo $blog['blog_id'] ?> <?php echo $blog['blog_id'] ?>
</th> </th>
<?php <?php
break; break;
case 'blogname': ?> case 'blogname':
<td class="column-title"> echo "<td class='column-$column_name $column_name'$style>"; ?>
<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a> <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
<?php <?php
if ( 'list' != $mode ) if ( 'list' != $mode )
@ -262,9 +266,8 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
<?php <?php
break; break;
case 'lastupdated': ?> case 'lastupdated':
<td valign="top"> echo "<td valign='top'class='$column_name column-$column_name'$style>";
<?php
if ( 'list' == $mode ) if ( 'list' == $mode )
$date = 'Y/m/d'; $date = 'Y/m/d';
else else
@ -273,9 +276,8 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
</td> </td>
<?php <?php
break; break;
case 'registered': ?> case 'registered':
<td valign="top"> echo "<td valign='top'class='$column_name column-$column_name'$style>";
<?php
if ( $blog['registered'] == '0000-00-00 00:00:00' ) if ( $blog['registered'] == '0000-00-00 00:00:00' )
echo '&#x2014;'; echo '&#x2014;';
else else
@ -284,9 +286,8 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
</td> </td>
<?php <?php
break; break;
case 'users': ?> case 'users':
<td valign="top"> echo "<td valign='top'class='$column_name column-$column_name'$style>";
<?php
$blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) ); $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
if ( is_array( $blogusers ) ) { if ( is_array( $blogusers ) ) {
$blogusers_warning = ''; $blogusers_warning = '';
@ -316,13 +317,11 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
<?php } ?> <?php } ?>
<?php break; <?php break;
default: ?> default:
<?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?> echo "<td class='$column_name column-$column_name'$style>";
<td valign="top"> do_action( 'manage_themes_custom_column', $column_name, $theme_key, $theme );
<?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?> echo "</td>";
</td> break;
<?php } ?>
<?php break;
} }
} }
?> ?>