<!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>[14879] trunk/wp-admin/includes/class-wp-upgrader.php:
Add Actions to the end of Bulk upgrades;
Remove Spinners and instead show the individual upgrade steps (
Then hidden upon completion for bulk upgrades).</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14879">14879</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-05-25 13:57:06 +0000 (Tue, 25 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/11232">#11232</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (14878 => 14879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-05-25 13:49:56 UTC (rev 14878)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-05-25 13:57:06 UTC (rev 14879)
</span><span class="lines">@@ -466,7 +466,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->skin->feedback('bulk_upgrade_start');
</del><ins>+ $this->skin->bulk_header();
+
</ins><span class="cx"> $this->maintenance_mode(true);
</span><span class="cx">
</span><span class="cx"> $results = array();
</span><span class="lines">@@ -510,8 +511,9 @@
</span><span class="cx"> } //end foreach $plugins
</span><span class="cx">
</span><span class="cx"> $this->maintenance_mode(false);
</span><del>- $this->skin->feedback('bulk_upgrade_end');
</del><span class="cx">
</span><ins>+ $this->skin->bulk_footer();
+
</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">@@ -708,7 +710,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->skin->feedback('bulk_upgrade_start');
</del><ins>+ $this->skin->bulk_header();
+
</ins><span class="cx"> $this->maintenance_mode(true);
</span><span class="cx">
</span><span class="cx"> $results = array();
</span><span class="lines">@@ -752,7 +755,9 @@
</span><span class="cx"> } //end foreach $plugins
</span><span class="cx">
</span><span class="cx"> $this->maintenance_mode(false);
</span><del>- $this->skin->feedback('bulk_upgrade_end');
</del><ins>+
+ $this->skin->bulk_footer();
+
</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">@@ -1087,6 +1092,7 @@
</span><span class="cx"> echo "$string<br />\n";
</span><span class="cx"> else
</span><span class="cx"> echo "<p>$string</p>\n";
</span><ins>+ $this->flush_output();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function header() {
</span><span class="lines">@@ -1109,14 +1115,20 @@
</span><span class="cx"> }
</span><span class="cx"> $this->error = implode(', ', $messages);
</span><span class="cx"> }
</span><del>- echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ function bulk_header() {
+ $this->feedback('bulk_upgrade_start');
+ }
+
+ function bulk_footer() {
+ $this->feedback('bulk_upgrade_end');
+ }
+
</ins><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'] . ' <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>';
</del><ins>+ 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>';
</ins><span class="cx"> $this->flush_output();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1131,9 +1143,14 @@
</span><span class="cx"> echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
</span><span class="cx"> }
</span><span class="cx"> if ( !empty($this->result) && !is_wp_error($this->result) ) {
</span><del>- 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>';
</del><ins>+ 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>';
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $this->reset();
</span><span class="cx"> $this->flush_output();
</span><span class="cx"> }
</span><span class="lines">@@ -1167,6 +1184,17 @@
</span><span class="cx"> function after() {
</span><span class="cx"> parent::after($this->plugin_info['Title']);
</span><span class="cx"> }
</span><ins>+ 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));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
</span><span class="lines">@@ -1187,6 +1215,17 @@
</span><span class="cx"> function after() {
</span><span class="cx"> parent::after($this->theme_info['Name']);
</span><span class="cx"> }
</span><ins>+ 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));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1341,6 +1380,7 @@
</span><span class="cx">
</span><span class="cx"> function after() {
</span><span class="cx">
</span><ins>+ $update_actions = array();
</ins><span class="cx"> if ( !empty($this->upgrader->result['destination_name']) &&
</span><span class="cx"> ($theme_info = $this->upgrader->theme_info()) &&
</span><span class="cx"> !empty($theme_info) ) {
</span><span class="lines">@@ -1352,10 +1392,9 @@
</span><span class="cx"> $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
</span><span class="cx"> $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
</span><span class="cx">
</span><del>- $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>',
- );
</del><ins>+ $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>';
+
</ins><span class="cx"> if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
</span><span class="cx"> unset($update_actions['preview'], $update_actions['activate']);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>