Ticket #18198: 18198.class-wp-theme-install-list-table.diff

Index: class-wp-theme-install-list-table.php
===================================================================
--- class-wp-theme-install-list-table.php       (revision 18670)
+++ class-wp-theme-install-list-table.php       (working copy)
@@ -22,7 +22,7 @@
 
                $paged = $this->get_pagenum();
 
-               $per_page = 30;
+               $per_page = 24;
 
                // These are the tabs which are shown on the page,
                $tabs = array();
@@ -130,7 +130,7 @@
 
                // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
-               <div class="tablenav top">
+               <div class="tablenav top themes">
                        <div class="alignleft actions">
                                <?php do_action( 'install_themes_table_header' ); ?>
                        </div>
@@ -139,13 +139,11 @@
                        <br class="clear" />
                </div>
 
-               <table id="availablethemes" cellspacing="0" cellpadding="0">
-                       <tbody id="the-list" class="list:themes">
-                               <?php $this->display_rows_or_placeholder(); ?>
-                       </tbody>
-               </table>
+               <div id="availablethemes">
+                       <?php $this->display_rows_or_placeholder(); ?>
+               </div>
 
-               <div class="tablenav bottom">
+               <div class="tablenav bottom themes">
                        <?php $this->pagination( 'bottom' ); ?>
                        <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
                        <br class="clear" />
@@ -155,30 +153,19 @@
 
        function display_rows() {
                $themes = $this->items;
-
-               $rows = ceil( count( $themes ) / 3 );
-               $table = array();
                $theme_keys = array_keys( $themes );
-               for ( $row = 1; $row <= $rows; $row++ )
-                       for ( $col = 1; $col <= 3; $col++ )
-                               $table[$row][$col] = array_shift( $theme_keys );
 
-               foreach ( $table as $row => $cols ) {
-                       echo "\t<tr>\n";
-                       foreach ( $cols as $col => $theme_index ) {
+               foreach ( $theme_keys as $theme_key ) {
                                $class = array( 'available-theme' );
-                               if ( $row == 1 ) $class[] = 'top';
-                               if ( $col == 1 ) $class[] = 'left';
-                               if ( $row == $rows ) $class[] = 'bottom';
-                               if ( $col == 3 ) $class[] = 'right';
                                ?>
-                               <td class="<?php echo join( ' ', $class ); ?>"><?php
-                                       if ( isset( $themes[$theme_index] ) )
-                                               display_theme( $themes[$theme_index] );
-                               ?></td>
-                       <?php } // end foreach $cols
-                       echo "\t</tr>\n";
-               } // end foreach $table
+                               <div class="<?php echo join( ' ', $class ); ?>"><?php
+                                       if ( isset( $themes[$theme_key] ) )
+                                               display_theme( $themes[$theme_key] );
+                               ?></div>
+               <?php } // end foreach $theme_keys
+?>
+               <br class="clear" />
+<?php
        }
 }
Index: class-wp-themes-list-table.php
===================================================================
--- class-wp-themes-list-table.php      (revision 18670)
+++ class-wp-themes-list-table.php      (working copy)
@@ -47,7 +47,7 @@
                unset( $themes[$ct->name] );
                uksort( $themes, "strnatcasecmp" );
 
-               $per_page = 15;
+               $per_page = 24;
                $page = $this->get_pagenum();
 
                $start = ( $page - 1 ) * $per_page;
@@ -92,7 +92,7 @@
                if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
                        return;
                ?>
-               <div class="tablenav <?php echo $which; ?>">
+               <div class="tablenav themes <?php echo $which; ?>">
                        <?php $this->pagination( $which ); ?>
                   <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
                  <br class="clear" />
@@ -105,11 +105,9 @@
 ?>
                <?php $this->tablenav( 'top' ); ?>
 
-               <table id="availablethemes" cellspacing="0" cellpadding="0">
-                       <tbody id="the-list" class="list:themes">
-                               <?php $this->display_rows_or_placeholder(); ?>
-                       </tbody>
-               </table>
+               <div id="availablethemes">
+                       <?php $this->display_rows_or_placeholder(); ?>
+               </div>
 
                <?php $this->tablenav( 'bottom' ); ?>
 <?php
@@ -120,29 +118,15 @@
        }
 
        function display_rows() {
-               $themes = $this->items;
+               $themes = $this->items;         
                $theme_names = array_keys( $themes );
                natcasesort( $theme_names );
 
-               $table = array();
-               $rows = ceil( count( $theme_names ) / 3 );
-               for ( $row = 1; $row <= $rows; $row++ )
-                       for ( $col = 1; $col <= 3; $col++ )
-                               $table[$row][$col] = array_shift( $theme_names );
-
-               foreach ( $table as $row => $cols ) {
-?>
-<tr>
-<?php
-foreach ( $cols as $col => $theme_name ) {
-       $class = array( 'available-theme' );
-       if ( $row == 1 ) $class[] = 'top';
-       if ( $col == 1 ) $class[] = 'left';
-       if ( $row == $rows ) $class[] = 'bottom';
-       if ( $col == 3 ) $class[] = 'right';
-?>
-       <td class="<?php echo join( ' ', $class ); ?>">
-<?php if ( !empty( $theme_name ) ) :
+       foreach ( $theme_names as $theme_name ) {
+               $class = array( 'available-theme' );
+       ?>
+       <div class="<?php echo join( ' ', $class ); ?>">
+       <?php if ( !empty( $theme_name ) ) :
        $template = $themes[$theme_name]['Template'];
        $stylesheet = $themes[$theme_name]['Stylesheet'];
        $title = $themes[$theme_name]['Title'];
@@ -194,10 +178,10 @@
 <?php endif; ?>
                <?php theme_update_available( $themes[$theme_name] ); ?>
 <?php endif; // end if not empty theme_name ?>
-       </td>
-<?php } // end foreach $cols ?>
-</tr>
-<?php } // end foreach $table
+       </div>
+<?php } // end foreach $theme_names ?>
+<br class="clear" />
+<?php
        }
 
        function search_theme( $theme ) {
@@ -237,4 +221,4 @@
        }
 }
 
-?>
+?>
\ No newline at end of file