Ticket #21019: 21019.2.diff

wp-admin/includes/plugin.php

@@ -902 +902 @@
         if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
                 add_action( $hookname, $function );
 
-        if ( empty($icon_url) )
-                $icon_url = esc_url( admin_url( 'images/generic.png' ) );
-        else
+        if ( empty($icon_url) ) {
+                $icon_url = 'none';
+                $icon_class = 'menu-icon-generic ';
+        } else {
                 $icon_url = set_url_scheme( $icon_url );
+                $icon_class = '';
+        }
 
-        $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+        $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
 
         if ( null === $position )
                 $menu[] = $new_menu;

wp-admin/css/colors-fresh.css

@@ -1043 +1043 @@
 .icon16.icon-settings,
 .menu-icon-settings div.wp-menu-image,
 .icon16.icon-site,
-.menu-icon-site div.wp-menu-image {
+.menu-icon-site div.wp-menu-image,
+.icon16.icon-generic,
+.menu-icon-generic div.wp-menu-image {
         background-image: url('../images/menu.png?ver=20120201');
 }
 
@@ -1178 +1180 @@
 #adminmenu .menu-icon-site.current div.wp-menu-image {
         background-position: -359px -1px;
 }
+
+.icon16.icon-generic,
+#adminmenu .menu-icon-generic div.wp-menu-image {
+        background-position: -389px -33px;
+}
+
+#adminmenu .menu-icon-generic:hover div.wp-menu-image,
+#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-generic.current div.wp-menu-image {
+        background-position: -389px -1px;
+}
+
 /* end menu and screen icons */
 
 /* Screen Icons */
@@ -1211 +1225 @@
 .icon32.icon-settings,
 #icon-options-general,
 .icon32.icon-site,
-#icon-ms-admin {
+#icon-ms-admin,
+.icon32.icon-generic {
         background-image: url(../images/icons32.png?ver=20111206);
 }
 
@@ -1282 +1297 @@
         background-position: -659px -5px;
 }
 
+.icon32.icon-generic {
+        background-position: -???px -5px;
+}
+
 /* end screen icons */
 
 /* Diff */
@@ -1952 +1971 @@
         .icon32.icon-settings,
         #icon-options-general,
         .icon32.icon-site,
-        #icon-ms-admin {
+        #icon-ms-admin,
+        .icon32.icon-generic {
                 background-image: url("../images/icons32-2x.png?ver=20120916");
                 background-size: 708px 45px;
         }
@@ -1980 +2000 @@
         .icon16.icon-settings,
         .menu-icon-settings div.wp-menu-image,
         .icon16.icon-site,
-        .menu-icon-site div.wp-menu-image {
+        .menu-icon-site div.wp-menu-image,
+        .icon16.icon-generic,
+        .menu-icon-generic div.wp-menu-image {
                 background-image: url("../images/menu-2x.png?ver=20120916");
                 background-size: 390px 64px;
         }

wp-admin/css/colors-classic.css

@@ -1087 +1087 @@
 .icon16.icon-settings,
 .menu-icon-settings div.wp-menu-image,
 .icon16.icon-site,
-.menu-icon-site div.wp-menu-image {
+.menu-icon-site div.wp-menu-image,
+.icon16.icon-generic,
+.menu-icon-generic div.wp-menu-image {
         background-image: url('../images/menu-vs.png?ver=20120201');
 }
 
@@ -1222 +1224 @@
 #adminmenu .menu-icon-site.current div.wp-menu-image {
         background-position: -359px -1px;
 }
+
+.icon16.icon-generic,
+#adminmenu .menu-icon-generic div.wp-menu-image {
+        background-position: -389px -33px;
+}
+
+#adminmenu .menu-icon-generic:hover div.wp-menu-image,
+#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-generic.current div.wp-menu-image {
+        background-position: -389px -1px;
+}
 /* end menu and screen icons */
 
 /* Screen Icons */
@@ -1255 +1268 @@
 .icon32.icon-settings,
 #icon-options-general,
 .icon32.icon-site,
-#icon-ms-admin {
+#icon-ms-admin,
+.icon32.icon-generic {
         background-image: url(../images/icons32-vs.png?ver=20111206);
 }
 
@@ -1326 +1340 @@
         background-position: -659px -5px;
 }
 
+.icon32.icon-generic {
+        background-position: -???px -5px;
+}
+
 /* end screen icons */
 
 /* Diff */
@@ -2029 +2047 @@
 
         #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
         #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
-        .nav-menus-php .item-edit:hover,        
+        .nav-menus-php .item-edit:hover,
         .sidebar-name:hover .sidebar-name-arrow,
         .rtl #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
         .rtl #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
@@ -2074 +2092 @@
         .icon32.icon-settings,
         #icon-options-general,
         .icon32.icon-site,
-        #icon-ms-admin {
+        #icon-ms-admin,
+        .icon32.icon-generic {
                 background-image: url("../images/icons32-vs-2x.png?ver=20120916");
                 background-size: 708px 45px;
         }
@@ -2102 +2121 @@
         .icon16.icon-settings,
         .menu-icon-settings div.wp-menu-image,
         .icon16.icon-site,
-        .menu-icon-site div.wp-menu-image {
-                background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
+        .menu-icon-site div.wp-menu-image,
+        .icon16.icon-generic,
+        .menu-icon-generic div.wp-menu-image {
+                background-image: url("../images/menu-vs-2x.png?ver=20120916");
                 background-size: 390px 64px;
         }