WordPress 3.4.1

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

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index b845e69b55eedd5e2db91b385e92ddf8ad3363ef..cbcde87cad97217fa92f742422e85d103220db4d 100644 (file)
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -16,15 +16,19 @@ $wp_list_table = _get_list_table('WP_Themes_List_Table');
 
 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?' ) );
+               switch_theme( $theme->get_template(), $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') )
+               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?' ) );
                        wp_die( __( 'Cheatin’ uh?' ) );

-               delete_theme($_GET['template']);
+               delete_theme($_GET['stylesheet']);

                wp_redirect( admin_url('themes.php?deleted=true') );
                exit;
        }
                wp_redirect( admin_url('themes.php?deleted=true') );
                exit;
        }


@@ -37,38 +41,59 @@ $parent_file = 'themes.php';
 
 if ( current_user_can( 'switch_themes' ) ) :
 
 
 if ( current_user_can( 'switch_themes' ) ) :
 

-$help = '<p>' . __('Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.') . '</p>';
-$help .= '<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>';
-if ( current_user_can('install_themes') )
-       $help .= '<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_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 Live Preview link (see "Previewing and Customizing" help tab). To change themes, click the Activate link.') . '</p>';
+
+get_current_screen()->add_help_tab( array(
+       'id'      => 'overview',
+       'title'   => __('Overview'),
+       'content' => $help_manage
+) );

 
 

-$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
-$help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>';
-$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
-add_contextual_help($current_screen, $help);
+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>';
+       }
+
+       get_current_screen()->add_help_tab( array(
+               'id'      => 'adding-themes',
+               'title'   => __('Adding Themes'),
+               'content' => $help_install
+       ) );
+}

 
 add_thickbox();
 
 add_thickbox();

-wp_enqueue_script( 'theme-preview' );
-wp_enqueue_script( 'theme' );
-wp_enqueue_style( 'theme-install' );

 
 

-endif;
+endif; // switch_themes
+
+if ( current_user_can( 'edit_theme_options' ) ) {
+       $help_customize =
+               '<p>' . __('Click on the "Live Preview" link under any theme to preview that theme and change theme options in a separate, full-screen view. 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.') . '</p>' .
+               '<p>' . __('In the left-hand pane you can edit the theme settings. The settings will 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 at the top of the left-hand pane.') . '</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
+       ) );
+}
+
+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>'
+);
+
+wp_enqueue_script( 'theme' );
+wp_enqueue_script( 'customize-loader' );

 
 require_once('./admin-header.php');
 ?>
 
 
 require_once('./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>
-<?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 { ?>
-<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' ) ) : ?>
 <div class="wrap"><?php
 screen_icon();
 if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>


@@ -78,18 +103,53 @@ if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
 <h2><?php echo esc_html( $title ); ?>
 <?php endif; ?>
 </h2>
 <h2><?php echo esc_html( $title ); ?>
 <?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']) ) :
+               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 } elseif ( 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 { ?>
+<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;
+
+$ct = wp_get_theme();
+$screenshot = $ct->get_screenshot();
+$class = $screenshot ? 'has-screenshot' : '';
+
+$customize_title = sprintf( __( 'Customize &#8220;%s&#8221;' ), $ct->display('Name') );
+
+?>
+<div id="current-theme" class="<?php echo esc_attr( $class ); ?>">
+       <?php if ( $screenshot ) : ?>
+               <?php if ( current_user_can( 'edit_theme_options' ) ) : ?>
+               <a href="<?php echo wp_customize_url(); ?>" class="load-customize hide-if-no-customize" title="<?php echo esc_attr( $customize_title ); ?>">
+                       <img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview' ); ?>" />
+               </a>
+               <?php endif; ?>
+               <img class="hide-if-customize" src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview' ); ?>" />
+       <?php endif; ?>
+
+       <h3><?php _e('Current Theme'); ?></h3>
+       <h4>
+               <?php echo $ct->display('Name'); ?>
+       </h4>
+
+       <div>
+               <ul class="theme-info">
+                       <li><?php printf( __('By %s'), $ct->display('Author') ); ?></li>
+                       <li><?php printf( __('Version %s'), $ct->display('Version') ); ?></li>
+               </ul>
+               <p class="theme-description"><?php echo $ct->display('Description'); ?></p>
+               <?php theme_update_available( $ct ); ?>
+       </div>

 
 

-<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 _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
        // Pretend you didn't see this.
        $options = array();
        <?php
        // Pretend you didn't see this.
        $options = array();


@@ -99,12 +159,12 @@ if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
                        if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] )
                                continue;
                        // 0 = name, 1 = capability, 2 = file
                        if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] )
                                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 = ' 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]);
                                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);

