From 546ef3ed157defa7efa38360e999f84bd64c79db Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 15 Oct 2008 06:54:25 +0000
Subject: [PATCH] Admin menu: add generic icon, fix hover in IE, speed up
 response timing

git-svn-id: http://svn.automattic.com/wordpress/trunk@9182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/colors-fresh.css    |   9 +++++---
 wp-admin/css/ie.css              |  37 +++++++++++++++++--------------
 wp-admin/images/menu/generic.png | Bin 0 -> 896 bytes
 wp-admin/includes/plugin.php     |   7 ++++--
 wp-admin/js/menu.js              |  15 +++++++------
 wp-admin/menu.php                |   2 ++
 wp-admin/wp-admin.css            |  24 +++++++++++---------
 7 files changed, 54 insertions(+), 40 deletions(-)
 create mode 100644 wp-admin/images/menu/generic.png

diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 761d8965a..1820f31f4 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -355,17 +355,20 @@ h3.dashboard-widget-title small a:hover {
 }
 
 /* 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;
 	border-bottom-color: #fff;
 	color: #d54e21;
 }
 
+#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;
 }
 
 #adminmenu li a #awaiting-mod {
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index c3de5a3e4..f848fcabe 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -21,39 +21,42 @@ input.button, input.button-secondary, input.button-highlighted {
 	z-index: 1;
 }
 
+#adminmenu.folded .wp-submenu {
+	margin: -1px 0 0 4px;
+}
+
 #adminmenu li.wp-has-submenu {
-	margin-top: 2px;
+	margin: 2px 0;
 }
 
 #adminmenu.folded li.wp-has-submenu {
 	height: 24px;
 }
 
-* 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;
 	line-height: 20px;
 }
 
-* 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;
 }
 
 
diff --git a/wp-admin/images/menu/generic.png b/wp-admin/images/menu/generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d4bb27ee7c75a45ca56b6c7013516ebeeb98094
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009=Nkl<ZIE`hK
zTWphc0L6d*@7AyVdRa?1HrePdIE)uC1PpB2FinOrDiH&2PH>Ci!4TiXx4oDU6ClP!
z875x12$6t^5EC<)iwVP$n2f}^WTK<aU9v&PTH3C+uV4Q@7>F6?^_=s2I!8z;S*a>l
zPwU#2>h_x2U<(2g3#s_@tvj(~;p`tPv*P~%uin+%@$!ZbJ70~yRv)SNxC{e?pj0X{
zH$9gh`eEeK@TK4SGxoQW4*^2Hp0>RQI?r!u-@K+=s$knTj#B|ZRaJCDM>iBkuaC~3
z`t)+w-SnBO4*-_d)wt`Ot+9=pH`ZnDWpOGMq=W;#+Ytf=PF@8eQ4|G#z{~G9#%_Q2
zMXWt*pSz_2v^*I)6kHvwyE*YE@Ah@FD(K_q*iC9{d<Y>}*R+c5+ge#lWjTIwh^p$U
z)sJoneFW^$ylPj=(>vDe`X@d`zF^~aX+-M7^zI2WJ(mC}d3$#o0EJ?KnVA_(mqDP;
z-04-j)@!P}^6b4#(#+>Flx&Beu1)Y*YXhgxUE$36VF0>c@1XC^9So05u&}UzuBnvl
zqM>@q&uL}Njw~)N;x<fv8Ty=1(8u4?^L+iykL2=25P}nD2Z^>l#s0TCh;CiS?tT4~
z9UEM-Nppn4;$i}qrr|gaj#EKONwHWYUnn4iKoJrtC3e}NSS*oDrpOm_*p(`&sD?G=
z@mRP`7msi0=CiK`X>6#ax93H4RiG-cue+1x#zz=9afKINc@M`ag9M?w<C@gH*9_Nk
z-qgx&-GJxY*MkCmdtag>x(SJ-DN+Z@f8HmSg`!A=Y7}khA5n6%1M!ODzu+=0EX&QE
zM2fNTI7g2S5)KEb2?sfP>@s8Hac(D)csy=Q)1;zSeV>~>{+EzaVm@)Oq0UOhf+qD6
z@Oph%mY0tY?MDc~`~6?Cyu3^{n?_a~QaNXSE+1|yj31eLFlEoC51xtm3Kt^PzO|uH
zkU$`SZnzKvoN}3TI!$tEiTJ|Z*{O{6#`5Ul7=UvB6uBFRe~mlAXuP1Fa&$8j2m}ZP
z`~-b|{60U9W@IOG;`F2wj@~an^v3%#cOGf3_UYUF9=!z+>AW3JWbEsOiw7rHX8#4i
Wa${nGd(##G0000<MNUMnLSTYMiLZ13

literal 0
HcmV?d00001

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 05fd509fa..49dc6294e 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -492,7 +492,7 @@ function uninstall_plugin($plugin) {
 // Menu
 //
 
-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;
 
 	$file = plugin_basename( $file );
@@ -503,7 +503,10 @@ function add_menu_page( $page_title, $menu_title, $access_level, $file, $functio
 	if (!empty ( $function ) && !empty ( $hookname ))
 		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;
 }
diff --git a/wp-admin/js/menu.js b/wp-admin/js/menu.js
index 1c841d167..82f56c622 100644
--- a/wp-admin/js/menu.js
+++ b/wp-admin/js/menu.js
@@ -3,6 +3,7 @@
 adminMenu = {
 		
 	init : function() {
+		$('#adminmenu a').attr('tabindex', '10');
 		$('#adminmenu a.wp-has-submenu').click( function() { return adminMenu.toggle( $(this).siblings('ul') ); } );
 		
 		var li = document.createElement('li'); // temp
@@ -51,18 +52,18 @@ adminMenu = {
 		if (off) {
 			$('#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
 			});
 		}
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index b14133bfd..b8cc8ae46 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -95,6 +95,8 @@ $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '',
 	$submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
 	$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'; 
 $_wp_real_parent_file['edit.php'] = 'post-new.php';
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 900322996..82c4a792e 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -488,7 +488,7 @@ div.nav {
 	border-style: solid;
 }
 
-.page-numbers.current {
+#tablenav-pages .page-numbers.current {
 	font-weight: bold;
 	border-width: 1px;
 	border-style: solid;
@@ -677,7 +677,6 @@ ul#adminmenu li.write-new-button a {
 
 /* side admin menu */
 #adminmenu {
-	margin: 0;
 	padding: 0;
 	list-style: none;
 }
@@ -724,7 +723,7 @@ ul#adminmenu li.write-new-button a {
 
 #adminmenu .wp-menu-image {
 	float: left;
-	padding: 4px 6px 0 4px;
+	padding: 4px 4px 0;
 }
 
 #adminmenu ul.wp-submenu li.current {
@@ -732,32 +731,35 @@ ul#adminmenu li.write-new-button a {
 }
 
 #adminmenu a {
-	font-size: 13px !important;
-	padding: 5px 4px 6px 0;
-	line-height: 13px;
 	display: block;
+	font-size: 13px !important;
+	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;
 }
 
 #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;
 	border-style: solid;
 	
 
+	background-color: #fff;
 	border-color: #C6D9E9;
 }
 
@@ -766,7 +768,7 @@ ul#adminmenu li.write-new-button a {
 }
 
 #adminmenu.folded .wp-submenu a {
-	margin: 0 0 0 10px;
+	padding-left: 10px;
 }
 
 #adminmenu.folded a.wp-has-submenu {