Changeset 20236

Timestamp:

03/21/2012 04:19:27 PM (13 years ago)

Author:

nacin

Message:

Visually merge a plugin with its update notice. Same applies to themes in the network admin. Move from 'update automatically' to 'update now'. fixes #20273.

Location:

trunk/wp-admin

Files:

• css/wp-admin.dev.css (modified) (1 diff)
• includes/class-wp-ms-themes-list-table.php (modified) (4 diffs)
• includes/class-wp-plugins-list-table.php (modified) (4 diffs)
• includes/theme.php (modified) (1 diff)
• includes/update.php (modified) (2 diffs)

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

@@ -4426 +4426 @@
 }
 
-#wpbody-content .plugins .plugin-title, #wpbody-content .plugins .theme-title {
+.plugins .update th,
+.plugins .update td {
+    border-bottom: 0;
+}
+.plugin-update-tr td {
+    border-top: 0;
+}
+
+#wpbody-content .plugins .plugin-title,
+#wpbody-content .plugins .theme-title {
     padding-right: 12px;
     white-space:nowrap;
 }
 
-.plugins .second, .plugins .row-actions-visible {
+.plugins .second,
+.plugins .row-actions-visible {
     padding: 0 0 5px;
+}
+
+.plugins .update .second,
+.plugins .update .row-actions-visible {
+    padding-bottom: 0;
 }
 

trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -72 +72 @@
         }
 
-        $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && get_site_transient( 'update_themes' );
+        $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
 
         foreach ( (array) $themes['all'] as $key => $theme ) {
@@ -80 +80 @@
             }
 
+            if ( $maybe_update && isset( $current->response[ $key ] ) ) {
+                $themes['all'][ $key ]->update = true;
+                $themes['upgrade'][ $key ] = $themes['all'][ $key ];
+            }
+
             $filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
             $themes[ $filter ][ $key ] = $themes['all'][ $key ];
-
-            if ( $maybe_update && isset( $current->response[ $key ] ) )
-                $themes['upgrade'][ $key ] = $themes['all'][ $key ];
         }
 
@@ -262 +264 @@
 
     function single_row( $key, $theme ) {
-        global $status, $page, $s;
+        global $status, $page, $s, $totals;
 
         $context = $status;
@@ -305 +307 @@
 
         $id = sanitize_html_class( $theme->get_stylesheet() );
+
+        if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+            $class .= ' update';
 
         echo "<tr id='$id' class='$class'>";

trunk/wp-admin/includes/class-wp-plugins-list-table.php

@@ -66 +66 @@
                 $plugins['dropins'] = get_dropins();
 
-            $current = get_site_transient( 'update_plugins' );
-            foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-                if ( isset( $current->response[ $plugin_file ] ) )
-                    $plugins['upgrade'][ $plugin_file ] = $plugin_data;
+            if ( current_user_can( 'update_plugins' ) ) {
+                $current = get_site_transient( 'update_plugins' );
+                foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+                    if ( isset( $current->response[ $plugin_file ] ) ) {
+                        $plugins['all'][ $plugin_file ]['update'] = true;
+                        $plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+                    }
+                }
             }
         }
@@ -101 +105 @@
         }
 
-        if ( !current_user_can( 'update_plugins' ) )
-            $plugins['upgrade'] = array();
-
         if ( $s ) {
             $status = 'search';
@@ -313 +314 @@
 
     function single_row( $plugin_file, $plugin_data ) {
-        global $status, $page, $s;
+        global $status, $page, $s, $totals;
 
         $context = $status;
@@ -395 +396 @@
 
         $id = sanitize_title( $plugin_name );
+        if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+            $class .= ' update';
 
         echo "<tr id='$id' class='$class'>";

trunk/wp-admin/includes/theme.php

@@ -136 +136 @@
                 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic update is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
             else
-                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>update automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
+                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>update now</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
         }
     }

trunk/wp-admin/includes/update.php

@@ -200 +200 @@
             printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
         else
-            printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
+            printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
 
         do_action( "in_plugin_update_message-$file", $plugin_data, $r );
@@ -272 +272 @@
         printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
     else
-        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
+        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
 
     do_action( "in_theme_update_message-$theme_key", $theme, $r );