Ticket #15849: placeholder.15849.diff

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

@@ -647 +647 @@
         }
 
         /**
-         * Display the table or a message if there are no items
+         * Display the table
          *
          * @since 3.1.0
          * @access public
          */
         function display() {
-                if ( $this->has_items() ) {
-                        $this->display_table();
-                } else {
-?>
-                <br class="clear" />
-                <p><?php $this->no_items(); ?></p>
-<?php
-                }
-        }
-
-        /**
-         * Get a list of CSS classes for the <table> tag
-         *
-         * @since 3.1.0
-         * @access protected
-         *
-         * @return array
-         */
-        function get_table_classes() {
-                return array( 'widefat', 'fixed', $this->_args['plural'] );
-        }
-
-        /**
-         * Display the full table
-         *
-         * @since 3.1.0
-         * @access public
-         */
-        function display_table() {
                 extract( $this->_args );
 
                 $this->display_tablenav( 'top' );
@@ -701 +672 @@
         </tfoot>
 
         <tbody id="the-list"<?php if ( $singular ) echo " class='list:$singular'"; ?>>
-                <?php $this->display_rows(); ?>
+                <?php $this->display_rows_or_placeholder(); ?>
         </tbody>
 </table>
 <?php
-
                 $this->display_tablenav( 'bottom' );
         }
 
         /**
+         * Get a list of CSS classes for the <table> tag
+         *
+         * @since 3.1.0
+         * @access protected
+         *
+         * @return array
+         */
+        function get_table_classes() {
+                return array( 'widefat', 'fixed', $this->_args['plural'] );
+        }
+
+        /**
          * Generate the table navigation above or below the table
          *
          * @since 3.1.0
@@ -749 +731 @@
          * @since 3.1.0
          * @access protected
          */
+        function display_rows_or_placeholder() {
+                if ( $this->has_items() ) {
+                        $this->display_rows();
+                } else {
+                        echo '<tr class="no-items"><td colspan="2">';
+                        $this->no_items();
+                        echo '</td></tr>';
+                }
+        }
+
+        /**
+         * Generate the table rows
+         *
+         * @since 3.1.0
+         * @access protected
+         */
         function display_rows() {
                 foreach ( $this->items as $item )
                         $this->single_row( $item );
@@ -823 +821 @@
                 extract( $this->_pagination_args );
 
                 ob_start();
-                $this->display_rows();
+                $this->display_rows_or_placeholder();
                 $rows = ob_get_clean();
 
                 $response = array( 'rows' => $rows );

wp-admin/includes/class-wp-theme-install-list-table.php

@@ -126 +126 @@
                 return array();
         }
 
-        function display_table() {
+        function display() {
 ?>
                 <div class="tablenav">
                         <div class="alignleft actions">

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

@@ -83 +83 @@
                 printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
         }
 
-        function display_table() {
+        function display() {
 ?>
                 <div class="tablenav">
                         <?php $this->pagination( 'top' ); ?>

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

@@ -254 +254 @@
                 );
         }
 
-        function display_table() {
+        function display() {
                 extract( $this->_args );
 
                 $this->display_tablenav( 'top' );

wp-admin/edit-tags.php

@@ -241 +241 @@
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 
-<?php $wp_list_table->display_table(); ?>
+<?php $wp_list_table->display(); ?>
 
 <br class="clear" />
 </form>

wp-admin/css/global.dev.css

@@ -425 +425 @@
         font-size: 11px;
 }
 
+.widefat .no-items td {
+        border-bottom-width: 0;
+}
+
 .widefat td {
         padding: 3px 7px;
         vertical-align: top;