vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Menu updates: single top level menus, B&W/color icons (sprite), fix for the Firefox bug of not firing mouseout on absolute positioned elements over textareas/text fields, scaling down properly for different user roles, includes patch by Ryan, fixes #7966

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@9578 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2008-11-09 14:54:39 +00:00
parent 1faf521908
commit 4ebfcd94a5
26 changed files with 592 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,15 @@
.find-box-search {
background-color: #e4f2fd;
border-color: #c6d9e9;
border-color: #dfdfdf;
background-color: #f1f1f1;
}
.find-box {
background-color: #f1f1f1;
}
.find-box-inside {
background-color: #fff;
}
a.page-numbers:hover {
@@ -10,8 +18,7 @@ a.page-numbers:hover {
body,
#wpbody,
.form-table .pre,
.find-box-inside {
.form-table .pre {
color: #333;
}
@@ -41,6 +48,21 @@ div.dashboard-widget,
color: green;
}
#postcustomstuff table {
border-color: #dfdfdf;
background-color: #F9F9F9;
}
#postcustomstuff thead th {
background-color: #F1F1F1;
}
#postcustomstuff table input,
#postcustomstuff table textarea {
border-color: #dfdfdf;
background-color: #fff;
}
.widefat {
border-color: #dfdfdf;
}
@@ -244,7 +266,8 @@ ul#widget-list li.widget-list-item h4.widget-title {
color: #666;
}
.button {
.button,
.submit input {
border-color: #DCDCDC;
color: #464646;
text-shadow: #FFF 0 1px 0;
@@ -257,6 +280,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
}
.button,
.submit input,
.button-secondary {
background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;
}
@@ -267,12 +291,15 @@ ul#widget-list li.widget-list-item h4.widget-title {
background: #21759B url(../images/button-grad.png) repeat-x scroll left top;
}
.button[disabled], .button:disabled {
.button[disabled],
.button:disabled {
background-color: #999;
}
.button:hover,
#edit-slug-buttons a.save:hover {
.submit input:hover,
#edit-slug-buttons a.save:hover,
#postcustomstuff .submit input:hover {
border-color: #535353;
}
@@ -338,22 +365,18 @@ div.dashboard-widget-submit input:hover,
}
.tablenav .dots {
background-color: #e4f2fd;
border-color: #e4f2fd;
border-color: transparent;
}
.tablenav .next,
.tablenav .prev {
background-color: #e4f2fd;
border-bottom-color: #2583ad;
border-color: #e4f2fd;
border-color: transparent;
color: #2583ad;
}
.tablenav .next:hover,
.tablenav .prev:hover {
border-bottom-color: #d54e21;
border-color: #e4f2fd;
border-color: transparent;
color: #d54e21;
}
@@ -903,17 +926,17 @@ abbr.required,
background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
}
#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
background: transparent url(../images/menu-bits.gif) repeat-x scroll left -206px;
background: transparent url(../images/menu-bits.gif) no-repeat scroll left -206px;
}
#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
#adminmenu .wp-menu-open .wp-menu-toggle {
background: transparent url(../images/menu-bits.gif) repeat-x scroll left -108px;
background: transparent url(../images/menu-bits.gif) no-repeat scroll left -108px;
}
#adminmenu a.wp-has-submenu {
#adminmenu a.menu-top {
background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px;
}
@@ -921,14 +944,21 @@ abbr.required,
background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px;
}
#adminmenu li.current a,
#adminmenu .wp-submenu a:hover {
background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px;
#adminmenu .wp-has-current-submenu .wp-has-submenu,
#adminmenu .menu-top .current {
background-color: #c0c0c0;
background-image: none;
border-color: #B5B5B5;
color: #fff;
}
#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
background: #b5b5b5 url(../images/menu-bits.gif) repeat-x scroll left top;
color: #fff;
#adminmenu li.menu-top .current:hover {
background: #c0c0c0 none repeat scroll 0 0;
border-color: #B5B5B5;
}
#adminmenu .wp-submenu .current a.current {
background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px;
}
#adminmenu .wp-submenu a:hover {
@@ -936,26 +966,114 @@ abbr.required,
color: #333 !important;
}
#adminmenu li.current a,
#adminmenu li.current a:hover {
#adminmenu .wp-submenu li.current,
#adminmenu .wp-submenu li.current a,
#adminmenu .wp-submenu li.current a:hover {
color: #d54e21;
background-color: #fff;
border-color: #e3e3e3;
}
#adminmenu .wp-submenu {
#adminmenu .wp-submenu ul {
background-color: #fff;
}
#adminmenu.folded li.wp-has-submenu {
#adminmenu.folded li.menu-top,
#adminmenu .wp-submenu .wp-submenu-head {
background-color: #F1F1F1;
}
#adminmenu .wp-submenu li.wp-submenu-head {
background-color: #F1F1F1;
#adminmenu div.wp-submenu {
background-color: transparent;
}
#adminmenu.folded .wp-submenu {
background-color: #fff;
/* menu icons */
#adminmenu #menu-dashboard div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -61px -34px;
}
#adminmenu #menu-dashboard:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -61px -2px;
}
#adminmenu #menu-posts div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -272px -33px;
}
#adminmenu #menu-posts:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -272px -1px;
}
#adminmenu #menu-media div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -121px -33px;
}
#adminmenu #menu-media:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -121px -1px;
}
#adminmenu #menu-links div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -91px -33px;
}
#adminmenu #menu-links:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -91px -1px;
}
#adminmenu #menu-pages div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -151px -33px;
}
#adminmenu #menu-pages:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -151px -1px;
}
#adminmenu #menu-comments div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -31px -33px;
}
#adminmenu #menu-comments:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -31px -1px;
}
#adminmenu #menu-appearance div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -1px -32px;
}
#adminmenu #menu-appearance:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -1px 0;
}
#adminmenu #menu-plugins div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -181px -33px;
}
#adminmenu #menu-plugins:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -181px -1px;
}
#adminmenu #menu-users div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -301px -33px;
}
#adminmenu #menu-users:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -301px -1px;
}
#adminmenu #menu-tools div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -211px -33px;
}
#adminmenu #menu-tools:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -211px -1px;
}
#adminmenu #menu-settings div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -241px -33px;
}
#adminmenu #menu-settings:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -241px -1px;
}
/* end menu */
@@ -1025,8 +1143,7 @@ div.star.select:hover {
background-color: #d00;
}
#plugin-information .fyi ul,
.find-box {
#plugin-information .fyi ul {
background-color: #eaf3fa;
}
@@ -1074,3 +1191,7 @@ div.star.select:hover {
.attention {
color: #D54E21;
}
.ui-sortable .postbox:hover .handlediv {
background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px;
}

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

@@ -926,17 +926,17 @@ abbr.required,
background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
}
#adminmenu li.wp-has-current-submenu .wp-menu-toggle,
#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle {
background: transparent url(../images/menu-bits.gif) repeat-x scroll left -206px;
background: transparent url(../images/menu-bits.gif) no-repeat scroll left -206px;
}
#adminmenu .wp-has-submenu:hover .wp-menu-toggle,
#adminmenu .wp-menu-open .wp-menu-toggle {
background: transparent url(../images/menu-bits.gif) repeat-x scroll left -108px;
background: transparent url(../images/menu-bits.gif) no-repeat scroll left -108px;
}
#adminmenu a.wp-has-submenu {
#adminmenu a.menu-top {
background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px;
}
@@ -944,14 +944,21 @@ abbr.required,
background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px;
}
#adminmenu li.current a,
#adminmenu .wp-submenu a:hover {
background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px;
#adminmenu .wp-has-current-submenu .wp-has-submenu,
#adminmenu .menu-top .current {
background-color: #c0c0c0;
background-image: none;
border-color: #B5B5B5;
color: #fff;
}
#adminmenu li.wp-has-current-submenu a.wp-has-submenu {
background: #b5b5b5 url(../images/menu-bits.gif) repeat-x scroll left top;
color: #fff;
#adminmenu li.menu-top .current:hover {
background: #c0c0c0 none repeat scroll 0 0;
border-color: #B5B5B5;
}
#adminmenu .wp-submenu .current a.current {
background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px;
}
#adminmenu .wp-submenu a:hover {
@@ -959,26 +966,114 @@ abbr.required,
color: #333 !important;
}
#adminmenu li.current a,
#adminmenu li.current a:hover {
#adminmenu .wp-submenu li.current,
#adminmenu .wp-submenu li.current a,
#adminmenu .wp-submenu li.current a:hover {
color: #d54e21;
background-color: #fff;
border-color: #e3e3e3;
}
#adminmenu .wp-submenu {
#adminmenu .wp-submenu ul {
background-color: #fff;
}
#adminmenu.folded li.wp-has-submenu {
#adminmenu.folded li.menu-top,
#adminmenu .wp-submenu .wp-submenu-head {
background-color: #F1F1F1;
}
#adminmenu .wp-submenu li.wp-submenu-head {
background-color: #F1F1F1;
#adminmenu div.wp-submenu {
background-color: transparent;
}
#adminmenu.folded .wp-submenu {
background-color: #fff;
/* menu icons */
#adminmenu #menu-dashboard div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -61px -34px;
}
#adminmenu #menu-dashboard:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -61px -2px;
}
#adminmenu #menu-posts div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -272px -33px;
}
#adminmenu #menu-posts:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -272px -1px;
}
#adminmenu #menu-media div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -121px -33px;
}
#adminmenu #menu-media:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -121px -1px;
}
#adminmenu #menu-links div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -91px -33px;
}
#adminmenu #menu-links:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -91px -1px;
}
#adminmenu #menu-pages div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -151px -33px;
}
#adminmenu #menu-pages:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -151px -1px;
}
#adminmenu #menu-comments div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -31px -33px;
}
#adminmenu #menu-comments:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -31px -1px;
}
#adminmenu #menu-appearance div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -1px -32px;
}
#adminmenu #menu-appearance:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -1px 0;
}
#adminmenu #menu-plugins div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -181px -33px;
}
#adminmenu #menu-plugins:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -181px -1px;
}
#adminmenu #menu-users div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -301px -33px;
}
#adminmenu #menu-users:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -301px -1px;
}
#adminmenu #menu-tools div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -211px -33px;
}
#adminmenu #menu-tools:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -211px -1px;
}
#adminmenu #menu-settings div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -241px -33px;
}
#adminmenu #menu-settings:hover div.wp-menu-image {
background: transparent url("../images/menu.png") no-repeat scroll -241px -1px;
}
/* end menu */
@@ -1096,3 +1191,7 @@ div.star.select:hover {
.attention {
color: #D54E21;
}
.ui-sortable .postbox:hover .handlediv {
background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px;
}

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

@@ -34,6 +34,18 @@ input.button-highlighted {
float: right;
}
* html #wpbody-content #screen-options-link-wrap {
display: inline-block;
width: 150px;
text-align: center;
}
* html #wpbody-content #contextual-help-link-wrap {
display: inline-block;
width: 100px;
text-align: center;
}
/*
* html body.minwidth {
_width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%");
@@ -46,27 +58,24 @@ input.button-highlighted {
* html #adminmenu {
z-index: 1;
width: 125px;
width: 145px;
margin: 12px;
padding: 0;
}
* html #wpcontent #adminmenu.folded {
width: 28px;
}
ul#adminmenu li.wp-has-submenu {
padding: 0;
margin: 0;
}
#wpcontent #adminmenu ul.wp-submenu li {
#wpcontent #adminmenu .wp-submenu li {
padding: 0;
}
#adminmenu,
#adminmenu .wp-menu-toggle,
ul.wp-submenu li,
ul.wp-submenu {
.wp-submenu li,
.wp-submenu {
zoom: 100%;
}
@@ -74,13 +83,17 @@ ul.wp-submenu {
width: 28px;
}
#wpcontent #adminmenu ul.wp-submenu li.wp-submenu-head {
#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
padding: 3px 4px 4px 10px;
zoom: 100%;
}
#adminmenu.folded ul.wp-submenu {
margin: -1px 0 0 13px;
#wpcontent #adminmenu.folded .menu-top {
height: 30px;
}
#adminmenu.folded .wp-submenu {
margin: -1px 0 0 0;
}
#template,

0
wp-admin/images/menu/generic.png → wp-admin/images/generic.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 896 B

After

Width:  |  Height:  |  Size: 896 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 877 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 765 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 661 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 782 B

6
wp-admin/includes/media.php
View File

@@ -1252,7 +1252,7 @@ SWFUpload.onload = function() {
swfupload_load_failed_handler: swfuploadLoadFailed,
custom_settings : {
degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable
swfupload_element_id : "flash-upload-ui", // id of the element displayed when swfupload is available
swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available
},
debug: false
});
@@ -1262,8 +1262,8 @@ SWFUpload.onload = function() {
<div id="flash-upload-ui">
<?php do_action('pre-flash-upload-ui'); ?>
<div id="flash-browse-button"></div>
<p><?php _e( 'Choose files to upload' ); ?></p>
<div><?php _e( 'Choose files to upload' ); ?> <div id="flash-browse-button"></div></div>
<?php do_action('post-flash-upload-ui'); ?>
<p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
</div>

5
wp-admin/includes/plugin.php
View File

@@ -549,10 +549,9 @@ function add_menu_page( $page_title, $menu_title, $access_level, $file, $functio
add_action( $hookname, $function );
if ( empty($icon_url) )
$icon_url = 'images/menu/generic.png';
$icon_url = 'images/generic.png';
$menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top-single ' . $hookname, $hookname, $icon_url );
$menu[] = array ( '', $access_level, '', '', 'wp-menu-separator-last' );
$menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
return $hookname;
}

2
wp-admin/includes/template.php
View File

@@ -2652,7 +2652,7 @@ function do_meta_boxes($page, $context, $object) {
if ( in_array($box['id'], $hidden) )
$style = 'style="display:none;"';
echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '" ' . $style . '>' . "\n";
echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
echo "<div class='handlediv'><br /></div><h3 class='hndle'><span>{$box['title']}</span></h3>\n";
echo '<div class="inside">' . "\n";
call_user_func($box['callback'], $object, $box);
echo "</div>\n";

49
wp-admin/js/menu.js
View File

@@ -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);

2
wp-admin/js/postbox.js
View File

@@ -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);
} );

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

@@ -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]) ? '<img class="wp-menu-image" src="' . $item[6] . '" alt="" />' : '';
$img = '';
if ( isset($item[6]) && ! empty($item[6]) ) {
if ( 'div' === $item[6] )
$img = '<div class="wp-menu-image"><br /></div>';
else
$img = '<img class="wp-menu-image" src="' . $item[6] . '" alt="" />';
}
$toggle = '<div class="wp-menu-toggle"><br /></div>';
echo "\n\t<li$class$id>";
@@ -84,7 +90,7 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
}
if ( !empty($submenu[$item[2]]) ) {
echo "\n\t<ul class='wp-submenu'><li class='wp-submenu-head' style='display:none;'>{$item[0]}</li>";
echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>";
$first = true;
foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
if ( !current_user_can($sub_item[1]) )
@@ -121,7 +127,7 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
echo "<li$class><a href='{$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
}
}
echo "</ul>";
echo "</ul></div>";
}
echo "</li>";
}

76
wp-admin/menu.php
View File

@@ -25,40 +25,38 @@
$awaiting_mod = wp_count_comments();
$awaiting_mod = $awaiting_mod->moderated;
$menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'wp-menu-open menu-top-single', 'menu-dashboard', 'images/menu/home.png' );
$submenu['index.php'][5] = array( __('Dashboard'), 'read' , 'index.php' );
$menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top', 'menu-dashboard', 'div' );
$menu[4] = array( '', 'read', '', '', 'wp-menu-separator' );
$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', '', 'wp-menu-open menu-top-first', 'menu-posts', 'images/menu/posts.png' );
$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', '', 'wp-menu-open menu-top', 'menu-posts', 'div' );
$submenu['post-new.php'][5] = array( _c('Add New|post'), 'edit_posts', 'post-new.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'][20] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
$submenu['post-new.php'][25] = array( __('Categories'), 'manage_categories', 'categories.php' );
$menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', '', 'menu-media', 'images/menu/media.png' );
$menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', 'menu-top', 'menu-media', 'div' );
$submenu['media-new.php'][5] = array( _c('Add New|file'), 'upload_files', 'media-new.php');
$submenu['media-new.php'][10] = array( __('Edit'), 'upload_files', 'upload.php');
$menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', '', 'menu-links', 'images/menu/links.png' );
$menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', 'menu-top', 'menu-links', 'div' );
$submenu['link-add.php'][5] = array( _c('Add New|links'), 'manage_links', 'link-add.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' );
$menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', '', 'menu-pages', 'images/menu/pages.png' );
$menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', 'menu-top', 'menu-pages', 'div' );
$submenu['page-new.php'][5] = array( _c('Add New|page'), 'edit_pages', 'page-new.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' );
$menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top-last', 'menu-comments', 'images/menu/comments.png' );
$submenu['edit-comments.php'][15] = array( __('Comments'), 'edit_posts', 'edit-comments.php' );
$menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' );
$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
$menu[29] = array( '', 'read', '', '', 'wp-menu-separator' );
$menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top-first', 'menu-appearance', 'images/menu/appearance.png' );
$menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' );
$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
$submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
@@ -67,15 +65,15 @@ $update_count = 0;
if ( !empty($update_plugins->response) )
$update_count = count( $update_plugins->response );
$menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', '', 'menu-plugins', 'images/menu/plugins.png' );
$menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
$submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' );
$submenu['plugins.php'][10] = array(_c('Add New|plugin'), 'install_plugins', 'plugin-install.php');
$submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
if ( current_user_can('edit_users') )
$menu[40] = array( __('Users'), 'edit_users', 'users.php', '', '', 'menu-users', 'images/menu/users.png' );
$menu[40] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-top', 'menu-users', 'div' );
else
$menu[40] = array( __('Profile'), 'read', 'profile.php', '', '', 'menu-users', 'images/menu/users.png' );
$menu[40] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top', 'menu-users', 'div' );
if ( current_user_can('edit_users') ) {
$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
@@ -86,14 +84,14 @@ if ( current_user_can('edit_users') ) {
$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
}
$menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', '', 'menu-tools', 'images/menu/tools.png' );
$menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', 'menu-top', 'menu-tools', 'div' );
$submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' );
$submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' );
if ( ! $is_opera )
$submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' );
$submenu['import.php'][30] = array( __('Update'), 'read', 'update-core.php');
$submenu['import.php'][30] = array( __('Update'), 'install_plugins', 'update-core.php');
$menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top-last', 'menu-settings', 'images/menu/settings.png' );
$menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
$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'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
@@ -172,14 +170,58 @@ foreach ( $menu as $id => $data ) {
if ( ! current_user_can($data[1]) ) {
$_wp_menu_nopriv[$data[2]] = true;
unset($menu[$id]);
} elseif ( !empty($data[0]) ) {
$submenu[$data[2]][0] = $data;
}
}
}
unset($id);
function add_cssclass($add, $class) {
$class = empty($class) ? $add : $class .= ' ' . $add;
return $class;
}
function add_menu_classes($menu) {
$first = $lastorder = false;
$i = 0;
$mc = count($menu);
foreach ( $menu as $order => $top ) {
$i++;
if ( 0 == $order ) { // dashboard is always shown/single
$menu[0][4] = add_cssclass('menu-top-first menu-top-last', $top[4]);
continue;
}
if ( empty($top[2]) ) { // if separator
$first = true;
if ( $lastorder ) {
$c = $menu[$lastorder][4];
$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
}
continue;
}
if ( $first ) {
$c = $menu[$order][4];
$menu[$order][4] = add_cssclass('menu-top-first', $c);
$first = false;
}
if ( $mc == $i ) { // last item
$c = $menu[$order][4];
$menu[$order][4] = add_cssclass('menu-top-last', $c);
}
$lastorder = $order;
}
return apply_filters( 'add_menu_classes', $menu );
}
$menu = add_menu_classes($menu);
uksort($menu, "strnatcasecmp"); // make it all pretty
if (! user_can_access_admin_page()) {

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

@@ -862,24 +862,56 @@ ul#adminmenu li.write-new-button a {
float: left;
}
/* menu stuff */
/* side admin menu */
#adminmenu .wp-submenu {
display: none;
list-style: none;
margin: 2px 0 0;
padding: 0;
margin: 0;
position: relative;
z-index: 2;
border-width: 1px 0 0;
border-style: solid none none;
}
/* side admin menu */
#adminmenu {
padding: 0;
width: 12em;
list-style: none;
font: normal 11.5px/16px Georgia, "Times New Roman", Times, serif;
}
#adminmenu.folded,
#adminmenu.folded li.menu-top {
width: 28px;
}
#adminmenu div.wp-submenu-head {
display: none;
}
#adminmenu.folded div.wp-submenu-head,
#adminmenu.folded li.wp-has-submenu div.sub-open {
display: block;
}
#adminmenu.folded a.menu-top,
#adminmenu.folded .wp-submenu,
#adminmenu.folded li.wp-menu-open .wp-submenu,
#adminmenu.folded div.wp-menu-toggle {
display: none;
}
#adminmenu li.wp-menu-open .wp-submenu {
display: block;
}
#adminmenu div.wp-menu-image {
float: left;
width: 28px;
height: 30px;
}
/*
#adminmenu a {
outline: none;
@@ -902,12 +934,11 @@ ul#adminmenu li.write-new-button a {
padding: 1px 5px 3px;
}
#adminmenu li.wp-has-submenu {
width: 135px;
#adminmenu li.menu-top {
min-height: 28px;
}
#adminmenu a.wp-has-submenu {
#adminmenu a.menu-top {
line-height: 18px;
padding: 6px 5px;
border-width: 1px 1px 0;
@@ -925,20 +956,11 @@ ul#adminmenu li.write-new-button a {
border-style: none solid none none;
}
#adminmenu .menu-top-last ul.wp-submenu,
#adminmenu .menu-top-single ul.wp-submenu {
#adminmenu .menu-top-last ul.wp-submenu {
border-width: 0 0 1px;
border-style: none none solid;
}
#adminmenu .wp-submenu {
margin: 0;
position: relative;
z-index: 2;
border-width: 1px 0 0;
border-style: solid none none;
}
#adminmenu .wp-submenu li {
padding: 0;
margin: 0;
@@ -953,12 +975,13 @@ ul#adminmenu li.write-new-button a {
background-color: #F1F1F1;
}
#adminmenu .menu-top-first a.wp-has-submenu,
#adminmenu .menu-top-first a.menu-top,
#adminmenu.folded li.menu-top-first,
#adminmenu .wp-submenu li.wp-submenu-head {
#adminmenu .wp-submenu .wp-submenu-head {
border-width: 1px 1px 0;
border-style: solid solid none;
-moz-border-radius: 8px 8px 0 0;
-moz-border-radius-topleft :8px;
-moz-border-radius-topright: 8px;
-webkit-border-top-right-radius: 8px;
-webkit-border-top-left-radius: 8px;
-khtml-border-top-right-radius: 8px;
@@ -967,11 +990,12 @@ ul#adminmenu li.write-new-button a {
border-top-left-radius: 8px;
}
#adminmenu .menu-top-last a.wp-has-submenu,
#adminmenu .menu-top-last a.menu-top,
#adminmenu.folded li.menu-top-last {
border-width: 1px;
border-style: solid;
-moz-border-radius: 0 0 8px 8px;
-moz-border-radius-bottomleft: 8px;
-moz-border-radius-bottomright: 8px;
-webkit-border-bottom-right-radius: 8px;
-webkit-border-bottom-left-radius: 8px;
-khtml-border-bottom-right-radius: 8px;
@@ -980,18 +1004,8 @@ ul#adminmenu li.write-new-button a {
border-bottom-left-radius: 8px;
}
#adminmenu .menu-top-single a.wp-has-submenu,
#adminmenu.folded li.menu-top-single {
border-width: 1px;
border-style: solid;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
-khtml-border-radius: 8px;
border-radius: 8px;
}
#adminmenu li.wp-menu-open a.menu-top-last,
#adminmenu li.wp-menu-open a.menu-top-single {
#adminmenu li.wp-menu-open a.menu-top-last {
border-bottom: 0 none;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-webkit-border-bottom-right-radius: 0;
@@ -1002,12 +1016,12 @@ ul#adminmenu li.write-new-button a {
border-bottom-left-radius: 0;
}
#adminmenu .wp-menu-image {
#adminmenu img.wp-menu-image {
float: left;
padding: 8px 6px 0;
}
#adminmenu.folded .wp-menu-image {
#adminmenu.folded img.wp-menu-image {
padding: 7px 0 0 6px;
}
@@ -1022,7 +1036,7 @@ ul#adminmenu li.write-new-button a {
width: 1px;
}
#adminmenu .wp-submenu li.wp-submenu-head {
#adminmenu .wp-submenu .wp-submenu-head {
border-width: 1px;
border-style: solid;
padding: 6px 4px 6px 10px;
@@ -1031,9 +1045,14 @@ ul#adminmenu li.write-new-button a {
#adminmenu.folded .wp-submenu {
position: absolute;
margin: -1px 0 0 33px;
margin: -1px 0 0 28px;
padding: 0 8px 8px;
z-index: 999;
width: 135px;
border: 0 none;
}
#adminmenu.folded .wp-submenu ul {
width: 140px;
border-width: 0 0 1px;
border-style: none none solid;
}
@@ -1050,6 +1069,11 @@ ul#adminmenu li.write-new-button a {
margin-left: 40px;
}
#adminmenu li.menu-top-last .wp-submenu ul {
border-width: 0 0 1px;
border-style: none none solid;
}
#adminmenu .wp-menu-toggle {
width: 22px;
float: right;
@@ -1560,6 +1584,12 @@ table.form-table td .updated {
cursor: move;
}
.ui-sortable .postbox .handlediv {
float: right;
width: 24px;
height: 24px;
}
.sortable-placeholder {
border: 1px dashed #bbb;
background-color: #f5f5f5;
@@ -3013,3 +3043,9 @@ br.clear {
height: 2px;
line-height: 2px;
}
.swfupload {
margin: 0 10px;
vertical-align: middle;
}