WordPress 4.1-scripts

[autoinstalls/wordpress.git] / wp-admin / themes.php

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index bb84ca114361fa4c69c028524d4378b2aec958a9..bf265b8f60c8d6d2cb2c92e04f5a8e4dbf72793c 100644 (file)
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -7,251 +7,403 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') )
 
 if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') )

-       wp_die( __( 'Cheatin’ uh?' ) );
-
-$wp_list_table = _get_list_table('WP_Themes_List_Table');
+       wp_die( __( 'Cheatin’ uh?' ), 403 );

 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
        if ( 'activate' == $_GET['action'] ) {
 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
        if ( 'activate' == $_GET['action'] ) {

-               check_admin_referer('switch-theme_' . $_GET['template']);
-               switch_theme($_GET['template'], $_GET['stylesheet']);
+               check_admin_referer('switch-theme_' . $_GET['stylesheet']);
+               $theme = wp_get_theme( $_GET['stylesheet'] );
+               if ( ! $theme->exists() || ! $theme->is_allowed() )
+                       wp_die( __( 'Cheatin’ uh?' ), 403 );
+               switch_theme( $theme->get_stylesheet() );

                wp_redirect( admin_url('themes.php?activated=true') );
                exit;
        } elseif ( 'delete' == $_GET['action'] ) {
                wp_redirect( admin_url('themes.php?activated=true') );
                exit;
        } elseif ( 'delete' == $_GET['action'] ) {

-               check_admin_referer('delete-theme_' . $_GET['template']);
-               if ( !current_user_can('delete_themes') )
-                       wp_die( __( 'Cheatin’ uh?' ) );
-               delete_theme($_GET['template']);
-               wp_redirect( admin_url('themes.php?deleted=true') );
+               check_admin_referer('delete-theme_' . $_GET['stylesheet']);
+               $theme = wp_get_theme( $_GET['stylesheet'] );
+               if ( !current_user_can('delete_themes') || ! $theme->exists() )
+                       wp_die( __( 'Cheatin’ uh?' ), 403 );
+               $active = wp_get_theme();
+               if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) {
+                       wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) );
+               } else {
+                       delete_theme( $_GET['stylesheet'] );
+                       wp_redirect( admin_url( 'themes.php?deleted=true' ) );
+               }

                exit;
        }
 }
 
                exit;
        }
 }
 

-$wp_list_table->prepare_items();
-

 $title = __('Manage Themes');
 $parent_file = 'themes.php';
 
 $title = __('Manage Themes');
 $parent_file = 'themes.php';
 

-if ( current_user_can( 'switch_themes' ) ) :
+// Help tab: Overview
+if ( current_user_can( 'switch_themes' ) ) {
+       $help_overview  = '<p>' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
+               '<p>' . __( 'From this screen you can:' ) . '</p>' .
+               '<ul><li>' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '</li>' .
+               '<li>' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '</li>' .
+               '<li>' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '</li></ul>' .
+               '<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>';

 
 

-$help_manage = '<p>' . __('Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.') . '</p>' .
-       '<p>' . __('You can see your active theme at the top of the screen. Below are the other themes you have installed that are not currently in use. You can see what your site would look like with one of these themes by clicking the Preview link. To change themes, click the Activate link.') . '</p>';
-
-get_current_screen()->add_help_tab( array(
-       'id'      => 'overview',
-       'title'   => __('Overview'),
-       'content' => $help_manage,
-) );
+       get_current_screen()->add_help_tab( array(
+               'id'      => 'overview',
+               'title'   => __( 'Overview' ),
+               'content' => $help_overview
+       ) );
+} // switch_themes

 
 

+// Help tab: Adding Themes

 if ( current_user_can( 'install_themes' ) ) {
        if ( is_multisite() ) {
                $help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
        } else {
 if ( current_user_can( 'install_themes' ) ) {
        if ( is_multisite() ) {
                $help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
        } else {

-               $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/' ) . '</p>';
+               $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'https://wordpress.org/themes/' ) . '</p>';

        }
 
        get_current_screen()->add_help_tab( array(
                'id'      => 'adding-themes',
                'title'   => __('Adding Themes'),
        }
 
        get_current_screen()->add_help_tab( array(
                'id'      => 'adding-themes',
                'title'   => __('Adding Themes'),

-               'content' => $help_install,
+               'content' => $help_install

        ) );
        ) );

-}
+} // install_themes
+
+// Help tab: Previewing and Customizing
+if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+       $help_customize =
+               '<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
+               '<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button above the menu.' ) . '</p>' .
+               '<p>' . __( 'When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again.' ) . '</p>';
+
+       get_current_screen()->add_help_tab( array(
+               'id'            => 'customize-preview-themes',
+               'title'         => __( 'Previewing and Customizing' ),
+               'content'       => $help_customize
+       ) );
+} // edit_theme_options && customize

 
 get_current_screen()->set_help_sidebar(
 
 get_current_screen()->set_help_sidebar(

-       '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+       '<p>' . __( '<a href="http://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>' ) . '</p>' .
+       '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'

 );
 
 );
 

