Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php (revision 16309)
+++ wp-includes/admin-bar.php (working copy)
@@ -110,7 +110,7 @@
function wp_admin_bar_my_sites_menu() {
global $wpdb, $wp_admin_bar;
- /* Add the 'My Dashboards' menu if the user has more than one site. */
+ /* Add the 'My Sites' menu if the user has more than one site. */
if ( count( $wp_admin_bar->user->blogs ) <= 1 )
return;
@@ -124,13 +124,13 @@
$blavatar = '';
$marker = '';
- if ( strlen($blog->blogname) > 35 )
+ if ( strlen($blog->blogname) > 15 )
$marker = '...';
if ( empty( $blog->blogname ) )
$blogname = $blog->domain;
else
- $blogname = substr( $blog->blogname, 0, 35 ) . $marker;
+ $blogname = substr( $blog->blogname, 0, 15 ) . $marker;
if ( ! isset( $blog->visible ) || $blog->visible === true ) {
$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id), ) );
@@ -220,14 +220,13 @@
$awaiting_mod = wp_count_comments();
$awaiting_mod = $awaiting_mod->moderated;
- // @todo styling for awaiting mod count. Don't show count if zero?
- $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "" . number_format_i18n($awaiting_mod) . "" ), 'href' => admin_url('edit-comments.php') ) );
+ $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "" . number_format_i18n($awaiting_mod) . "" ), 'href' => admin_url('edit-comments.php') ) );
}
function wp_admin_bar_appearance_menu() {
global $wp_admin_bar;
- if ( !current_user_can('switch themes') )
+ if ( !current_user_can('switch_themes') )
return;
$wp_admin_bar->add_menu( array( 'id' => 'appearance', 'title' => __('Appearance'), 'href' => admin_url('themes.php') ) );
@@ -276,9 +275,8 @@
$update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
- $update_title = sprintf( __('Updates %s'), "" . number_format_i18n($update_count) . "" );
+ $update_title = sprintf( __('Updates %s'), "" . number_format_i18n($update_count) . "" );
- // @todo styling for awaiting mod count. Don't show count if zero?
$wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) );
}
Index: wp-includes/css/admin-bar-rtl.dev.css
===================================================================
--- wp-includes/css/admin-bar-rtl.dev.css (revision 16309)
+++ wp-includes/css/admin-bar-rtl.dev.css (working copy)
@@ -37,7 +37,8 @@
#wpadminbar .menupop li:hover > ul,
#wpadminbar .menupop li.hover > ul {
- margin-left:-100%;
+ margin-right:100%;
+ margin-top:-28px;
}
#wpadminbar .menupop a > span {
@@ -51,32 +52,6 @@
padding-left:1.5em;
}
-#wpadminbar .menupop ul {
- right: 0;
- width:100%;
- min-width:150px;
-}
-
-#wpadminbar .ab-my-account ul {
- width:200px;
-}
-
-#wpadminbar .ab-my-blogs ul {
- width:300px;
-}
-
-#wpadminbar .ab-my-blogs ul ul {
- width:200px;
-}
-
-#wpadminbar .ab-bloginfo ul {
- width:200px;
-}
-
-#wpadminbar .ab-subscribe ul {
- width:150px;
-}
-
#wpadminbar .menupop ul li {
width:auto;
}
@@ -157,7 +132,6 @@
padding: 0 0.7em 0 1.15em;
}
-#wpadminbar li.ab-me > a:hover,
#wpadminbar li.ab-blog > a:hover {
background-position: 33% 59.8%;
}
@@ -168,19 +142,6 @@
padding-right: 0.7em !important;
}
-#wpadminbar li.ab-my-account > ul,
-#wpadminbar li.ab-bloginfo > ul {
- right: -7px;
- left:auto;
-}
-
-
-#wpadminbar ul li a strong.count {
- margin-right: 5px;
- margin-left: 0;
- position:static;
-}
-
.adminbar-input {
background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat !important;
float:right !important;
Index: wp-includes/css/admin-bar.dev.css
===================================================================
--- wp-includes/css/admin-bar.dev.css (revision 16309)
+++ wp-includes/css/admin-bar.dev.css (working copy)
@@ -72,7 +72,8 @@
padding-right:1.5em;
line-height: 28px;
}
-#wpadminbar .menupop ul li a span#awaiting-mod {
+#wpadminbar ul li a span#ab-awaiting-mod,
+#wpadminbar ul li a span#ab-updates {
display: inline;
background: #aaa;
color: #fff;
@@ -83,10 +84,14 @@
-webkit-border-radius: 5px;
border-radius: 5px;
}
-#wpadminbar .menupop ul li a:hover span#awaiting-mod {
+#wpadminbar ul li a:hover span#ab-awaiting-mod,
+#wpadminbar ul li a:hover span#ab-updates {
background: #fff;
color: #888;
}
+#wpadminbar ul li a span#ab-awaiting-mod.count-0 {
+ display: none;
+}
#wpadminbar .menupop ul {
-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);
-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);
@@ -101,11 +106,6 @@
background:rgba(255,255,255,0.97);
border-color:rgba(0,0,0,0.1);
}
-#wpadminbar .menupop.ab-my-account ul,
-#wpadminbar .menupop.ab-my-dash ul,
-#wpadminbar .menupop.ab-new-post ul {
- min-width:140px;
-}
#wpadminbar .menupop li {
float:none;
margin:0;
@@ -245,29 +245,12 @@
padding-left: 0.7em !important;
margin-top: 0 !important;
}
-#wpadminbar li.ab-my-account > ul, #wpadminbar li.ab-bloginfo > ul {
- left: -7px;
-}
+
#wpadminbar ul li img {
width: 16px !important;
height: 16px !important;
}
-#wpadminbar ul li a strong.count {
- text-shadow: none;
- background: #ddd;
- color: #555;
- margin-left: 5px;
- padding: 1px 6px;
- top: -1px;
- position: relative;
- font-size: 9px;
- -moz-border-radius: 7px;
- -webkit-border-radius: 7px;
- border-radius: 7px;
- font-weight: normal;
-}
-
#wpadminbar #adminbar-search {
line-height:normal !important;
width:140px !important;