WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Side folding for the menu, first run, still needs colours, styling and perhaps different icons. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-10-14 05:10:16 +00:00
parent b5bdfd44d0
commit 7a2fb7dcf5
23 changed files with 282 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/admin-header.php
View File

@ -70,7 +70,6 @@ unset($hook_suffixes, $hook_suffix);
</head> </head>
<body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>"> <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
<div id="wpwrap"> <div id="wpwrap">
<div id="sidemenu-bg"><br /></div>
<div id="wpcontent"> <div id="wpcontent">
<div id="wphead"> <div id="wphead">
<?php <?php

6
wp-admin/css/colors-classic.css
View File

@ -5,7 +5,7 @@
border-color: #c6d9e9; border-color: #c6d9e9;
} }
#wpbody-content { #wphead {
border-color: #c6d9e9; border-color: #c6d9e9;
} }
@ -369,6 +369,10 @@ h3.dashboard-widget-title small a:hover {
font-weight: bold; font-weight: bold;
} }
#adminmenu li {
color: #14568A;
}
#adminmenu li.current { #adminmenu li.current {
background-color: #fff; background-color: #fff;
border-right-color: #fff; border-right-color: #fff;

4
wp-admin/css/colors-fresh.css
View File

@ -5,7 +5,7 @@
border-color: #c6d9e9; border-color: #c6d9e9;
} }
#wpbody-content { #wphead {
border-color: #c6d9e9; border-color: #c6d9e9;
} }
@ -782,7 +782,7 @@ table.diff .diff-addedline ins {
background-color: #99ff99; background-color: #99ff99;
} }
#adminmenu, #adminmenu li,
#att-info { #att-info {
background-color: #E4F2FD; background-color: #E4F2FD;
} }

7
wp-admin/css/global.css
View File

@ -7,9 +7,7 @@ div#wpbody {
} }
div#wpbody-content { div#wpbody-content {
margin-left: 137px; margin-left: 140px;
border-top-width: 1px;
border-top-style: solid;
padding-top: 10px; padding-top: 10px;
} }
@ -26,7 +24,8 @@ div#sidemenu-bg {
ul#adminmenu { ul#adminmenu {
float: left; float: left;
clear: left; clear: left;
width: 125px; /* + 10 padding */ margin: 10px 8px;
width: 135px; /* + 10 padding */
position: relative; position: relative;
} }

45
wp-admin/css/ie.css
View File

@ -4,11 +4,10 @@
padding-left: 23px; padding-left: 23px;
} }
#submenu li a.current { input.button, input.button-secondary, input.button-highlighted {
background:none; padding: 0;
border:none;
} }
/*
* html body.minwidth { * html body.minwidth {
_width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%"); _width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%");
} }
@ -16,6 +15,44 @@
* html #wpbody { * html #wpbody {
_width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%"); _width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%");
} }
*/
#adminmenu li.wp-has-submenu {
margin-top: 2px;
}
#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 {
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#adminmenu li.wp-menu-separator {
background-color: #fff;
height: 5px;
width: 1px;
line-height: 5px;
font-size: 5px;
padding: 0;
margin: 0;
}
* html #poststuff .postarea, * html #poststuff #titlediv { * html #poststuff .postarea, * html #poststuff #titlediv {
width: 95%; width: 95%;

BIN
wp-admin/images/menu/appearance.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
wp-admin/images/menu/comments.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
wp-admin/images/menu/home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 877 B

BIN
wp-admin/images/menu/links.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 765 B

BIN
wp-admin/images/menu/media.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
wp-admin/images/menu/pages.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
wp-admin/images/menu/plugins.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
wp-admin/images/menu/posts.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
wp-admin/images/menu/settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 661 B

BIN
wp-admin/images/menu/tools.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
wp-admin/images/menu/users.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 782 B

38
wp-admin/js/common.js
View File

