Changeset 20419 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

04/10/2012 02:25:03 AM (14 years ago)

Author:

koopersmith

Message:

Replace all instances of thickbox theme preview with the theme customizer. fixes #20404.

• Use theme customizer in theme install/update screens.
• Separate the customize loader from the customizer. Use wp_customize_loader() to include the loader script and markup.
• Deprecated: wp-admin/js/theme-preview.js is now no longer used by core.

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (4 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -712 +712 @@
 
         $this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version);
-        
+
         add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme.
 
@@ -736 +736 @@
         return $install_result;
     }
-    
+
     function hide_activate_preview_actions($actions) {
         unset($actions['activate'], $actions['preview']);
@@ -1495 +1495 @@
 
         $theme_info = $this->upgrader->theme_info();
-        if ( empty($theme_info) )
+        if ( empty( $theme_info ) )
             return;
-        $name = $theme_info->display('Name');
+
+        $name       = $theme_info->display('Name');
         $stylesheet = $this->upgrader->result['destination_name'];
-        $template = $theme_info->get_template();
-
-        $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => 1, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
-        $activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-
-        $install_actions = array(
-            'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
-            'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'
-                            );
+        $template   = $theme_info->get_template();
+
+        $preview_link = add_query_arg( array(
+            'preview'    => 1,
+            'template'   => $template,
+            'stylesheet' => $stylesheet,
+        ), trailingslashit( get_home_url() ) );
+
+        $customize_attributes = 'title="' . esc_attr( sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) ) . '"
+            . data-customize-template="' . esc_attr( $template ) . '" data-customize-stylesheet="' . esc_attr( $stylesheet ) . '"';
+
+        $activate_link = add_query_arg( array(
+            'action'     => 'activate',
+            'template'   => $template,
+            'stylesheet' => $stylesheet,
+        ), admin_url('themes.php') );
+        $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $template );
+
+        $install_actions = array();
+        $install_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-js" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
+        $install_actions['preview'] .= '<a href="#" class="hide-if-no-js load-customize" ' . $customize_attributes . '>' . __('Customize') . '</a>';
+        $install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
 
         if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
@@ -1551 +1565 @@
         $update_actions = array();
         if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
-            $name = $theme_info->display('Name');
+            $name       = $theme_info->display('Name');
             $stylesheet = $this->upgrader->result['destination_name'];
-            $template = $theme_info->get_template();
-
-            $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
-            $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-
-            $update_actions['preview'] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
-            $update_actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
-
-            if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
+            $template   = $theme_info->get_template();
+
+            $preview_link = add_query_arg( array(
+                'preview'    => 1,
+                'template'   => $template,
+                'stylesheet' => $stylesheet,
+            ), trailingslashit( get_home_url() ) );
+
+            $customize_attributes = 'title="' . esc_attr( sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) ) . '"
+                . data-customize-template="' . esc_attr( $template ) . '" data-customize-stylesheet="' . esc_attr( $stylesheet ) . '"';
+
+            $activate_link = add_query_arg( array(
+                'action'     => 'activate',
+                'template'   => $template,
+                'stylesheet' => $stylesheet,
+            ), admin_url('themes.php') );
+            $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $template );
+
+            $update_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-js" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
+            $update_actions['preview'] .= '<a href="#" class="hide-if-no-js load-customize" ' . $customize_attributes . '>' . __('Customize') . '</a>';
+            $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
+
+            if ( ( ! $this->result || is_wp_error( $this->result ) ) || $stylesheet == get_stylesheet() )
                 unset($update_actions['preview'], $update_actions['activate']);
         }