WordPress 4.7.2

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

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 435abfe415d6f14d3bdb66bd808e875e3bd98a62..6aa129d7653a90d7edb072b2c4394899102b62c8 100644 (file)
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -9,25 +9,57 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

-if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') )
-       wp_die( __( 'Cheatin’ uh?' ) );
+if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
+       wp_die(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+               403
+       );
+}

 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
        if ( 'activate' == $_GET['action'] ) {
                check_admin_referer('switch-theme_' . $_GET['stylesheet']);
                $theme = wp_get_theme( $_GET['stylesheet'] );
 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
        if ( 'activate' == $_GET['action'] ) {
                check_admin_referer('switch-theme_' . $_GET['stylesheet']);
                $theme = wp_get_theme( $_GET['stylesheet'] );

-               if ( ! $theme->exists() || ! $theme->is_allowed() )
-                       wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+               if ( ! $theme->exists() || ! $theme->is_allowed() ) {
+                       wp_die(
+                               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                               '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+                               403
+                       );
+               }
+

                switch_theme( $theme->get_stylesheet() );
                wp_redirect( admin_url('themes.php?activated=true') );
                exit;
        } elseif ( 'delete' == $_GET['action'] ) {
                check_admin_referer('delete-theme_' . $_GET['stylesheet']);
                $theme = wp_get_theme( $_GET['stylesheet'] );
                switch_theme( $theme->get_stylesheet() );
                wp_redirect( admin_url('themes.php?activated=true') );
                exit;
        } elseif ( 'delete' == $_GET['action'] ) {
                check_admin_referer('delete-theme_' . $_GET['stylesheet']);
                $theme = wp_get_theme( $_GET['stylesheet'] );

-               if ( !current_user_can('delete_themes') || ! $theme->exists() )
-                       wp_die( __( 'Cheatin&#8217; uh?' ) );
-               delete_theme($_GET['stylesheet']);
-               wp_redirect( admin_url('themes.php?deleted=true') );
+
+               if ( ! current_user_can( 'delete_themes' ) ) {
+                       wp_die(
+                               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                               '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+                               403
+                       );
+               }
+
+               if ( ! $theme->exists() ) {
+                       wp_die(
+                               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                               '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+                               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;
        }
 }


@@ -42,7 +74,8 @@ if ( current_user_can( 'switch_themes' ) ) {
                '<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>' .
                '<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>';
+               '<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>' .
+               '<p>' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>';

 
        get_current_screen()->add_help_tab( array(
                'id'      => 'overview',
 
        get_current_screen()->add_help_tab( array(
                'id'      => 'overview',


@@ -56,7 +89,7 @@ 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 ( 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;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!'), 'http://wordpress.org/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">WordPress Theme Directory</a>. Themes in the WordPress 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(
        }
 
        get_current_screen()->add_help_tab( array(


@@ -67,7 +100,7 @@ if ( current_user_can( 'install_themes' ) ) {
 } // install_themes
 
 // Help tab: Previewing and Customizing
 } // install_themes
 
 // Help tab: Previewing and Customizing

-if ( current_user_can( 'edit_theme_options' ) ) {
+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>' .
        $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>' .


@@ -78,12 +111,12 @@ if ( current_user_can( 'edit_theme_options' ) ) {
                'title'         => __( 'Previewing and Customizing' ),
                'content'       => $help_customize
        ) );
                'title'         => __( 'Previewing and Customizing' ),
                'content'       => $help_customize
        ) );

-} // edit_theme_options
+} // edit_theme_options && customize

 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 
 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>' . __( '<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>' ) . '</p>' .
+       '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'

 );
 
 if ( current_user_can( 'switch_themes' ) ) {
 );
 
 if ( current_user_can( 'switch_themes' ) ) {


@@ -99,50 +132,52 @@ wp_localize_script( 'theme', '_wpThemeSettings', 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." ),
                '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." ),

-               'root'          => parse_url( admin_url( 'themes.php' ), PHP_URL_PATH ),
-               'theme'         => esc_html( $theme ),
-               'search'        => esc_html( $search ),
-
+               'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),

        ),
        'l10n' => array(
        ),
        'l10n' => array(

-               'addNew' => __( 'Add New Theme' ),
-               'search'  => __( 'Search Installed Themes' ),
-               'searchPlaceholder' => __( 'Search installed themes...' ),
+               'addNew'            => __( 'Add New Theme' ),
+               'search'            => __( 'Search Installed Themes' ),
+               'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
+               'themesFound'       => __( 'Number of Themes found: %d' ),
+               'noThemesFound'     => __( 'No themes found. Try a different search.' ),

        ),
 ) );
 
 add_thickbox();
 wp_enqueue_script( 'theme' );
        ),
 ) );
 
 add_thickbox();
 wp_enqueue_script( 'theme' );