+if ( current_user_can( 'switch_themes' ) ) {
+       $themes = wp_prepare_themes_for_js();
+} else {
+       $themes = wp_prepare_themes_for_js( array( wp_get_theme() ) );
+}
+wp_reset_vars( array( 'theme', 'search' ) );
+
+wp_localize_script( 'theme', '_wpThemeSettings', array(
+       'themes'   => $themes,
+       'settings' => array(
+               'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
+               'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
+               'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
+               'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
+       ),
+       'l10n' => array(
+               'addNew' => __( 'Add New Theme' ),
+               'search'  => __( 'Search Installed Themes' ),
+               'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
+       ),
+) );
+

 add_thickbox();
 add_thickbox();

-wp_enqueue_script( 'theme-preview' );

 wp_enqueue_script( 'theme' );
 wp_enqueue_script( 'theme' );

+wp_enqueue_script( 'customize-loader' );

 
 

-endif;
-
-require_once('./admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );

 ?>
 
 ?>
 

-<?php if ( ! validate_current_theme() ) : ?>
-<div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
+<div class="wrap">
+       <h2><?php esc_html_e( 'Themes' ); ?>
+               <span class="title-count theme-count"><?php echo count( $themes ); ?></span>
+       <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
+               <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
+       <?php endif; ?>
+       </h2>
+<?php
+if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
+<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>

 <?php elseif ( isset($_GET['activated']) ) :
 <?php elseif ( isset($_GET['activated']) ) :

-               if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?>
-<div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php
-               } else { ?>
+               if ( isset( $_GET['previewed'] ) ) { ?>
+               <div id="message2" class="updated"><p><?php printf( __( 'Settings saved and theme activated. <a href="%s">Visit site</a>' ), home_url( '/' ) ); ?></p></div>
+               <?php } else { ?>

 <div id="message2" class="updated"><p><?php printf( __( 'New theme activated. <a href="%s">Visit site</a>' ), home_url( '/' ) ); ?></p></div><?php
                }
        elseif ( isset($_GET['deleted']) ) : ?>
 <div id="message3" class="updated"><p><?php _e('Theme deleted.') ?></p></div>
 <div id="message2" class="updated"><p><?php printf( __( 'New theme activated. <a href="%s">Visit site</a>' ), home_url( '/' ) ); ?></p></div><?php
                }
        elseif ( isset($_GET['deleted']) ) : ?>
 <div id="message3" class="updated"><p><?php _e('Theme deleted.') ?></p></div>

-<?php endif; ?>
-
-<div class="wrap"><?php
-screen_icon();
-if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-<h2 class="nav-tab-wrapper">
-<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
-<?php else : ?>
-<h2><?php echo esc_html( $title ); ?>
-<?php endif; ?>
-</h2>
-
-<h3><?php _e('Current Theme'); ?></h3>
-<div id="current-theme">
-<?php if ( $ct->screenshot ) : ?>
-<img src="<?php echo $ct->theme_root_uri . '/' . $ct->stylesheet . '/' . $ct->screenshot; ?>" alt="<?php esc_attr_e('Current theme preview'); ?>" />
-<?php endif; ?>
-<h4><?php
-       /* translators: 1: theme title, 2: theme version, 3: theme author */
-       printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4>
-<p class="theme-description"><?php echo $ct->description; ?></p>
-<div class="theme-options">
-       <span><?php _e( 'Options:' )?></span>
-       <?php
+<?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
+       <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
+<?php
+endif;
+
+$ct = wp_get_theme();
+
+if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
+       echo '<div class="error"><p>' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '</p></div>';
+}
+
+/*
+// Certain error codes are less fatal than others. We can still display theme information in most cases.
+if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
+       && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?>
+*/
+

        // Pretend you didn't see this.
        // Pretend you didn't see this.

