Changeset 12107

Timestamp:

10/26/2009 07:04:30 AM (16 years ago)

Author:

azaozz

Message:

Add subtitles and opening/closing DIVs on GUU results screen, see #10973

Location:

trunk/wp-admin

Files:

• includes/class-wp-upgrader.php (modified) (8 diffs)
• update-core.php (modified) (1 diff)

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

@@ -272 +272 @@
                             'clear_destination' => false,
                             'clear_working' => true,
+                            'is_multi' => false,
                             'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters.
                         );
@@ -288 +289 @@
         }
 
-        $this->skin->header();
+        if ( !$is_multi ) // call $this->header separately if running multiple times
+            $this->skin->header();
+
         $this->skin->before();
 
@@ -322 +325 @@
         }
         $this->skin->after();
-        $this->skin->footer();
+
+        if ( !$is_multi )
+            $this->skin->footer();
+
         return $result;
     }
@@ -356 +362 @@
     var $result;
     var $bulk = true;
+    var $show_before = '';
 
     function upgrade_strings() {
@@ -448 +455 @@
         add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
 
+        $this->skin->header();
+        $all = count($plugins);
+        $i = 1;
         foreach ( $plugins as $plugin ) {
+
+            $this->show_before = sprintf( '<h4>' . __('Updating plugin %d of %d...') . '</h4>', $i, $all );
+            $i++;
+
             if ( !isset( $current->response[ $plugin ] ) ) {
                 $this->skin->set_result(false);
@@ -467 +481 @@
                         'clear_destination' => true,
                         'clear_working' => true,
+                        'is_multi' => true,
                         'hook_extra' => array(
                                     'plugin' => $plugin
                         )
                     ));
-                
+
             $results[$plugin] = $this->result;
 
@@ -478 +493 @@
                 break;
         }
+        $this->skin->footer();
 
         //Cleanup our hooks, incase something else does a upgrade on this connection.
@@ -903 +919 @@
     }
 
-    function footer() {
-        if ( $this->upgrader->bulk )
-            return;
-
-        echo '</div>';
+    function before() {
+        if ( $this->upgrader->show_before ) {
+            echo $this->upgrader->show_before;
+            $this->upgrader->show_before = '';
+        }
     }
 }

trunk/wp-admin/update-core.php

@@ -127 +127 @@
     echo '</ul>';
     dismissed_updates();
-    echo '</div>';
 
     list_plugin_updates();
     //list_theme_updates();
+    echo '</div>';
 }