{$box['title']}
\n"; + echo "{$box['title']}
\n"; echo '' . "\n";
call_user_func($box['callback'], $object, $box);
echo "
\n";
diff --git a/wp-admin/js/menu.js b/wp-admin/js/menu.js
index e5119f821f..cfed055fe8 100644
--- a/wp-admin/js/menu.js
+++ b/wp-admin/js/menu.js
@@ -4,8 +4,14 @@ adminMenu = {
init : function() {
$('#adminmenu a').attr('tabindex', '10');
- $('#adminmenu div.wp-menu-toggle').click( function() { return adminMenu.toggle( $(this).siblings('ul') ); } );
- $('#adminmenu li.wp-has-submenu img.wp-menu-image').click( function() { window.location = $(this).siblings('a.wp-has-submenu')[0].href; } );
+ $('#adminmenu div.wp-menu-toggle').each( function() {
+ if ( $(this).siblings('.wp-submenu').length )
+ $(this).click(function(){ adminMenu.toggle( $(this).siblings('.wp-submenu') ); });
+ else
+ $(this).hide();
+ });
+ $('#adminmenu li.menu-top .wp-menu-image').click( function() { window.location = $(this).siblings('a.menu-top')[0].href; } );
+ this.favorites();
$('.wp-menu-separator').click(function(){
if ( $('#adminmenu').hasClass('folded') ) {
@@ -34,11 +40,9 @@ adminMenu = {
});
},
- toggle : function(ul, effect) {
- if ( !effect )
- effect = 'slideToggle';
+ toggle : function(el) {
- ul[effect](150).parent().toggleClass( 'wp-menu-open' );
+ el['slideToggle'](150, function(){el.css('display','');}).parent().toggleClass( 'wp-menu-open' );
$('#adminmenu li.wp-has-submenu').each(function(i, e) {
var v = $(e).hasClass('wp-menu-open') ? 'o' : 'c';
@@ -51,39 +55,38 @@ adminMenu = {
fold : function(off) {
if (off) {
$('#adminmenu').removeClass('folded');
- $('#adminmenu li.wp-submenu-head').hide();
- $('#adminmenu a.wp-has-submenu, #adminmenu .wp-menu-open .wp-submenu, #adminmenu div.wp-menu-toggle').show();
- $('#adminmenu li.wp-has-submenu').unbind().css('width', '');
- this.restoreMenuState();
+ $('#adminmenu li.wp-has-submenu').unbind();
} else {
$('#adminmenu').addClass('folded');
- $('#adminmenu a.wp-has-submenu, #adminmenu .wp-submenu, #adminmenu div.wp-menu-toggle').hide();
- $('#adminmenu li.wp-submenu-head').show();
- $('#adminmenu li.wp-has-submenu').css({'width':'28px'}).hoverIntent({
+ $('#adminmenu li.wp-has-submenu').hoverIntent({
over: function(e){
var m = $(this).find('.wp-submenu'), t = e.clientY, H = $(window).height(), h = m.height(), o;
if ( (t+h+10) > H ) {
o = (t+h+10) - H;
- m.css({'marginTop':'-'+o+'px'})
+ m.css({'marginTop':'-'+o+'px'});
+ } else if ( m.css('marginTop') ) {
+ m.css({'marginTop':''})
}
- m.show();
+ m.addClass('sub-open');
},
- out: function(){ $(this).find('.wp-submenu').hide(); },
+ out: function(){ $(this).find('.wp-submenu').removeClass('sub-open'); },
timeout: 220,
sensitivity: 8,
interval: 100
});
+
}
+ },
+
+ favorites : function() {
+ $('#favorite-inside').width($('#favorite-actions').width()-4);
+ $('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } );
+
+ $('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } );
}
};
-$(document).ready(function(){
- adminMenu.init();
+$(document).ready(function(){adminMenu.init();});
- $('#favorite-inside').width($('#favorite-actions').width()-4);
- $('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } );
-
- $('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } );
-});
})(jQuery);
diff --git a/wp-admin/js/postbox.js b/wp-admin/js/postbox.js
index 45a9dd6248..61638e7a91 100644
--- a/wp-admin/js/postbox.js
+++ b/wp-admin/js/postbox.js
@@ -1,7 +1,7 @@
(function($) {
postboxes = {
add_postbox_toggles : function(page,args) {
- $('.postbox h3').click( function() {
+ $('.postbox h3, .postbox .handlediv').click( function() {
$($(this).parent().get(0)).toggleClass('closed');
postboxes.save_state(page);
} );
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index c987b92b01..8cdc6a8dcb 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -57,7 +57,13 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
$id = isset($item[5]) && ! empty($item[5]) ? ' id="' . $item[5] . '"' : '';
- $img = isset($item[6]) && ! empty($item[6]) ? '