@ -10,11 +10,6 @@ jQuery(document).ready( function() {
if ( ( 'undefined' != typeof wpAjax ) && jQuery.isFunction( wpAjax.validateForm ) ) { if ( ( 'undefined' != typeof wpAjax ) && jQuery.isFunction( wpAjax.validateForm ) ) {
jQuery('form.validate').submit( function() { return wpAjax.validateForm( jQuery(this) ); } ); jQuery('form.validate').submit( function() { return wpAjax.validateForm( jQuery(this) ); } );
} }
jQuery('a.no-crazy').click( function() {
alert( "This feature isn't enabled in this prototype." );
return false;
} );
}); });
/* /*
(function($) { (function($) {
@ -48,38 +43,5 @@ jQuery(document).ready( function() {
} }
}(jQuery)); }(jQuery));
*/ */
jQuery( function($) {
var menuToggle = function(ul, effect) {
if ( !effect ) {
effect = 'slideToggle';
}
ul[effect]().parent().toggleClass( 'wp-menu-open' );
$('#adminmenu li.wp-has-submenu').each(function(i, e) {
var v = $(e).hasClass('wp-menu-open') ? 'o' : 'c';
setUserSetting( 'm'+i, v );
});
return false;
};
$('#adminmenu li.wp-has-submenu').each(function(i, e) {
var v = getUserSetting( 'm'+i );
if ( $(e).hasClass('wp-has-current-submenu') ) return true; // leave the current parent open
if ( 'o' == v ) $(e).addClass('wp-menu-open');
else if ( 'c' == v ) $(e).removeClass('wp-menu-open');
});
$('#adminmenu li.wp-has-submenu > a').click( function() { return menuToggle( $(this).siblings('ul') ); } );
$('#dashmenu li.wp-has-submenu').bind( 'mouseenter mouseleave', function() { return menuToggle( $(this).children('ul'), 'toggle' ); } );
$('#favorite-actions').bind( 'mouseenter', function(){$('#favorite-action').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-action').hasClass('slideDown') ) { $('#favorite-action').slideDown('fast') }}, 300) } );
$('#favorite-actions').bind( 'mouseleave', function(){$('#favorite-action').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-action').hasClass('slideUp') ) { $('#favorite-action').slideUp('fast') }}, 500) } );
} );
//jQuery(function(){jQuery('#media-buttons a').tTips();}); //jQuery(function(){jQuery('#media-buttons a').tTips();});

79
wp-admin/js/menu.js Normal file
View File

@ -0,0 +1,79 @@
(function($){
adminMenu = {
init : function() {
$('#adminmenu a.wp-has-submenu').click( function() { return adminMenu.toggle( $(this).siblings('ul') ); } );
var li = document.createElement('li'); // temp
$(li).attr('id', 'menu-toggle').html('&laquo;&laquo;').click(function(){
if ( 'o' == getUserSetting( 'mfold' ) ) {
adminMenu.fold();
setUserSetting( 'mfold', 'f' );
$(this).html('&raquo;&raquo;');
} else {
adminMenu.fold(1);
setUserSetting( 'mfold', 'o' );
$(this).html('&laquo;&laquo;');
}
});
$('#adminmenu').prepend(li);
if ( 'o' == getUserSetting( 'mfold' ) ) {
$('#adminmenu li.wp-has-submenu').each(function(i, e) {
var v = getUserSetting( 'm'+i );
if ( $(e).hasClass('wp-has-current-submenu') ) return true; // leave the current parent open
if ( 'o' == v ) $(e).addClass('wp-menu-open');
else if ( 'c' == v ) $(e).removeClass('wp-menu-open');
});
} else {
this.fold();
$('#menu-toggle').html('&raquo;&raquo;');
}
},
toggle : function(ul, effect) {
if ( !effect )
effect = 'slideToggle';
ul[effect](150).parent().toggleClass( 'wp-menu-open' );
$('#adminmenu li.wp-has-submenu').each(function(i, e) {
var v = $(e).hasClass('wp-menu-open') ? 'o' : 'c';
setUserSetting( 'm'+i, v );
});
return false;
},
fold : function(off) {
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') ); } );
} else {
$('#adminmenu').addClass('folded');
$('#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,
interval: 100
});
}
}
};
$(document).ready(function(){adminMenu.init();});
})(jQuery);
jQuery( function($) {
$('#favorite-actions').bind( 'mouseenter', function(){$('#favorite-action').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-action').hasClass('slideDown') ) { $('#favorite-action').slideDown('fast') }}, 300) } );
$('#favorite-actions').bind( 'mouseleave', function(){$('#favorite-action').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-action').hasClass('slideUp') ) { $('#favorite-action').slideUp('fast') }}, 500) } );
// $('#dashmenu li.wp-has-submenu').bind( 'mouseenter mouseleave', function() { return adminMenu.toggle( $(this).children('ul'), 'toggle' ); } );
} );

33
wp-admin/menu-header.php
View File

@ -34,7 +34,7 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
global $self, $parent_file, $submenu_file, $plugin_page, $pagenow; global $self, $parent_file, $submenu_file, $plugin_page, $pagenow;
$first = true; $first = true;
// 0 = name, 1 = capability, 2 = file, 3 = class // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = image src
foreach ( $menu as $key => $item ) { foreach ( $menu as $key => $item ) {
$class = array(); $class = array();
if ( $first ) { if ( $first ) {
@ -51,26 +51,31 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
$class[] = 'current'; $class[] = 'current';
} }
if ( isset($item[3]) ) if ( isset($item[3]) && ! empty($item[3]) )
$class[] = $item[3]; $class[] = $item[3];
$class = $class ? ' class="' . join( ' ', $class ) . '"' : ''; $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
$id = isset($item[4]) && ! empty($item[4]) ? ' id="' . $item[4] . '"' : '';
$img = isset($item[5]) && ! empty($item[5]) ? '<img class="wp-menu-image" src="' . $item[5] . '" alt="" />' : '';
echo "\n\t<li$class>"; echo "\n\t<li$class$id>";
if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) { if ( false !== strpos($class, 'wp-menu-separator') ) {
echo '<br />';
} elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
echo "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>"; echo "$img<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
else else
echo "\n\t<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>"; echo "\n\t$img<a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
} else if ( current_user_can($item[1]) ) { } else if ( current_user_can($item[1]) ) {
$menu_hook = get_plugin_page_hook($item[2], 'admin.php'); $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) if ( file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) {
echo "\n\t<a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>"; echo "\n\t$img<a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
else } else {
echo "\n\t<a href='{$item[2]}'$class>{$item[0]}</a>"; echo "\n\t$img<a href='{$item[2]}'$class>{$item[0]}</a>";
}
} }
if ( !empty($submenu[$item[2]]) ) { if ( !empty($submenu[$item[2]]) ) {
@ -98,14 +103,14 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) { if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) {
if ( 'admin.php' == $pagenow || !file_exists(WP_PLUGIN_DIR . "/$parent_file") ) if ( 'admin.php' == $pagenow || !file_exists(WP_PLUGIN_DIR . "/$parent_file") )
echo "\n\t\t<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>"; echo "<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
else else
echo "\n\t\t<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>"; echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
} else { } else {
echo "\n\t\t<li$class><a href='{$sub_item[2]}'$class>{$sub_item[0]}</a></li>"; echo "<li$class><a href='{$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
} }
} }
echo "\n\t</ul>"; echo "</ul>";
} }
echo "</li>"; echo "</li>";
} }

