<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14819] trunk: Provide some Before/After strings for Bulk Upgrades,
Add a spinner whilst a upgrade is in process,
Remove scrollbars on update iframe.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14819">14819</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-05-23 12:29:00 +0000 (Sun, 23 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/11232">#11232</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (14818 => 14819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2010-05-23 12:04:24 UTC (rev 14818)
+++ trunk/wp-admin/css/wp-admin.dev.css 2010-05-23 12:29:00 UTC (rev 14819)
</span><span class="lines">@@ -3752,3 +3752,8 @@
</span><span class="cx"> padding: 4px 20px 6px;
</span><span class="cx"> font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
</span><span class="cx"> }
</span><ins>+
+/* Scrollbar fix for bulk upgrade iframe */
+body.update-php {
+ height: 98%;
+}
</ins></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (14818 => 14819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-05-23 12:04:24 UTC (rev 14818)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-05-23 12:29:00 UTC (rev 14819)
</span><span class="lines">@@ -466,6 +466,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $this->skin->feedback('bulk_upgrade_start');
</ins><span class="cx"> $this->maintenance_mode(true);
</span><span class="cx">
</span><span class="cx"> $results = array();
</span><span class="lines">@@ -507,7 +508,10 @@
</span><span class="cx"> if ( false === $result )
</span><span class="cx"> break;
</span><span class="cx"> } //end foreach $plugins
</span><ins>+
</ins><span class="cx"> $this->maintenance_mode(false);
</span><ins>+ $this->skin->feedback('bulk_upgrade_end');
+
</ins><span class="cx"> $this->skin->footer();
</span><span class="cx">
</span><span class="cx"> // Cleanup our hooks, incase something else does a upgrade on this connection.
</span><span class="lines">@@ -704,6 +708,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $this->skin->feedback('bulk_upgrade_start');
</ins><span class="cx"> $this->maintenance_mode(true);
</span><span class="cx">
</span><span class="cx"> $results = array();
</span><span class="lines">@@ -745,7 +750,9 @@
</span><span class="cx"> if ( false === $result )
</span><span class="cx"> break;
</span><span class="cx"> } //end foreach $plugins
</span><ins>+
</ins><span class="cx"> $this->maintenance_mode(false);
</span><ins>+ $this->skin->feedback('bulk_upgrade_end');
</ins><span class="cx"> $this->skin->footer();
</span><span class="cx">
</span><span class="cx"> // Cleanup our hooks, incase something else does a upgrade on this connection.
</span><span class="lines">@@ -1057,9 +1064,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_strings() {
</span><ins>+ $this->upgrader->strings['bulk_upgrade_start'] = __('The update process is starting. This process may take awhile on some hosts, so please be patient.');
</ins><span class="cx"> $this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: <strong>%2$s</strong>.');
</span><span class="cx"> $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
</span><span class="cx"> $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>';
</span><ins>+ $this->upgrader->strings['bulk_upgrade_end'] = __('All upgrades have been completed.');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function feedback($string) {
</span><span class="lines">@@ -1100,11 +1109,13 @@
</span><span class="cx"> }
</span><span class="cx"> $this->error = implode(', ', $messages);
</span><span class="cx"> }
</span><ins>+ echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function before($title = '') {
</span><span class="cx"> $this->in_loop = true;
</span><del>- printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . '</h4>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
</del><ins>+ 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>';
</ins><span class="cx"> echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
</span><span class="cx"> $this->flush_output();
</span><span class="cx"> }
</span><span class="lines">@@ -1121,6 +1132,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ( !empty($this->result) && !is_wp_error($this->result) ) {
</span><span class="cx"> 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>';
</span><ins>+ echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
</ins><span class="cx"> }
</span><span class="cx"> $this->reset();
</span><span class="cx"> $this->flush_output();
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (14818 => 14819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-05-23 12:04:24 UTC (rev 14818)
+++ trunk/wp-admin/update-core.php 2010-05-23 12:29:00 UTC (rev 14819)
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon('plugins');
</span><span class="cx"> echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
</span><del>- echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
</del><ins>+ echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
</ins><span class="cx"> echo '</div>';
</span><span class="cx"> } elseif ( 'do-theme-upgrade' == $action ) {
</span><span class="cx"> check_admin_referer('upgrade-core');
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon('themes');
</span><span class="cx"> echo '<h2>' . esc_html__('Update Themes') . '</h2>';
</span><del>- echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
</del><ins>+ echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
</ins><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (14818 => 14819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-05-23 12:04:24 UTC (rev 14818)
+++ trunk/wp-includes/script-loader.php 2010-05-23 12:29:00 UTC (rev 14819)
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> // Any rtl stylesheets that don't have a .dev version for ltr
</span><span class="cx"> $no_suffix = array( 'farbtastic' );
</span><span class="cx">
</span><del>- $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100523' );
</del><ins>+ $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100523b' );
</ins><span class="cx">
</span><span class="cx"> $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20100219' );
</span><span class="cx"> $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
</span></span></pre>
</div>
</div>
</body>
</html>