+wp_enqueue_script( 'updates' );

 wp_enqueue_script( 'customize-loader' );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
 wp_enqueue_script( 'customize-loader' );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">

-       <h2><?php esc_html_e( 'Themes' ); ?>
-               <span class="theme-count"><?php echo count( $themes ); ?></span>
+       <h1><?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' ) ) : ?>
        <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>

-               <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="add-new-h2"><?php echo esc_html( _x( 'Add New', 'Add new theme' ) ); ?></a>
+               <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>

        <?php endif; ?>
        <?php endif; ?>

-       </h2>
+       </h1>

 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
 <?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>
+<div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>

 <?php elseif ( isset($_GET['activated']) ) :
                if ( isset( $_GET['previewed'] ) ) { ?>
 <?php elseif ( isset($_GET['activated']) ) :
                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>
+               <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>

                <?php } else { ?>
                <?php } else { ?>

-<div id="message2" class="updated"><p><?php printf( __( 'New theme activated. <a href="%s">Visit site</a>' ), home_url( '/' ) ); ?></p></div><?php
+<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php

                }
        elseif ( isset($_GET['deleted']) ) : ?>
                }
        elseif ( isset($_GET['deleted']) ) : ?>

-<div id="message3" class="updated"><p><?php _e('Theme deleted.') ?></p></div>
+<div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
+<?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' ) ) ) {
 <?php
 endif;
 
 $ct = wp_get_theme();
 
 if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {

-       echo '<p class="error-message">' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '</p>';
+       echo '<div class="error"><p>' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';

 }
 
 /*
 }
 
 /*


@@ -156,26 +191,37 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
        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] || 'customize.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
                        if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_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"';
+                               $class = ' current';

                        if ( !empty($submenu[$item[2]]) ) {
                                $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))
                        if ( !empty($submenu[$item[2]]) ) {
                                $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))

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

                                else
                                else

-                                       $current_theme_actions[] = "<a class='button button-secondary' href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-                       } else if ( current_user_can($item[1]) ) {
+                                       $current_theme_actions[] = "<a class='button$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+                       } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {

                                $menu_file = $item[2];
                                $menu_file = $item[2];

-                               if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+
+                               if ( current_user_can( 'customize' ) ) {
+                                       if ( 'custom-header' === $menu_file ) {
+                                               $current_theme_actions[] = "<a class='button 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 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 );
                                        $menu_file = substr( $menu_file, 0, $pos );

+                               }
+

                                if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
                                if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {

-                                       $current_theme_actions[] = "<a class='button button-secondary' href='{$item[2]}'$class>{$item[0]}</a>";
+                                       $current_theme_actions[] = "<a class='button$class' href='{$item[2]}'>{$item[0]}</a>";

                                } else {
                                } else {

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

                                }
                        }
                }
                                }
                        }
                }


@@ -184,15 +230,18 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
 ?>
 
 <div class="theme-browser">
 ?>
 
 <div class="theme-browser">

-       <div class="themes">
+       <div class="themes wp-clearfix">

 
 <?php
 /*
  * This PHP is synchronized with the tmpl-theme template below!
  */
 
 
 <?php
 /*
  * This PHP is synchronized with the tmpl-theme template below!
  */
 

-foreach ( $themes as $theme ) : ?>
-<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>">
+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="" />
        <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
                <div class="theme-screenshot">
                        <img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />


@@ -200,39 +249,57 @@ foreach ( $themes as $theme ) : ?>
        <?php } else { ?>
                <div class="theme-screenshot blank"></div>
        <?php } ?>
        <?php } else { ?>
                <div class="theme-screenshot blank"></div>
        <?php } ?>

