Changeset 9182

Timestamp:

10/15/2008 06:54:25 AM (18 years ago)

Author:

azaozz

Message:

Admin menu: add generic icon, fix hover in IE, speed up response timing

Location:

trunk/wp-admin

Files:

• css/colors-fresh.css (modified) (2 diffs)
• css/ie.css (modified) (3 diffs)
• images/menu/generic.png (added)
• includes/plugin.php (modified) (2 diffs)
• js/menu.js (modified) (2 diffs)
• menu.php (modified) (1 diff)
• wp-admin.css (modified) (7 diffs)

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

@@ -356 +356 @@
 
 /* Because we don't want visited on these links */
-#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
+body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
     background-color: #fff;
     border-color: #c6d9e9;
@@ -363 +363 @@
 }
 
+#adminmenu li.current a, #sidemenu a.current {
+    background-color: #fff;
+    color: #d54e21;
+}
+
 #adminmenu li.current {
     background-color: #fff;
-    border-color: #c6d9e9;
-    border-right-color: #fff;
 }
 

trunk/wp-admin/css/ie.css

@@ -22 +22 @@
 }
 
+#adminmenu.folded .wp-submenu {
+    margin: -1px 0 0 4px;
+}
+
 #adminmenu li.wp-has-submenu {
-    margin-top: 2px;
+    margin: 2px 0;
 }
 
@@ -30 +34 @@
 }
 
-* html #wpcontent #adminmenu ul.wp-submenu li {
-    margin: 0;
-    padding: 0;
-}
-
-* html #wpcontent #adminmenu ul.wp-submenu a {
+#wpcontent #adminmenu ul.wp-submenu a {
     padding: 2px 4px 2px 8px;
     margin: 0;
@@ -41 +40 @@
 }
 
-* html #wpcontent #adminmenu ul.wp-submenu li a.current,
-* html #wpcontent #adminmenu ul.wp-submenu li.current {
-    border: 0;
-    background-color: #fff;
+ul.wp-submenu, ul.wp-submenu li, ul.wp-submenu a {
+    display: block;
+    zoom: 100%;
+}
+
+* html #wpcontent #adminmenu {
+    margin: 8px 4px;
+}
+
+#wpcontent #adminmenu ul.wp-submenu li {
+    padding: 0;
 }
 
 ul#adminmenu li.wp-menu-separator {
     background-color: #fff;
-    height: 5px;
-    width: 1px;
-    line-height: 5px;
-    font-size: 5px;
-    padding: 0;
-    margin: 0;
+    height: 3px;
+    line-height: 3px;
+    font-size: 3px;
 }
 

trunk/wp-admin/includes/plugin.php

@@ -493 +493 @@
 //
 
-function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
+function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '' ) {
     global $menu, $admin_page_hooks;
 
@@ -504 +504 @@
         add_action( $hookname, $function );
 
-    $menu[] = array ( $menu_title, $access_level, $file, $page_title, $hookname, $hookname );
+    if ( empty($icon_url) )
+        $icon_url = 'images/menu/generic.png';
+    
+    $menu[] = array ( $menu_title, $access_level, $file, $page_title, $hookname, $hookname, $icon_url );
 
     return $hookname;

trunk/wp-admin/js/menu.js

@@ -4 +4 @@
         
     init : function() {
+        $('#adminmenu a').attr('tabindex', '10');
         $('#adminmenu a.wp-has-submenu').click( function() { return adminMenu.toggle( $(this).siblings('ul') ); } );
         
@@ -52 +53 @@
             $('#wpbody-content').css('marginLeft', '140px');
             $('#adminmenu').removeClass('folded');
-            $('#adminmenu li.wp-has-submenu').unbind().css('width', '125px');
-            $('#adminmenu a.wp-has-submenu').unbind().click( function() { return adminMenu.toggle( $(this).siblings('ul') ); } );
+            $('#adminmenu a.wp-has-submenu').show();
+            $('#adminmenu li.wp-has-submenu').unbind().css('width', '');
         } else {
             $('#adminmenu').addClass('folded');
+            $('#adminmenu a.wp-has-submenu').hide();
             $('#adminmenu .wp-submenu').hide();
             $('#wpbody-content').css('marginLeft', '38px');
-            $('#adminmenu a.wp-has-submenu').unbind().click(function(){return false;});
             $('#adminmenu li.wp-has-submenu').css({'width':'24px'}).hoverIntent({
-                over: function(){ $(this).find('.wp-submenu').show(100); },
-                out: function(){ $(this).find('.wp-submenu').hide(100); },
-                timeout: 150,
-                sensitivity: 6,
+                over: function(){ $(this).find('.wp-submenu').show(); },
+                out: function(){ $(this).find('.wp-submenu').hide(); },
+                timeout: 220,
+                sensitivity: 8,
                 interval: 100
             });

trunk/wp-admin/menu.php

@@ -96 +96 @@
     $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
 
+$menu[55] = array( '', 'read', '', '', 'wp-menu-separator' );
+
 // Back-compat for old top-levels
 $_wp_real_parent_file['post.php'] = 'post-new.php'; 

trunk/wp-admin/wp-admin.css

@@ -489 +489 @@
 }
 
-.page-numbers.current {
+#tablenav-pages .page-numbers.current {
     font-weight: bold;
     border-width: 1px;
@@ -678 +678 @@
 /* side admin menu */
 #adminmenu {
-    margin: 0;
     padding: 0;
     list-style: none;
@@ -725 +724 @@
 #adminmenu .wp-menu-image {
     float: left;
-    padding: 4px 6px 0 4px;
+    padding: 4px 4px 0;
 }
 
@@ -733 +732 @@
 
 #adminmenu a {
+    display: block;
     font-size: 13px !important;
-    padding: 5px 4px 6px 0;
-    line-height: 13px;
-    display: block;
+    line-height: 18px;
+    padding: 3px 4px;
 }
 
 #adminmenu .wp-submenu a {
-    margin: 0 0 0 12px;
+    margin: 0;
+    padding-left: 12px;
 }
 
 #adminmenu .wp-menu-separator {
     background-color: transparent;
-    height: 8px;
+    height: 6px;
+    width: 1px;
     padding: 0;
     margin: 0;
@@ -752 +753 @@
 #adminmenu.folded .wp-submenu {
     position: absolute;
-    margin: -25px 0 0 30px;
-    zIndex: 999;
+    margin: -1px 0 0 30px;
+    z-index: 999;
     width: 125px;
     border-width: 1px;
@@ -759 +760 @@
     
 
+    background-color: #fff;
     border-color: #C6D9E9;
 }
@@ -767 +769 @@
 
 #adminmenu.folded .wp-submenu a {
-    margin: 0 0 0 10px;
+    padding-left: 10px;
 }