-       $options = array();
+       $current_theme_actions = array();

        if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
                foreach ( (array) $submenu['themes.php'] as $item) {
                        $class = '';
        if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
                foreach ( (array) $submenu['themes.php'] as $item) {
                        $class = '';

-                       if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] )
+                       if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) )

                                continue;
                        // 0 = name, 1 = capability, 2 = file
                                continue;
                        // 0 = name, 1 = capability, 2 = file

-                       if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) $class = ' class="current"';
-
+                       if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
+                               $class = ' current';

                        if ( !empty($submenu[$item[2]]) ) {
                        if ( !empty($submenu[$item[2]]) ) {

-                               $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
+                               $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.

                                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
                                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
                                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
                                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))

-                                       $options[] = "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
+                                       $current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";

                                else
                                else

-                                       $options[] = "<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-                       } else if ( current_user_can($item[1]) ) {
-                               if ( file_exists(ABSPATH . 'wp-admin/' . $item[2]) ) {
-                                       $options[] = "<a href='{$item[2]}'$class>{$item[0]}</a>";
+                                       $current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+                       } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+                               $menu_file = $item[2];
+
+                               if ( current_user_can( 'customize' ) ) {
+                                       if ( 'custom-header' === $menu_file ) {
+                                               $current_theme_actions[] = "<a class='button button-secondary hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
+                                       } elseif ( 'custom-background' === $menu_file ) {
+                                               $current_theme_actions[] = "<a class='button button-secondary hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
+                                       }
+                               }
+
+                               if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+                                       $menu_file = substr( $menu_file, 0, $pos );
+                               }
+
+                               if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
+                                       $current_theme_actions[] = "<a class='button button-secondary$class' href='{$item[2]}'>{$item[0]}</a>";

                                } else {
                                } else {

-                                       $options[] = "<a href='themes.php?page={$item[2]}'$class>{$item[0]}</a>";
+                                       $current_theme_actions[] = "<a class='button button-secondary$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";

                                }
                        }
                }
        }
                                }
                        }
                }
        }

-       echo implode ( ' | ', $options );
-
-       if ( $ct->tags ) : ?>
-       <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
-       <?php endif; ?>
-</div>
-<?php theme_update_available($ct); ?>

 
 

-</div>
-
-<br class="clear" />
-<?php
-if ( ! current_user_can( 'switch_themes' ) ) {
-       echo '</div>';
-       require( './admin-footer.php' );
-       exit;
-}

 ?>
 
 ?>
 

-<h3><?php _e('Available Themes'); ?></h3>
+<div class="theme-browser">
+       <div class="themes">

 
 

-<?php if ( !empty( $_REQUEST['s'] ) || !empty( $_REQUEST['filter'] ) || $wp_list_table->has_items() ) : ?>
-
-<form class="search-form filter-form" action="" method="get">
-
-<p class="search-box">
-       <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Installed Themes'); ?>:</label>
-       <input type="text" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-       <?php submit_button( __( 'Search Installed Themes' ), 'button', false, false, array( 'id' => 'search-submit' ) ); ?>
-       <a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
-</p>
-
-<br class="clear"/>
+<?php
+/*
+ * This PHP is synchronized with the tmpl-theme template below!
+ */

 
 

-<div id="filter-box" style="<?php if ( empty($_REQUEST['filter']) ) echo 'display: none;'; ?>">
-<?php $feature_list = get_theme_feature_list(); ?>
-       <div class="feature-filter">
-               <p class="install-help"><?php _e('Theme filters') ?></p>
-       <?php if ( !empty( $_REQUEST['filter'] ) ) : ?>
-               <input type="hidden" name="filter" value="1" />
-       <?php endif; ?>
-       <?php foreach ( $feature_list as $feature_name => $features ) :
-                       $feature_name = esc_html( $feature_name ); ?>
-
-               <div class="feature-container">
-                       <div class="feature-name"><?php echo $feature_name ?></div>
-
-                       <ol class="feature-group">
-                               <?php foreach ( $features as $key => $feature ) :
-                                               $feature_name = $feature;
-                                               $feature_name = esc_html( $feature_name );
-                                               $feature = esc_attr( $feature );
-                                               ?>
-                               <li>
-                                       <input type="checkbox" name="features[]" id="feature-id-<?php echo $key; ?>" value="<?php echo $key; ?>" <?php checked( in_array( $key, $wp_list_table->features ) ); ?>/>
-                                       <label for="feature-id-<?php echo $key; ?>"><?php echo $feature_name; ?></label>
-                               </li>
-                               <?php endforeach; ?>
-                       </ol>
+foreach ( $themes as $theme ) :
+       $aria_action = esc_attr( $theme['id'] . '-action' );
+       $aria_name   = esc_attr( $theme['id'] . '-name' );
+       ?>
+<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
+       <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
+               <div class="theme-screenshot">
+                       <img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />

                </div>
                </div>