-       <span class="more-details"><?php _e( 'Theme Details' ); ?></span>
+
+       <?php if ( $theme['hasUpdate'] ) : ?>
+               <div class="update-message notice inline notice-warning notice-alt">
+               <?php if ( $theme['hasPackage'] ) : ?>
+                       <p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p>
+               <?php else : ?>
+                       <p><?php _e( 'New version available.' ); ?></p>
+               <?php endif; ?>
+               </div>
+       <?php endif; ?>
+
+       <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'] ) { ?>
        <div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
 
        <?php if ( $theme['active'] ) { ?>

-               <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> <?php echo $theme['name']; ?></h3>
+               <h2 class="theme-name" id="<?php echo $aria_name; ?>">
+                       <?php
+                       /* translators: %s: theme name */
+                       printf( __( '<span>Active:</span> %s' ), $theme['name'] );
+                       ?>
+               </h2>

        <?php } else { ?>
        <?php } else { ?>

-               <h3 class="theme-name"><?php echo $theme['name']; ?></h3>
+               <h2 class="theme-name" id="<?php echo $aria_name; ?>"><?php echo $theme['name']; ?></h2>

        <?php } ?>
 
        <div class="theme-actions">
 
        <?php if ( $theme['active'] ) { ?>
        <?php } ?>
 
        <div class="theme-actions">
 
        <?php if ( $theme['active'] ) { ?>

-               <?php if ( $theme['actions']['customize'] ) { ?>
+               <?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-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-primary activate" href="<?php echo $theme['actions']['activate']; ?>"><?php _e( 'Activate' ); ?></a>
-               <a class="button button-secondary 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
+               /* translators: %s: Theme name */
+               $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+               ?>
+               <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?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>
+               <?php } ?>

        <?php } ?>
 
        </div>
        <?php } ?>
 
        </div>

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

 </div>
 <?php endforeach; ?>
 </div>
 <?php endforeach; ?>

-       <br class="clear" />

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

+<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+

 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {


@@ -240,22 +307,58 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
 
 <div class="broken-themes">
 <h3><?php _e('Broken Themes'); ?></h3>
 
 <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>
+<p><?php _e( 'The following themes are installed but incomplete.' ); ?></p>

 
 

+<?php
+$can_delete = current_user_can( 'delete_themes' );
+$can_install = current_user_can( 'install_themes' );
+?>

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

+               <?php if ( $can_delete ) { ?>
+                       <td></td>
+               <?php } ?>
+               <?php if ( $can_install ) { ?>
+                       <td></td>
+               <?php } ?>

        </tr>
        </tr>

-<?php
-       foreach ( $broken_themes as $broken_theme ) {
-               echo "
+       <?php foreach ( $broken_themes as $broken_theme ) : ?>

                <tr>
                <tr>

-                        <td>" . ( $broken_theme->get( 'Name' ) ? $broken_theme->get( 'Name' ) : $broken_theme->get_stylesheet() ) . "</td>
-                        <td>" . $broken_theme->errors()->get_error_message() . "</td>
-               </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 delete-theme"><?php _e( 'Delete' ); ?></a></td>
+                               <?php
+                       }
+
+                       if ( $can_install && 'theme_no_parent' === $broken_theme->errors()->get_error_code() ) {
+                               $parent_theme_name = $broken_theme->get( 'Template' );
+                               $parent_theme = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) );
+
+                               if ( ! is_wp_error( $parent_theme ) ) {
+                                       $install_url = add_query_arg( array(
+                                               'action' => 'install-theme',
+                                               'theme'  => urlencode( $parent_theme_name ),
+                                       ), admin_url( 'update.php' ) );
+                                       $install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
+                                       ?>
+                                       <td><a href="<?php echo esc_url( $install_url ); ?>" class="button install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
+                                       <?php
+                               }
+                       }
+                       ?>
+               </tr>
+       <?php endforeach; ?>

 </table>
 </div>
 
 </table>
 </div>
 


@@ -277,43 +380,59 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
        <# } else { #>
                <div class="theme-screenshot blank"></div>
        <# } #>
        <# } else { #>
                <div class="theme-screenshot blank"></div>
        <# } #>

-       <span class="more-details"><?php _e( 'Theme Details' ); ?></span>
-       <div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>

 
 

-       <# if ( data.active ) { #>
-               <h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
-       <# } else { #>
-               <h3 class="theme-name">{{{ data.name }}}</h3>
+       <# if ( data.hasUpdate ) { #>
+               <# if ( data.hasPackage ) { #>
+                       <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p></div>
+               <# } else { #>
+                       <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available.' ); ?></p></div>
+               <# } #>

        <# } #>
 
        <# } #>
 

