Changeset 14879

Timestamp:

05/25/2010 01:57:06 PM (15 years ago)

Author:

dd32

Message:

Add Actions to the end of Bulk upgrades; Remove Spinners and instead show the individual upgrade steps (Then hidden upon completion for bulk upgrades). See #11232

File:

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

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

@@ -467 +467 @@
         }
 
-        $this->skin->feedback('bulk_upgrade_start');
+        $this->skin->bulk_header();
+
         $this->maintenance_mode(true);
 
@@ -511 +512 @@
 
         $this->maintenance_mode(false);
-        $this->skin->feedback('bulk_upgrade_end');
+
+        $this->skin->bulk_footer();
 
         $this->skin->footer();
@@ -709 +711 @@
         }
 
-        $this->skin->feedback('bulk_upgrade_start');
+        $this->skin->bulk_header();
+
         $this->maintenance_mode(true);
 
@@ -753 +756 @@
 
         $this->maintenance_mode(false);
-        $this->skin->feedback('bulk_upgrade_end');
+
+        $this->skin->bulk_footer();
+
         $this->skin->footer();
 
@@ -1088 +1093 @@
         else
             echo "<p>$string</p>\n";
+        $this->flush_output();
     }
 
@@ -1110 +1116 @@
             $this->error = implode(', ', $messages);
         }
-        echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+    }
+
+    function bulk_header() {
+        $this->feedback('bulk_upgrade_start');
+    }
+
+    function bulk_footer() {
+        $this->feedback('bulk_upgrade_end');
     }
 
     function before($title = '') {
         $this->in_loop = true;
-        printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <img alt="" src="' . admin_url( 'images/wpspin_light.gif' ) . '" class="hidden waiting-' . $this->upgrader->update_current . '" style="vertical-align:middle;"></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
-        echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
-        echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
+        printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . '</h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+        echo '<div class="update-messages" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
         $this->flush_output();
     }
@@ -1132 +1144 @@
         }
         if ( !empty($this->result) && !is_wp_error($this->result) ) {
-            echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
-            echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
-        }
+            echo '<div class="updated" id="finished-' . $this->upgrader->update_current . '"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+
+            if ( $this->upgrader->update_count > 1 ) // Only hide the update steps if multiple items are being updated.
+                echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+            else
+                echo '<script type="text/javascript">jQuery(\'#finished-' . esc_js($this->upgrader->update_current) . '\ span\').toggle();</script>';
+        }
+
         $this->reset();
         $this->flush_output();
@@ -1168 +1185 @@
         parent::after($this->plugin_info['Title']);
     }
+    function bulk_footer() {
+        parent::bulk_footer();
+        $update_actions =  array(
+            'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>',
+            'updates_page' => '<a href="' . admin_url('update-core.php') . '" title="' . esc_attr__('Goto WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
+        );
+
+        $update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
+        if ( ! empty($update_actions) )
+            $this->feedback('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$update_actions));
+    }
 }
 
@@ -1187 +1215 @@
     function after() {
         parent::after($this->theme_info['Name']);
+    }
+    function bulk_footer() {
+        parent::bulk_footer();
+        $update_actions =  array(
+            'themes_page' => '<a href="' . admin_url('themes.php') . '" title="' . esc_attr__('Goto themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>',
+            'updates_page' => '<a href="' . admin_url('update-core.php') . '" title="' . esc_attr__('Goto WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
+        );
+
+        $update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info);
+        if ( ! empty($update_actions) )
+            $this->feedback('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$update_actions));
     }
 }
@@ -1342 +1381 @@
     function after() {
 
+        $update_actions = array();
         if ( !empty($this->upgrader->result['destination_name']) &&
             ($theme_info = $this->upgrader->theme_info()) &&
@@ -1353 +1393 @@
             $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
 
-            $update_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>',
-            );
+            $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() )
                 unset($update_actions['preview'], $update_actions['activate']);