-       <?php endforeach; ?>
+       <?php } else { ?>
+               <div class="theme-screenshot blank"></div>
+       <?php } ?>
+       <span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
+       <div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
+
+       <?php if ( $theme['active'] ) { ?>
+               <h3 class="theme-name" id="<?php echo $aria_name; ?>"><span><?php _ex( 'Active:', 'theme' ); ?></span> <?php echo $theme['name']; ?></h3>
+       <?php } else { ?>
+               <h3 class="theme-name" id="<?php echo $aria_name; ?>"><?php echo $theme['name']; ?></h3>
+       <?php } ?>
+
+       <div class="theme-actions">
+
+       <?php if ( $theme['active'] ) { ?>
+               <?php if ( $theme['actions']['customize'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
+                       <a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a>
+               <?php } ?>
+       <?php } else { ?>
+               <a class="button button-secondary activate" href="<?php echo $theme['actions']['activate']; ?>"><?php _e( 'Activate' ); ?></a>
+               <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
+                       <a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
+                       <a class="button button-secondary hide-if-customize" href="<?php echo $theme['actions']['preview']; ?>"><?php _e( 'Preview' ); ?></a>
+               <?php } ?>
+       <?php } ?>

 
 

-       <div class="feature-container">
-               <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'style' => 'margin-left: 120px', 'id' => 'filter-submit' ) ); ?>
-               &nbsp;
-               <small><a id="mini-filter-click" href="<?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?>"><?php _e( 'Close filters' )?></a></small>

        </div>
        </div>

-       <br/>
+
+       <?php if ( $theme['hasUpdate'] ) { ?>
+               <div class="theme-update"><?php _e( 'Update Available' ); ?></div>
+       <?php } ?>
+</div>
+<?php endforeach; ?>
+       <br class="clear" />

        </div>
        </div>

-       <br class="clear"/>

 </div>
 </div>

+<div class="theme-overlay"></div>

 
 

-<br class="clear" />
-
-<?php endif; ?>
-
-<?php $wp_list_table->display(); ?>
-
-</form>
-<br class="clear" />
+<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>

 
 <?php
 // List broken themes, if any.
 
 <?php
 // List broken themes, if any.

-$broken_themes = get_broken_themes();
-if ( current_user_can('edit_themes') && count( $broken_themes ) ) {
+if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {

 ?>
 
 ?>
 

+<div class="broken-themes">

 <h3><?php _e('Broken Themes'); ?></h3>
 <p><?php _e('The following themes are installed but incomplete. Themes must have a stylesheet and a template.'); ?></p>
 
 <h3><?php _e('Broken Themes'); ?></h3>
 <p><?php _e('The following themes are installed but incomplete. Themes must have a stylesheet and a template.'); ?></p>
 

-<table id="broken-themes">
+<?php
+$can_delete = current_user_can( 'delete_themes' );
+?>
+<table>

        <tr>
                <th><?php _ex('Name', 'theme name'); ?></th>
                <th><?php _e('Description'); ?></th>
        <tr>
                <th><?php _ex('Name', 'theme name'); ?></th>
                <th><?php _e('Description'); ?></th>

+               <?php if ( $can_delete ) { ?>
+                       <th></th>
+               <?php } ?>
+               </tr>

        </tr>
        </tr>

-<?php
-       $theme = '';
-
-       $theme_names = array_keys($broken_themes);
-       natcasesort($theme_names);
-
-       foreach ($theme_names as $theme_name) {
-               $title = $broken_themes[$theme_name]['Title'];
-               $description = $broken_themes[$theme_name]['Description'];
-
-               $theme = ('class="alternate"' == $theme) ? '' : 'class="alternate"';
-               echo "
-               <tr $theme>
-                        <td>$title</td>
-                        <td>$description</td>
-               </tr>";
-       }
-?>
+       <?php foreach ( $broken_themes as $broken_theme ) : ?>
+               <tr>
+                       <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?></td>
+                       <td><?php echo $broken_theme->errors()->get_error_message(); ?></td>
+                       <?php
+                       if ( $can_delete ) {
+                               $stylesheet = $broken_theme->get_stylesheet();
+                               $delete_url = add_query_arg( array(
+                                       'action'     => 'delete',
+                                       'stylesheet' => urlencode( $stylesheet ),
+                               ), admin_url( 'themes.php' ) );
+                               $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
+                               ?>
+                               <td><a href="<?php echo esc_url( $delete_url ); ?>" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a></td>
+                               <?php
+                       }
+                       ?>
+               </tr>
+       <?php endforeach; ?>

 </table>
 </table>

+</div>
+

 <?php
 }
 ?>
 <?php
 }
 ?>

