diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 4bf4e06bb..c18d5cc66 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -190,27 +190,27 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { if ( is_user_logged_in() ) { // Add blog links $blue_wp_logo_url = includes_url('images/wpmini-blue.png'); - + foreach ( (array) $wp_admin_bar->user->blogs as $blog ) { // Skip the current blog (unless we're in the network/user admin). if ( $blog->userblog_id == get_current_blog_id() && ! is_network_admin() && ! is_user_admin() ) { continue; } - + // @todo Replace with some favicon lookup. //$blavatar = 'Blavatar'; $blavatar = '' . esc_attr__( 'Blavatar' ) . ''; - + $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname; - + $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id) ) ); $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url($blog->userblog_id) ) ); - + if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) { $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => get_admin_url($blog->userblog_id, 'post-new.php') ) ); $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => get_admin_url($blog->userblog_id, 'edit-comments.php') ) ); } - + $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => get_home_url($blog->userblog_id) ) ); } } @@ -358,16 +358,21 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) { return; $awaiting_mod = wp_count_comments(); - $awaiting_mod = number_format_i18n( $awaiting_mod->moderated ); + $awaiting_mod = $awaiting_mod->moderated; - $bubble = "
"; - $bubble .= "
$awaiting_mod
"; - $bubble .= "
"; - $bubble .= "
"; + $icon = "
"; + $icon .= "
"; + $icon .= "
"; + $icon .= "
"; + + if ( $awaiting_mod ) + $title = sprintf( _n('%d Comment', '%d Comments', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ); + else + $title = __('Comments'); $wp_admin_bar->add_menu( array( 'id' => 'comments', - 'title' => $bubble, + 'title' => $icon . $title, 'href' => admin_url('edit-comments.php'), ) ); } diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index 738057fbf..e9f69a7dc 100644 --- a/wp-includes/css/admin-bar.css +++ b/wp-includes/css/admin-bar.css @@ -1 +1 @@ -#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 12px/28px "Helvetica Neue",sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar :before,#wpadminbar :after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 12px/28px "Helvetica Neue",sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#464646,#373737 5px);background-image:-moz-linear-gradient(bottom,#464646,#373737 5px);background-image:-o-linear-gradient(bottom,#464646,#373737);background-image:-webkit-gradient(linear,left bottom,left top,from(#464646),to(#373737));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#464646,#373737);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar .quicklinks ul li{float:left;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #555;border-left:1px solid #333;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 .85em;margin:0;}#wpadminbar .quicklinks a>span{line-height:28px;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 1px;padding:6px 0;-moz-box-shadow:0 4px 8px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.2);box-shadow:0 4px 8px rgba(0,0,0,0.2);background:#fff;display:none;position:absolute;border-top:none;float:none;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a span,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojq .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .quicklinks li:hover,#wpadminbar .quicklinks .selected{background-color:#fff;}#wpadminbar .quicklinks li:hover a,#wpadminbar .quicklinks .selected a,#wpadminbar .quicklinks li:hover span,#wpadminbar .quicklinks .selected span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover{background:#f8fbfe;}#wpadminbar .quicklinks .menupop a>span{display:inline;background:url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat;padding-right:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) right -29px no-repeat;padding-right:1.5em;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar #wp-admin-bar-my-account,#wpadminbar #wp-admin-bar-my-account-with-avatar{float:right;}#wpadminbar .quicklinks li#wp-admin-bar-my-account>a{border:none;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar>a{border:none;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar>a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar .quicklinks .admin-bar-search:hover>a{border-right:none;border-left:1px solid #333;}#wpadminbar #adminbarsearch{float:right;height:26px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:12px "Helvetica Neue",sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../../wp-content/themes/twentyeleven/images/search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;-khtml-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar #adminbarsearch .adminbar-button:active{background:#a0a0a0;background:-moz-linear-gradient(bottom,#a0a0a0,#c1c1c1);background:-webkit-gradient(linear,left bottom,left top,from(#a0a0a0),to(#c1c1c1));-moz-box-shadow:inset 1px 1px 1px #9b9b9b;-webkit-box-shadow:inset 1px 1px 1px #9b9b9b;box-shadow:inset 1px 1px 1px #9b9b9b;}#wpadminbar #adminbarsearch .adminbar-button:hover{color:#000;}#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner{border:none;}#wpadminbar .wp-admin-bar-logo{background:url(../images/wp-logo-white.png) no-repeat 8px 6px;}#wpadminbar .wp-admin-bar-logo>a{padding-left:22px;}#wpadminbar .wp-admin-bar-logo:hover{background:url(../images/wp-logo-dark.png) no-repeat 8px 6px;}#wpadminbar .ab-comments-bubble{position:relative;padding-top:5px;}#wpadminbar .ab-comments-count{background:#ccc;color:#555;text-shadow:none;height:1.2em;line-height:1.2em;padding:0 8px 0;font-size:12px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-count{background:#bbb;color:#333;}#wpadminbar a .ab-comments-arrow{height:0;position:absolute;bottom:-4px;left:6px;border-left:5px solid #ccc;border-bottom:5px solid transparent;}#wpadminbar a:hover .ab-comments-arrow{border-left-color:#bbb;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;} \ No newline at end of file +#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 12px/28px "Helvetica Neue",sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar :before,#wpadminbar :after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 12px/28px "Helvetica Neue",sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#464646,#373737 5px);background-image:-moz-linear-gradient(bottom,#464646,#373737 5px);background-image:-o-linear-gradient(bottom,#464646,#373737);background-image:-webkit-gradient(linear,left bottom,left top,from(#464646),to(#373737));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#464646,#373737);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar .quicklinks ul li{float:left;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #555;border-left:1px solid #333;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 .85em;margin:0;}#wpadminbar .quicklinks a>span{line-height:28px;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 1px;padding:6px 0;-moz-box-shadow:0 4px 8px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.2);box-shadow:0 4px 8px rgba(0,0,0,0.2);background:#fff;display:none;position:absolute;border-top:none;float:none;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a span,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojq .quicklinks li:hover>ul,#wpadminbar .quicklinks li.hover>ul{display:block;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .quicklinks li:hover,#wpadminbar .quicklinks .selected{background-color:#fff;}#wpadminbar .quicklinks li:hover a,#wpadminbar .quicklinks .selected a,#wpadminbar .quicklinks li:hover span,#wpadminbar .quicklinks .selected span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover{background:#f8fbfe;}#wpadminbar .quicklinks .menupop a>span{display:inline;background:url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat;padding-right:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) right -29px no-repeat;padding-right:1.5em;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar #wp-admin-bar-my-account,#wpadminbar #wp-admin-bar-my-account-with-avatar{float:right;}#wpadminbar .quicklinks li#wp-admin-bar-my-account>a{border:none;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar>a{border:none;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar>a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar .quicklinks .admin-bar-search:hover>a{border-right:none;border-left:1px solid #333;}#wpadminbar #adminbarsearch{float:right;height:26px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:12px "Helvetica Neue",sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../../wp-content/themes/twentyeleven/images/search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;-khtml-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar #adminbarsearch .adminbar-button:active{background:#a0a0a0;background:-moz-linear-gradient(bottom,#a0a0a0,#c1c1c1);background:-webkit-gradient(linear,left bottom,left top,from(#a0a0a0),to(#c1c1c1));-moz-box-shadow:inset 1px 1px 1px #9b9b9b;-webkit-box-shadow:inset 1px 1px 1px #9b9b9b;box-shadow:inset 1px 1px 1px #9b9b9b;}#wpadminbar #adminbarsearch .adminbar-button:hover{color:#000;}#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner{border:none;}#wpadminbar .wp-admin-bar-logo{background:url(../images/wp-logo-white.png) no-repeat 8px 6px;}#wpadminbar .wp-admin-bar-logo>a{padding-left:22px;}#wpadminbar .wp-admin-bar-logo:hover{background:url(../images/wp-logo-dark.png) no-repeat 8px 6px;}#wpadminbar .ab-comments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin:3px 4px 0 -2px;background:#999;height:10px;width:14px;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:1px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;} \ No newline at end of file diff --git a/wp-includes/css/admin-bar.dev.css b/wp-includes/css/admin-bar.dev.css index c2d52c049..d57a7b623 100644 --- a/wp-includes/css/admin-bar.dev.css +++ b/wp-includes/css/admin-bar.dev.css @@ -345,42 +345,40 @@ } /** - * Comments bubble + * Comments icon */ -#wpadminbar .ab-comments-bubble { +#wpadminbar .ab-comments-icon { position: relative; padding-top: 5px; + float: left; } -#wpadminbar .ab-comments-count { - background: #ccc; - color: #555; - text-shadow: none; - height: 1.2em; - line-height: 1.2em; - padding: 0 8px 0; - font-size: 12px; - font-weight: bold; +#wpadminbar .ab-comments-icon-body { + margin: 3px 4px 0 -2px; + background: #999; + height: 10px; + width: 14px; + -moz-border-radius: 10px; -khtml-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; } -#wpadminbar a:hover .ab-comments-count { +#wpadminbar a:hover .ab-comments-icon-body { background: #bbb; - color: #333; + color: #555; } -#wpadminbar a .ab-comments-arrow { +#wpadminbar a .ab-comments-icon-arrow { height: 0; position: absolute; - bottom: -4px; - left: 6px; + bottom: -3px; + left: 1px; /* Use transparent borders to form a triangle */ - border-left: 5px solid #ccc; - border-bottom: 5px solid transparent; + border-left: 4px solid #999; + border-bottom: 4px solid transparent; } -#wpadminbar a:hover .ab-comments-arrow { +#wpadminbar a:hover .ab-comments-icon-arrow { border-left-color: #bbb; } diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 4c6a6a9aa..7789501f4 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -423,7 +423,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); - $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110916' ); + $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110916b' ); $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101224' ); $styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20110802' );