30
wp-admin/menu.php
View File

@ -13,6 +13,8 @@
* 0: Menu item name * 0: Menu item name
* 1: Minimum level or capability required. * 1: Minimum level or capability required.
* 2: The URL of the item's file * 2: The URL of the item's file
* 3: Class
* 4: ID
* *
* @global array $menu * @global array $menu
* @name $menu * @name $menu
@ -22,46 +24,50 @@
$awaiting_mod = wp_count_comments(); $awaiting_mod = wp_count_comments();
$awaiting_mod = $awaiting_mod->moderated; $awaiting_mod = $awaiting_mod->moderated;
$menu[0] = array( __('Dashboard'), 'read', 'index.php', 'wp-menu-open' ); $menu[0] = array( __('Dashboard'), 'read', 'index.php', 'wp-menu-open', 'menu-dashboard', 'images/menu/home.png' );
$submenu['index.php'][5] = array( __('Overview'), 'read' , 'index.php' ); $submenu['index.php'][5] = array( __('Overview'), 'read' , 'index.php' );
$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', 'wp-menu-open' ); $menu[4] = array( '', 'read', '', 'wp-menu-separator' );
$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', 'wp-menu-open', 'menu-posts', 'images/menu/posts.png' );
$submenu['post-new.php'][5] = array( __('Add New'), 'edit_posts', 'post-new.php' ); $submenu['post-new.php'][5] = array( __('Add New'), 'edit_posts', 'post-new.php' );
//$submenu['post-new.php'][10] = array( __('Drafts'), 'edit_posts', 'edit-post-drafts.php' ); //$submenu['post-new.php'][10] = array( __('Drafts'), 'edit_posts', 'edit-post-drafts.php' );
$submenu['post-new.php'][15] = array( __('Edit'), 'edit_posts', 'edit.php' ); $submenu['post-new.php'][15] = array( __('Edit'), 'edit_posts', 'edit.php' );
$submenu['post-new.php'][20] = array( __('Tags'), 'manage_categories', 'edit-tags.php' ); $submenu['post-new.php'][20] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
$submenu['post-new.php'][25] = array( __('Categories'), 'manage_categories', 'categories.php' ); $submenu['post-new.php'][25] = array( __('Categories'), 'manage_categories', 'categories.php' );
$menu[10] = array( __('Media'), 'upload_files', 'media-new.php' ); $menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', 'menu-media', 'images/menu/media.png' );
$submenu['media-new.php'][5] = array( __('Add New'), 'upload_files', 'media-new.php'); $submenu['media-new.php'][5] = array( __('Add New'), 'upload_files', 'media-new.php');
$submenu['media-new.php'][10] = array( __('Edit'), 'upload_files', 'upload.php'); $submenu['media-new.php'][10] = array( __('Edit'), 'upload_files', 'upload.php');
$menu[15] = array( __('Links'), 'manage_links', 'link-add.php' ); $menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', 'menu-links', 'images/menu/links.png' );
$submenu['link-add.php'][5] = array( __('Add New'), 'manage_links', 'link-add.php' ); $submenu['link-add.php'][5] = array( __('Add New'), 'manage_links', 'link-add.php' );
$submenu['link-add.php'][10] = array( __('Edit'), 'manage_links', 'link-manager.php' ); $submenu['link-add.php'][10] = array( __('Edit'), 'manage_links', 'link-manager.php' );
$submenu['link-add.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' ); $submenu['link-add.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
$menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php' ); $menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', 'menu-pages', 'images/menu/pages.png' );
$submenu['page-new.php'][5] = array( __('Add New'), 'edit_pages', 'page-new.php' ); $submenu['page-new.php'][5] = array( __('Add New'), 'edit_pages', 'page-new.php' );
//$submenu['page-new.php'][10] = array( __('Drafts'), 'edit_pages', 'edit-page-drafts.php' ); //$submenu['page-new.php'][10] = array( __('Drafts'), 'edit_pages', 'edit-page-drafts.php' );
$submenu['page-new.php'][15] = array( __('Edit'), 'edit_pages', 'edit-pages.php' ); $submenu['page-new.php'][15] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
$menu[25] = array( __('Comments'), 'edit_posts', 'edit-comments.php' ); $menu[25] = array( __('Comments'), 'edit_posts', 'edit-comments.php', '', 'menu-comments', 'images/menu/comments.png' );
$submenu['edit-comments.php'][15] = array( __('Moderate'), 'edit_posts', 'edit-comments.php' ); $submenu['edit-comments.php'][15] = array( __('Moderate'), 'edit_posts', 'edit-comments.php' );
$menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php' ); $menu[29] = array( '', 'read', '', 'wp-menu-separator' );
$menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-appearance', 'images/menu/appearance.png' );
$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php'); $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
$submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php'); $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
$menu[35] = array( __('Plugins'), 'activate_plugins', 'plugins.php' ); $menu[35] = array( __('Plugins'), 'activate_plugins', 'plugins.php', '', 'menu-plugins', 'images/menu/plugins.png' );
$submenu['plugins.php'][15] = array(__('Add New'), 'install_plugins', 'plugin-install.php'); $submenu['plugins.php'][15] = array(__('Add New'), 'install_plugins', 'plugin-install.php');
$submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' ); $submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' );
$submenu['plugins.php'][10] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' ); $submenu['plugins.php'][10] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
if ( current_user_can('edit_users') ) if ( current_user_can('edit_users') )
$menu[40] = array(__('Users'), 'edit_users', 'users.php'); $menu[40] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-users', 'images/menu/users.png' );
else else
$menu[40] = array(__('Profile'), 'read', 'profile.php'); $menu[40] = array( __('Profile'), 'read', 'profile.php', '', 'menu-users', 'images/menu/users.png' );
if ( current_user_can('edit_users') ) { if ( current_user_can('edit_users') ) {
$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php. $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
@ -72,14 +78,14 @@ if ( current_user_can('edit_users') ) {
$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php'); $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
} }
$menu[45] = array(__('Tools'), 'manage_options', 'import.php'); $menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', 'menu-tools', 'images/menu/tools.png' );
$submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' ); $submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' );
$submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' ); $submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' );
$submenu['import.php'][15] = array( __('Press This'), 'publish_posts', 'press-this-landing.php' ); $submenu['import.php'][15] = array( __('Press This'), 'publish_posts', 'press-this-landing.php' );
if ( ! $is_opera ) if ( ! $is_opera )
$submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' ); $submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' );
$menu[50] = array(__('Settings'), 'manage_options', 'options-general.php'); $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-settings', 'images/menu/settings.png' );
$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php'); $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php'); $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php'); $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');

