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

Fix menu icons for custom post types. Fixes #12992, props wmrom. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-16 03:29:34 +00:00
parent c4abc1c875
commit f9f8d61872
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

12
wp-admin/css/colors-classic.dev.css
View File

@ -1151,12 +1151,12 @@ table.widefat .spam a:hover,
background: transparent url('../images/menu-vs.png') no-repeat scroll -61px -1px; background: transparent url('../images/menu-vs.png') no-repeat scroll -61px -1px;
} }
#adminmenu .menu-icon-posts div.wp-menu-image { #adminmenu .menu-icon-post div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -272px -33px; background: transparent url('../images/menu-vs.png') no-repeat scroll -272px -33px;
} }
#adminmenu .menu-icon-posts:hover div.wp-menu-image, #adminmenu .menu-icon-post:hover div.wp-menu-image,
#adminmenu .menu-icon-posts.wp-has-current-submenu div.wp-menu-image { #adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -272px -1px; background: transparent url('../images/menu-vs.png') no-repeat scroll -272px -1px;
} }
@ -1178,12 +1178,12 @@ table.widefat .spam a:hover,
background: transparent url('../images/menu-vs.png') no-repeat scroll -91px -1px; background: transparent url('../images/menu-vs.png') no-repeat scroll -91px -1px;
} }
#adminmenu .menu-icon-pages div.wp-menu-image { #adminmenu .menu-icon-page div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -151px -33px; background: transparent url('../images/menu-vs.png') no-repeat scroll -151px -33px;
} }
#adminmenu .menu-icon-pages:hover div.wp-menu-image, #adminmenu .menu-icon-page:hover div.wp-menu-image,
#adminmenu .menu-icon-pages.wp-has-current-submenu div.wp-menu-image { #adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -151px -1px; background: transparent url('../images/menu-vs.png') no-repeat scroll -151px -1px;
} }

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

File diff suppressed because one or more lines are too long

12
wp-admin/css/colors-fresh.dev.css
View File

@ -1145,12 +1145,12 @@ table.widefat .spam a:hover,
background: transparent url('../images/menu.png') no-repeat scroll -61px -1px; background: transparent url('../images/menu.png') no-repeat scroll -61px -1px;
} }
#adminmenu .menu-icon-posts div.wp-menu-image { #adminmenu .menu-icon-post div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -272px -33px; background: transparent url('../images/menu.png') no-repeat scroll -272px -33px;
} }
#adminmenu .menu-icon-posts:hover div.wp-menu-image, #adminmenu .menu-icon-post:hover div.wp-menu-image,
#adminmenu .menu-icon-posts.wp-has-current-submenu div.wp-menu-image { #adminmenu .menu-icon-post.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -272px -1px; background: transparent url('../images/menu.png') no-repeat scroll -272px -1px;
} }
@ -1172,12 +1172,12 @@ table.widefat .spam a:hover,
background: transparent url('../images/menu.png') no-repeat scroll -91px -1px; background: transparent url('../images/menu.png') no-repeat scroll -91px -1px;
} }
#adminmenu .menu-icon-pages div.wp-menu-image { #adminmenu .menu-icon-page div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -151px -33px; background: transparent url('../images/menu.png') no-repeat scroll -151px -33px;
} }
#adminmenu .menu-icon-pages:hover div.wp-menu-image, #adminmenu .menu-icon-page:hover div.wp-menu-image,
#adminmenu .menu-icon-pages.wp-has-current-submenu div.wp-menu-image { #adminmenu .menu-icon-page.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -151px -1px; background: transparent url('../images/menu.png') no-repeat scroll -151px -1px;
} }

18
wp-admin/menu.php
View File

@ -79,7 +79,7 @@ if ( is_multisite() || is_super_admin() ) {
$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-posts', 'menu-posts', 'div' ); $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
$submenu['edit.php'][5] = array( __('Edit'), 'edit_posts', 'edit.php' ); $submenu['edit.php'][5] = array( __('Edit'), 'edit_posts', 'edit.php' );
/* translators: add new post */ /* translators: add new post */
$submenu['edit.php'][10] = array( _x('Add New', 'post'), 'edit_posts', 'post-new.php' ); $submenu['edit.php'][10] = array( _x('Add New', 'post'), 'edit_posts', 'post-new.php' );
@ -104,7 +104,7 @@ $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-to
$submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' ); $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' ); $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-pages', 'menu-pages', 'div' ); $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'div' );
$submenu['edit.php?post_type=page'][5] = array( __('Edit'), 'edit_pages', 'edit.php?post_type=page' ); $submenu['edit.php?post_type=page'][5] = array( __('Edit'), 'edit_pages', 'edit.php?post_type=page' );
/* translators: add new page */ /* translators: add new page */
$submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' ); $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
@ -114,16 +114,22 @@ $menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='c
$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) { foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) {
$ptype_obj = get_post_type_object($ptype); $ptype_obj = get_post_type_object( $ptype );
$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first. $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : $_wp_last_object_menu++; // If we're to use $_wp_last_object_menu, increment it first.
$menu_icon = is_string($ptype_obj->menu_icon) ? esc_url($ptype_obj->menu_icon) : 'div'; if ( is_string( $ptype_obj->menu_icon ) ) {
$menu_icon = esc_url( $ptype_obj->menu_icon );
$ptype_class = sanitize_html_class( $ptype );
} else {
$menu_icon = 'div';
$ptype_class = 'post';
}
// if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position. // if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position.
$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99); $core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) ) while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
$ptype_menu_position++; $ptype_menu_position++;
$menu[$ptype_menu_position] = array(esc_attr($ptype_obj->label), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-posts', 'menu-' . sanitize_html_class($ptype), $menu_icon); $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->label ), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-' . $ptype_class, $menu_icon );
$submenu["edit.php?post_type=$ptype"][5] = array( __('Edit'), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype"); $submenu["edit.php?post_type=$ptype"][5] = array( __('Edit'), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype");
/* translators: add new custom post type */ /* translators: add new custom post type */
$submenu["edit.php?post_type=$ptype"][10] = array( _x('Add New', 'post'), $ptype_obj->edit_type_cap, "post-new.php?post_type=$ptype" ); $submenu["edit.php?post_type=$ptype"][10] = array( _x('Add New', 'post'), $ptype_obj->edit_type_cap, "post-new.php?post_type=$ptype" );

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

@ -441,7 +441,7 @@ function wp_default_styles( &$styles ) {
$no_suffix = array( 'farbtastic' ); $no_suffix = array( 'farbtastic' );
// all colors stylesheets need to have the same query strings (cache manifest compat) // all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20100415'; $colors_version = '20100416';
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100411' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100411' );