Ticket #16196: 16196.2.diff

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

@@ -140 +140 @@
 
                 <table id="availablethemes" cellspacing="0" cellpadding="0">
                         <tbody id="the-list" class="list:themes">
-                                <?php $this->display_rows(); ?>
+                                <?php $this->display_rows_or_placeholder(); ?>
                         </tbody>
                 </table>
 

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

@@ -61 +61 @@
         }
 
         function no_items() {
+                if( $this->search || $this->features ) {
+                        _e( 'No items found.' );
+                        return;
+                }
+                
                 if ( is_multisite() ) {
                         if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
                                 printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
@@ -82 +87 @@
                 // Fallthrough.
                 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 tablenav( $which = 'top' ) { 
+                if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
+                        return;
+                ?> 
+                <div class="tablenav <?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" /> 
+                </div> 
+                <?php 
+        }
 
         function display() {
-
                 wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
-                <div class="tablenav top">
-                        <?php $this->pagination( 'top' ); ?>
-                        <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
-                        <br class="clear" />
-                </div>
+                <?php $this->tablenav( 'top' ); ?> 
 
                 <table id="availablethemes" cellspacing="0" cellpadding="0">
                         <tbody id="the-list" class="list:themes">
-                                <?php $this->display_rows(); ?>
+                                <?php $this->display_rows_or_placeholder(); ?>
                         </tbody>
                 </table>
 
-                <div class="tablenav bottom">
-                        <?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" />
-                </div>
+                <?php $this->tablenav( 'bottom' ); ?> 
 <?php
         }
 

wp-admin/css/wp-admin.dev.css

@@ -3580 +3580 @@
   16.0 - Themes
 ------------------------------------------------------------------------------*/
 
+.theme-install-php .tablenav { 
+        height:auto; 
+} 
+
 table#availablethemes {
         border-spacing: 0;
         border-width: 1px 0;
@@ -3588 +3592 @@
         width: 100%;
 }
 
+table#availablethemes .no-items td{ 
+        border-width:0; 
+        padding:5px; 
+} 
+
 td.available-theme {
         vertical-align: top;
         width: 240px;