130
wp-admin/wp-admin.css
View File

@ -619,6 +619,8 @@ a#view-site-link {
#wphead { #wphead {
height: 58px; height: 58px;
border-bottom-width: 1px;
border-bottom-style: solid;
} }
#wphead a, #dashmenu a, #adminmenu a, #sidemenu a, #taglist a, #catlist a, #show-settings a { #wphead a, #dashmenu a, #adminmenu a, #sidemenu a, #taglist a, #catlist a, #show-settings a {
@ -634,7 +636,7 @@ a#view-site-link {
} }
#logo50 { #logo50 {
margin: 8px; margin: 4px 8px 0;
position: absolute; position: absolute;
} }
@ -673,10 +675,6 @@ ul#adminmenu li.write-new-button a {
padding: 0; padding: 0;
} }
#adminmenu li.wp-menu-open .wp-submenu {
display: block;
}
#dashmenu { #dashmenu {
margin: 0 0 0 12px; margin: 0 0 0 12px;
background: url(images/logo-ghost.png) no-repeat center left; background: url(images/logo-ghost.png) no-repeat center left;
@ -768,59 +766,122 @@ ul#adminmenu li.write-new-button a {
margin-left: 5px; margin-left: 5px;
} }
/* side admin menu */
#adminmenu { #adminmenu {
margin: 0; margin: 0;
padding: 10px 0 0 10px; padding: 0;
list-style: none; list-style: none;
z-index: 1000;
} }
#adminmenu li.wp-menu-open .wp-submenu {
display: block;
}
/*
#adminmenu a {
outline: none;
}
#adminmenu a:active,
#adminmenu a:selected {
color: #D54E21;
}
*/
#adminmenu li { #adminmenu li {
margin-bottom: 10px; margin: 0;
padding: 0;
} }
#adminmenu li.current { #adminmenu li.wp-has-submenu {
border-width: 1px; border: 1px solid #C6D9E9;
border-style: solid; width: 125px;
position: relative; min-height: 24px;
right: -1px;
padding: 2px 0;
}
#adminmenu li .wp-submenu {
margin-top: 4px; margin-top: 4px;
} }
#adminmenu li .wp-submenu li { #adminmenu li .wp-submenu {
padding: 3px 0 3px 1px; margin: 0;
margin-bottom: 0; position: relative;
z-index: 1001;
} }
#adminmenu li .wp-submenu li.current { #adminmenu ul.wp-submenu li {
padding: 2px 0; padding: 0;
margin: 0;
border-top: 1px dotted #DDDDDD;
background-color: #F3FCFB;
} }
#adminmenu li.wp-has-submenu > a { #adminmenu .wp-menu-image {
background-image: url(images/menu-closed.png); float: left;
background-repeat: no-repeat; padding: 4px 6px 0 4px;
background-position: left center;
} }
#adminmenu li.wp-menu-open > a { #adminmenu ul.wp-submenu li.current {
background-image: url(images/menu-open.png); background-color: #fff;
} }
#adminmenu a { #adminmenu a {
font-size: 13px; font-size: 13px !important;
padding: 0 7px 0 36px; padding: 5px 4px 6px 0;
line-height: 1.1; line-height: 13px;
display: block; display: block;
text-indent: -18px;
} }
#adminmenu li.current a { #adminmenu .wp-submenu a {
padding-left: 34px; margin: 0 0 0 12px;
} }
#adminmenu .wp-menu-separator {
background-color: transparent;
height: 8px;
padding: 0;
margin: 0;
}
#adminmenu.folded .wp-submenu {
position: absolute;
margin: -25px 0 0 30px;
zIndex: 999;
width: 125px;
border-width: 1px;
border-style: solid;
border-color: #C6D9E9;
}
#adminmenu.folded .wp-submenu li.wp-first-item {
border-top: 0 none;
}
#adminmenu.folded .wp-submenu a {
margin: 0 0 0 10px;
}
#adminmenu.folded a.wp-has-submenu {
margin-left: 40px;
}
#adminmenu.folded li.wp-has-submenu {
width: 24px;
overflow: hidden;
}
#adminmenu #menu-toggle {
width: 24px;
cursor: pointer;
text-align: center;
border: 1px solid #C6D9E9;
height: 12px;
line-height: 10px;
}
/* end side admin menu */
/* 2.6 */
#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
position: absolute; position: absolute;
margin-top: 0.2em; margin-top: 0.2em;
@ -835,6 +896,9 @@ ul#adminmenu li.write-new-button a {
display: none; display: none;
} }
.post-com-count-wrapper { .post-com-count-wrapper {
min-width: 22px; min-width: 22px;
} }

