Ticket #14897: 14897.8.diff

wp-admin/css/colors-classic.dev.css

@@ -511 +511 @@
 
 #adminmenu #awaiting-mod,
 #adminmenu .update-plugins,
+#adminmenu .update-themes,
 #sidemenu a .update-plugins,
+#sidemenu a .update-themes,
 #rightnow .reallynow,
 #plugin-information .action-button {
         background-color: #d54e21;
@@ -520 +522 @@
 
 #adminmenu li a:hover #awaiting-mod,
 #adminmenu li a:hover .update-plugins,
-#sidemenu li a:hover .update-plugins {
+#adminmenu li a:hover .update-themes,
+#sidemenu li a:hover .update-plugins,
+#sidemenu li a:hover .update-themes {
         background-color: #264761;
         color: #fff;
 }
 
 #adminmenu li.current a #awaiting-mod,
 #adminmenu li.current a .update-plugins,
+#adminmenu li.current a .update-themes,
 #adminmenu li.wp-has-current-submenu a .update-plugins,
-#adminmenu li.wp-has-current-submenu a .update-plugins {
+#adminmenu li.wp-has-current-submenu a .update-themes {
         background-color: #ddd;
         color: #000;
         text-shadow: none;
@@ -540 +545 @@
 
 #adminmenu li.current a:hover #awaiting-mod,
 #adminmenu li.current a:hover .update-plugins,
+#adminmenu li.current a:hover .update-themes,
 #adminmenu li.wp-has-current-submenu a:hover #awaiting-mod,
-#adminmenu li.wp-has-current-submenu a:hover .update-plugins {
+#adminmenu li.wp-has-current-submenu a:hover .update-plugins,
+#adminmenu li.wp-has-current-submenu a:hover .update-themes {
         background-color: #264761;
         color: #fff;
 }

wp-admin/css/colors-fresh.dev.css

@@ -511 +511 @@
 
 #adminmenu #awaiting-mod,
 #adminmenu .update-plugins,
+#adminmenu .update-themes,
 #sidemenu a .update-plugins,
+#sidemenu a .update-themes,
 #rightnow .reallynow {
         background-color: #464646;
         color: #fff;
@@ -526 +528 @@
 }
 
 #adminmenu li.current a #awaiting-mod,
-#adminmenu  li a.wp-has-current-submenu .update-plugins{
+#adminmenu  li a.wp-has-current-submenu .update-plugins,
+#adminmenu  li a.wp-has-current-submenu .update-themes {
         background-color: #464646;
         color: #fff;
         -moz-box-shadow: #fff 0 -1px 0;

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

@@ -1201 +1201 @@
 
 /* end side admin menu */
 
-/* comments/plugins bubble in menu */
+/* comments/plugins/themes bubble in menu */
 #adminmenu #awaiting-mod,
 #adminmenu span.update-plugins,
-#sidemenu li a span.update-plugins {
+#adminmenu span.update-themes,
+#sidemenu li a span.update-plugins,
+#sidemenu li a span.update-themes {
         position: absolute;
         font-family: Helvetica, Arial, sans-serif;
         font-size: 9px;
@@ -1220 +1222 @@
 
 #adminmenu li #awaiting-mod span,
 #adminmenu li span.update-plugins span,
-#sidemenu li a span.update-plugins span {
+#adminmenu li span.update-themes span,
+#sidemenu li a span.update-plugins span,
+#sidemenu li a span.update-themes span {
         display: block;
         padding: 0 6px;
 }

wp-admin/network/menu.php

@@ -20 +20 @@
 
 $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
 
-$menu[15] = array(__('Themes'), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div');
+$plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
+$update_themes = get_site_transient( 'update_themes' );
+if ( !empty($update_themes->response) )
+        $theme_update_count = count( $update_themes->response );
+$menu[15] = array(sprintf( __('Themes %s'), "<span class='update-themes count-$theme_update_count'><span class='theme-count'>" . number_format_i18n($theme_update_count) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div');
 $submenu['themes.php'][5]  = array( __('Themes'), 'manage_network_themes', 'themes.php' );
 $submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'manage_network_themes', 'theme-install.php' );
 $submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
 
-$plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
 $update_plugins = get_site_transient( 'update_plugins' );
 if ( !empty($update_plugins->response) )
         $plugin_update_count = count( $update_plugins->response );
@@ -37 +40 @@
 
 $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
 
-$update_themes = get_site_transient( 'update_themes' );
-if ( !empty($update_themes->response) )
-        $theme_update_count = count( $update_themes->response );
 $update_wordpress = get_core_updates( array('dismissed' => false) );
 if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
         $wordpress_update_count = 1;
@@ -56 +56 @@
 $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
 
 $menu[30] = array(sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div');
-$submenu[ 'upgrade.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'install_plugins',  'update-core.php');
+$submenu[ 'upgrade.php' ][10] = array( __( 'Updates' ), 'install_plugins',  'update-core.php');
 $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
 unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);