-       <div class="theme-actions">
+       <span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
+       <div class="theme-author">
+               <?php
+               /* translators: %s: Theme author name */
+               printf( __( 'By %s' ), '{{{ data.author }}}' );
+               ?>
+       </div>

 
        <# if ( data.active ) { #>
 
        <# 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>
-               <# } #>
+               <h2 class="theme-name" id="{{ data.id }}-name">
+                       <?php
+                       /* translators: %s: Theme name */
+                       printf( __( '<span>Active:</span> %s' ), '{{{ data.name }}}' );
+                       ?>
+               </h2>

        <# } else { #>
        <# } else { #>

-               <a class="button button-primary activate" href="{{{ data.actions.activate }}}"><?php _e( 'Activate' ); ?></a>
-               <a class="button button-secondary 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>
+               <h2 class="theme-name" id="{{ data.id }}-name">{{{ data.name }}}</h2>

        <# } #>
 
        <# } #>
 

+       <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 { #>
+                       <?php
+                       /* translators: %s: Theme name */
+                       $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                       ?>
+                       <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
+                       <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
+               <# } #>

        </div>
        </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>
 </script>
 
 <script id="tmpl-theme-single" type="text/template">
        <div class="theme-backdrop"></div>

-       <div class="theme-wrap">
+       <div class="theme-wrap wp-clearfix">

                <div class="theme-header">
                <div class="theme-header">

-                       <div alt="<?php _e( 'Close overlay' ); ?>" class="close dashicons dashicons-no"></div>
-                       <div alt="<?php _e( 'Show previous theme' ); ?>" class="left dashicons dashicons-no"></div>
-                       <div alt="<?php _e( 'Show next theme' ); ?>" class="right dashicons dashicons-no"></div>
+                       <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 details dialog' ); ?></span></button>

                </div>
                </div>

-               <div class="theme-about">
+               <div class="theme-about wp-clearfix">

                        <div class="theme-screenshots">
                        <# if ( data.screenshot[0] ) { #>
                                <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
                        <div class="theme-screenshots">
                        <# if ( data.screenshot[0] ) { #>
                                <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>


@@ -326,12 +445,12 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
                                <# if ( data.active ) { #>
                                        <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
                                <# } #>
                                <# 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>
+                               <h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
+                               <p class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></p>

 
                                <# if ( data.hasUpdate ) { #>
 
                                <# if ( data.hasUpdate ) { #>

-                               <div class="theme-update-message">
-                                       <h4 class="theme-update"><?php _e( 'Update Available' ); ?></h4>
+                               <div class="notice notice-warning notice-alt notice-large">
+                                       <h3 class="notice-title"><?php _e( 'Update Available' ); ?></h3>

                                        {{{ data.update }}}
                                </div>
                                <# } #>
                                        {{{ data.update }}}
                                </div>
                                <# } #>


@@ -353,18 +472,30 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
                                <?php echo implode( ' ', $current_theme_actions ); ?>
                        </div>
                        <div class="inactive-theme">
                                <?php echo implode( ' ', $current_theme_actions ); ?>
                        </div>
                        <div class="inactive-theme">

+                               <?php
+                               /* translators: %s: Theme name */
+                               $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                               ?>

                                <# if ( data.actions.activate ) { #>
                                <# if ( data.actions.activate ) { #>

-                                       <a href="{{{ data.actions.activate }}}" class="button button-primary activate"><?php _e( 'Activate' ); ?></a>
+                                       <a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>

                                <# } #>
                                <# } #>

-                               <a href="{{{ data.actions.customize }}}" class="button button-secondary 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>
+                               <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>

                        </div>
 
                        <# if ( ! data.active && data.actions['delete'] ) { #>
                        </div>
 
                        <# if ( ! data.active && data.actions['delete'] ) { #>

-                               <a href="{{{ data.actions['delete'] }}}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
+                               <a href="{{{ data.actions['delete'] }}}" class="button delete-theme"><?php _e( 'Delete' ); ?></a>

                        <# } #>
                </div>
        </div>
 </script>
 
                        <# } #>
                </div>
        </div>
 </script>
 

-<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php
+wp_print_request_filesystem_credentials_modal();
+wp_print_admin_notice_templates();
+wp_print_update_row_templates();
+
+wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+       'totals'  => wp_get_update_data(),
+) );
+
+require( ABSPATH . 'wp-admin/admin-footer.php' );