Ticket #15318: colspan_magic.patch

wp-admin/includes/class-wp-posts-list-table.php

@@ -720 +720 @@
 
                 <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
                         echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-$screen->post_type" : "quick-edit-row quick-edit-row-$hclass inline-edit-$screen->post_type";
-                ?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
+                ?>" style="display: none"><td colspan="<?php echo $col_count; ?>" class="colspanchange">
 
                 <fieldset class="inline-edit-col-left"><div class="inline-edit-col">
                         <h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>

wp-admin/includes/class-wp-terms-list-table.php

@@ -315 +315 @@
                 ?>
 
         <form method="get" action=""><table style="display: none"><tbody id="inlineedit">
-                <tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>">
+                <tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>" class="colspanchange">
 
                         <fieldset><div class="inline-edit-col">
                                 <h4><?php _e( 'Quick Edit' ); ?></h4>

wp-admin/includes/update.php

@@ -192 +192 @@
 
         $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800');
 
+        $wp_list_table = get_list_table('WP_Plugins_List_Table');
+        list ( $columns, $hidden ) = $wp_list_table->get_column_info();
+        $hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
+        $col_count = count($columns) - count($hidden);
+
         if ( is_network_admin() || !is_multisite() ) {
-                echo '<tr class="plugin-update-tr"><td colspan="3" class="plugin-update"><div class="update-message">';
+                echo '<tr class="plugin-update-tr"><td colspan="' . $col_count . '" class="plugin-update colspanchange"><div class="update-message">';
                 if ( ! current_user_can('update_plugins') )
                         printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
                 else if ( empty($r->package) )
@@ -266 +271 @@
 
         $details_url = self_admin_url("theme-install.php?tab=theme-information&theme=$theme_key&TB_iframe=true&width=600&height=400");
 
-        echo '<tr class="plugin-update-tr"><td colspan="3" class="plugin-update"><div class="update-message">';
+        $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
+        list ( $columns, $hidden ) = $wp_list_table->get_column_info();
+        $hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
+        $col_count = count($columns) - count($hidden);
+
+        echo '<tr class="plugin-update-tr"><td colspan="' . $col_count . '" class="plugin-update colspanchange"><div class="update-message">';
         if ( ! current_user_can('update_themes') )
                 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
         else if ( empty( $r['package'] ) )

wp-admin/includes/template.php

@@ -338 +338 @@
 ?>
 <form method="get" action="">
 <?php if ( $table_row ) : ?>
-<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $col_count; ?>">
+<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $col_count; ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>

wp-admin/js/common.dev.js

@@ -147 +147 @@
 
         checked : function(column) {
                 $('.column-' + column).show();
+                this.colSpanChange(+1);
         },
 
         unchecked : function(column) {
                 $('.column-' + column).hide();
+                this.colSpanChange(-1);
         },
 
         hidden : function() {
@@ -164 +166 @@
                                 return id.substring( id, id.length - 5 );
                         }).get().join(',');
                 };
+        },
+        
+        colSpanChange : function(diff) {
+                var $t = $('table').find('.colspanchange');
+                if ( !$t.length )
+                        return;
+                var n = parseInt( $t.attr('colspan'), 10 ) + diff;
+                $t.attr('colspan', n.toString());
         }
 }