Changeset 14819

Timestamp:

05/23/2010 12:29:00 PM (16 years ago)

Author:

dd32

Message:

Provide some Before/After strings for Bulk Upgrades, Add a spinner whilst a upgrade is in process, Remove scrollbars on update iframe. Props ocean90. See #11232

Location:

trunk

Files:

• wp-admin/css/wp-admin.dev.css (modified) (1 diff)
• wp-admin/includes/class-wp-upgrader.php (modified) (7 diffs)
• wp-admin/update-core.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin.dev.css

@@ -3753 +3753 @@
         font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 }
+
+/* Scrollbar fix for bulk upgrade iframe */
+body.update-php {
+        height: 98%;
+}

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

@@ -467 +467 @@
                 }
 
+                $this->skin->feedback('bulk_upgrade_start');
                 $this->maintenance_mode(true);
 
@@ -508 +509 @@
                                 break;
                 } //end foreach $plugins
+
                 $this->maintenance_mode(false);
+                $this->skin->feedback('bulk_upgrade_end');
+
                 $this->skin->footer();
 
@@ -705 +709 @@
                 }
 
+                $this->skin->feedback('bulk_upgrade_start');
                 $this->maintenance_mode(true);
 
@@ -746 +751 @@
                                 break;
                 } //end foreach $plugins
+
                 $this->maintenance_mode(false);
+                $this->skin->feedback('bulk_upgrade_end');
                 $this->skin->footer();
 
@@ -1058 +1065 @@
 
         function add_strings() {
+                $this->upgrader->strings['bulk_upgrade_start'] = __('The update process is starting. This process may take awhile on some hosts, so please be patient.');
                 $this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: <strong>%2$s</strong>.');
                 $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
                 $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';
+                $this->upgrader->strings['bulk_upgrade_end'] = __('All upgrades have been completed.');
         }
 
@@ -1101 +1110 @@
                         $this->error = implode(', ', $messages);
                 }
+                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
         }
 
         function before($title = '') {
                 $this->in_loop = true;
-                printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . '</h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+                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>';
                 $this->flush_output();
@@ -1122 +1133 @@
                 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>';
                 }
                 $this->reset();

trunk/wp-admin/update-core.php

@@ -419 +419 @@
         screen_icon('plugins');
         echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
-        echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
+        echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
         echo '</div>';
 } elseif ( 'do-theme-upgrade' == $action ) {
@@ -442 +442 @@
         screen_icon('themes');
         echo '<h2>' . esc_html__('Update Themes') . '</h2>';
-        echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
+        echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
         echo '</div>';
 }

trunk/wp-includes/script-loader.php

@@ -436 +436 @@
         $no_suffix = array( 'farbtastic' );
 
-        $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100523' );
+        $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100523b' );
 
         $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20100219' );