-</div>
+</div><!-- .wrap -->
+
+<?php
+/*
+ * The tmpl-theme template is synchronized with PHP above!
+ */
+?>
+<script id="tmpl-theme" type="text/template">
+       <# if ( data.screenshot[0] ) { #>
+               <div class="theme-screenshot">
+                       <img src="{{ data.screenshot[0] }}" alt="" />
+               </div>
+       <# } else { #>
+               <div class="theme-screenshot blank"></div>
+       <# } #>
+       <span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
+       <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
+
+       <# if ( data.active ) { #>
+               <h3 class="theme-name" id="{{ data.id }}-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
+       <# } else { #>
+               <h3 class="theme-name" id="{{ data.id }}-name">{{{ data.name }}}</h3>
+       <# } #>
+
+       <div class="theme-actions">
+
+       <# if ( data.active ) { #>
+               <# if ( data.actions.customize ) { #>
+                       <a class="button button-primary customize load-customize hide-if-no-customize" href="{{ data.actions.customize }}"><?php _e( 'Customize' ); ?></a>
+               <# } #>
+       <# } else { #>
+               <a class="button button-secondary activate" href="{{{ data.actions.activate }}}"><?php _e( 'Activate' ); ?></a>
+               <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
+               <a class="button button-secondary hide-if-customize" href="{{{ data.actions.preview }}}"><?php _e( 'Preview' ); ?></a>
+       <# } #>
+
+       </div>
+
+       <# if ( data.hasUpdate ) { #>
+               <div class="theme-update"><?php _e( 'Update Available' ); ?></div>
+       <# } #>
+</script>
+
+<script id="tmpl-theme-single" type="text/template">
+       <div class="theme-backdrop"></div>
+       <div class="theme-wrap">
+               <div class="theme-header">
+                       <button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
+                       <button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
+                       <button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close overlay' ); ?></span></button>
+               </div>
+               <div class="theme-about">
+                       <div class="theme-screenshots">
+                       <# if ( data.screenshot[0] ) { #>
+                               <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
+                       <# } else { #>
+                               <div class="screenshot blank"></div>
+                       <# } #>
+                       </div>
+
+                       <div class="theme-info">
+                               <# if ( data.active ) { #>
+                                       <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+                               <# } #>
+                               <h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{{ data.version }}}' ); ?></span></h3>
+                               <h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h4>
+
+                               <# if ( data.hasUpdate ) { #>
+                               <div class="theme-update-message">
+                                       <h4 class="theme-update"><?php _e( 'Update Available' ); ?></h4>
+                                       {{{ data.update }}}
+                               </div>
+                               <# } #>
+                               <p class="theme-description">{{{ data.description }}}</p>
+
+                               <# if ( data.parent ) { #>
+                                       <p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
+                               <# } #>
+
+                               <# if ( data.tags ) { #>
+                                       <p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
+                               <# } #>
+                       </div>
+               </div>
+
+               <div class="theme-actions">
+                       <div class="active-theme">
+                               <a href="{{{ data.actions.customize }}}" class="button button-primary customize load-customize hide-if-no-customize"><?php _e( 'Customize' ); ?></a>
+                               <?php echo implode( ' ', $current_theme_actions ); ?>
+                       </div>
+                       <div class="inactive-theme">
+                               <# if ( data.actions.activate ) { #>
+                                       <a href="{{{ data.actions.activate }}}" class="button button-secondary activate"><?php _e( 'Activate' ); ?></a>
+                               <# } #>
+                               <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
+                               <a href="{{{ data.actions.preview }}}" class="button button-secondary hide-if-customize"><?php _e( 'Preview' ); ?></a>
+                       </div>
+
+                       <# if ( ! data.active && data.actions['delete'] ) { #>
+                               <a href="{{{ data.actions['delete'] }}}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
+                       <# } #>
+               </div>
+       </div>
+</script>

 
 

-<?php require('./admin-footer.php'); ?>
+<?php require( ABSPATH . 'wp-admin/admin-footer.php' );