13
wp-includes/js/hoverIntent.js Normal file
View File

@ -0,0 +1,13 @@
/**
* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+
* <http://cherne.net/brian/resources/jquery.hoverIntent.html>
*
* hoverIntent is currently available for use in all personal or commercial
* projects under both MIT and GPL licenses. This means that you can choose
* the license that best suits your project, and use it accordingly.
*
* @param f onMouseOver function || An object with configuration options
* @param g onMouseOut function || Nothing (use configuration options object)
* @author Brian Cherne <brian@cherne.net>
*/
(function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY;};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))<cfg.sensitivity){$(ob).unbind("mousemove",track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev]);}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev]);};var handleHover=function(e){var p=(e.type=="mouseover"?e.fromElement:e.toElement)||e.relatedTarget;while(p&&p!=this){try{p=p.parentNode;}catch(e){p=this;}}if(p==this){return false;}var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);}if(e.type=="mouseover"){pX=ev.pageX;pY=ev.pageY;$(ob).bind("mousemove",track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}}else{$(ob).unbind("mousemove",track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob);},cfg.timeout);}}};return this.mouseover(handleHover).mouseout(handleHover);};})(jQuery);

6
wp-includes/script-loader.php
View File

@ -44,7 +44,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->base_url = $guessurl; $scripts->base_url = $guessurl;
$scripts->default_version = get_bloginfo( 'version' ); $scripts->default_version = get_bloginfo( 'version' );
$scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'user-settings'), '20081001' ); $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'user-settings', 'menu'), '20081013' );
$scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' ); $scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
$scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20080823' ); $scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20080823' );
@ -283,6 +283,10 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20080925' ); $scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20080925' );
$scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081008' ); $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081008' );
$scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20070327' );
$scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081013' );
} }
} }