-                               if ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+                               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>";
                                else
                                        $options[] = "<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
                                        $options[] = "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
                                else
                                        $options[] = "<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";


@@ -117,13 +177,27 @@ if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
                        }
                }
        }
                        }
                }
        }

-       echo implode ( ' | ', $options );

 
 

-       if ( $ct->tags ) : ?>
-       <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
-       <?php endif; ?>
-</div>
-<?php theme_update_available($ct); ?>
+       if ( $options || current_user_can( 'edit_theme_options' ) ) :
+       ?>
+       <div class="theme-options">
+               <?php if ( current_user_can( 'edit_theme_options' ) ) : ?>
+               <a id="customize-current-theme-link" href="<?php echo wp_customize_url(); ?>" class="load-customize hide-if-no-customize" title="<?php echo esc_attr( $customize_title ); ?>"><?php _e( 'Customize' ); ?></a>
+               <?php
+               endif; // edit_theme_options
+               if ( $options ) :
+               ?>
+               <span><?php _e( 'Options:' )?></span>
+               <ul>
+                       <?php foreach ( $options as $option ) : ?>
+                               <li><?php echo $option; ?></li>
+                       <?php endforeach; ?>
+               </ul>
+       </div>
+       <?php
+               endif; // options
+       endif; // options || edit_theme_options
+       ?>

 
 </div>
 
 
 </div>
 


@@ -136,21 +210,19 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 }
 ?>
 
 }
 ?>
 

-<h3><?php _e('Available Themes'); ?></h3>
+<form class="search-form filter-form" action="" method="get">

 
 

-<?php if ( !empty( $_REQUEST['s'] ) || !empty( $_REQUEST['filter'] ) || $wp_list_table->has_items() ) : ?>
+<h3 class="available-themes"><?php _e('Available Themes'); ?></h3>

 
 

-<form class="search-form filter-form" action="" method="get">
+<?php if ( !empty( $_REQUEST['s'] ) || !empty( $_REQUEST['features'] ) || $wp_list_table->has_items() ) : ?>

 
 <p class="search-box">
        <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Installed Themes'); ?>:</label>
 
 <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(); ?>" />
+       <input type="search" 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>
 
        <?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"/>
-

 <div id="filter-box" style="<?php if ( empty($_REQUEST['filter']) ) echo 'display: none;'; ?>">
 <?php $feature_list = get_theme_feature_list(); ?>
        <div class="feature-filter">
 <div id="filter-box" style="<?php if ( empty($_REQUEST['filter']) ) echo 'display: none;'; ?>">
 <?php $feature_list = get_theme_feature_list(); ?>
        <div class="feature-filter">


@@ -180,19 +252,19 @@ if ( ! current_user_can( 'switch_themes' ) ) {
        <?php endforeach; ?>
 
        <div class="feature-container">
        <?php endforeach; ?>
 
        <div class="feature-container">

-               <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'style' => 'margin-left: 120px', 'id' => 'filter-submit' ) ); ?>
+               <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'id' => 'filter-submit' ) ); ?>

                &nbsp;
                &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>
+               <a id="mini-filter-click" href="<?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?>"><?php _e( 'Close filters' )?></a>

        </div>
        <br/>
        </div>
        <br class="clear"/>
 </div>
 
        </div>
        <br/>
        </div>
        <br class="clear"/>
 </div>
 

-<br class="clear" />
-

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

+<br class="clear" />
+

 <?php $wp_list_table->display(); ?>
 
 </form>
 <?php $wp_list_table->display(); ?>
 
 </form>


@@ -200,8 +272,7 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 
 <?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 ) ) ) {

 ?>
 
 <h3><?php _e('Broken Themes'); ?></h3>
 ?>
 
 <h3><?php _e('Broken Themes'); ?></h3>


@@ -213,20 +284,13 @@ if ( current_user_can('edit_themes') && count( $broken_themes ) ) {
                <th><?php _e('Description'); ?></th>
        </tr>
 <?php
                <th><?php _e('Description'); ?></th>
        </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"';
+       $alt = '';
+       foreach ( $broken_themes as $broken_theme ) {
+               $alt = ('class="alternate"' == $alt) ? '' : 'class="alternate"';

                echo "
                echo "

-               <tr $theme>
-                        <td>$title</td>
-                        <td>$description</td>
+               <tr $alt>
+                        <td>" . $broken_theme->get('Name') ."</td>
+                        <td>" . $broken_theme->errors()->get_error_message() . "</td>

                </tr>";
        }
 ?>
                </tr>";
        }
 ?>