Changeset 16070

Timestamp:

10/29/2010 07:25:58 AM (14 years ago)

Author:

westi

Message:

More admin bar updates. See #14772 props filosofo.
Moves js out into seperate file.
Respects WP_SHOW_ADMIN_BAR.
Moved shortlink to top-level
Removed admin bar from non-multisite admin pages.
Set eol-style on new files.

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (4 diffs)
• admin-bar/admin-bar-class.php (modified) (1 diff)
• css/admin-bar-rtl.css (modified) (1 diff, 1 prop)
• css/admin-bar-rtl.dev.css (modified) (4 diffs, 1 prop)
• css/admin-bar.css (modified) (1 diff, 1 prop)
• css/admin-bar.dev.css (modified) (4 diffs, 1 prop)
• css/super-admin-bar.css (modified) (1 prop)
• css/super-admin-bar.dev.css (modified) (1 prop)
• js/admin-bar.dev.js (added)
• js/admin-bar.js (added)
• script-loader.php (modified) (2 diffs)

trunk/wp-includes/admin-bar.php

@@ -171 +171 @@
     global $wp_admin_bar;
 
-    /* Add the Site Info menu */
-    $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Site Info' ), 'href' => '', ) );
-
-    // TODO: Move this js out into a seperate file?
-    $wp_admin_bar->add_menu( array( 'parent' => 'bloginfo', 'title' => __( 'Get Shortlink' ), 'href' => '', 'meta' => array( 
-            'onclick' => 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName('link');var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute('rel')=='shortlink') {found=l.getAttribute('href');break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute('rel') == 'shortlink') {found = l.getAttribute('href');break;}}}if (found) {prompt('' . esc_js( __( 'URL:' ) ) . '', found);} else {alert('' . esc_js( __( 'No shortlink available for this page.' ) ) . ''); } } wpcomshort(); return false;' ) ) );
+    $wp_admin_bar->add_menu( array( 'id' => 'get-shortlink', 'title' => __( 'Get Shortlink' ), 'href' => '', ) );
 }
 
@@ -209 +204 @@
     ?>
     <style type="text/css" media="print">#wpadminbar { display:none; }</style>
-    <script type="text/javascript">
-    /*  <![CDATA[ */
-    (function(d, w) {
-        var init = function() {
-            var b = d.getElementsByTagName('body')[0],
-            aB = d.getElementById('wpadminbar'),
-            s = d.getElementById('adminbar-search');
-
-            if ( b && aB )
-                b.appendChild( aB );
-
-            if ( s ) {
-                if ( '' == s.value )
-                    s.value = s.getAttribute('title');
-
-                s.onblur = function() {
-                    this.value = '' == this.value ? this.getAttribute('title') : this.value;
-                }
-                s.onfocus = function() {
-                    this.value = this.getAttribute('title') == this.value ? '' : this.value;
-                }
-            }
-            
-            if ( w.location.hash )
-                w.scrollBy(0,-32);
-        }
-
-        if ( w.addEventListener )
-            w.addEventListener('load', init, false);
-        else if ( w.attachEvent ) 
-            w.attachEvent('onload', init);
-
-    })(document, window);
-    /*  ]]> */
-    </script>
     <?php
 }
@@ -273 +233 @@
 }
 
-add_action('wp_head', 'wp_admin_body_style');
-add_action('admin_head', 'wp_admin_body_style');
-
 /**
  * Determine whether the admin bar should be showing.
@@ -292 +249 @@
             $show_admin_bar = (bool) WP_SHOW_ADMIN_BAR;
 
-        if ( ! is_user_logged_in() )
+        if (  
+            ! is_user_logged_in() || 
+            ( is_admin() && ! is_multisite() )
+        )
             $show_admin_bar = false;
     }

trunk/wp-includes/admin-bar/admin-bar-class.php

@@ -34 +34 @@
 
         add_action( 'wp_head', 'wp_admin_bar_header' );
+        add_action( 'wp_head', 'wp_admin_body_style');
+
         add_action( 'admin_head', 'wp_admin_bar_header' );
-
+        add_action( 'admin_head', 'wp_admin_body_style');
+
+        wp_enqueue_script( 'admin-bar' );
         wp_enqueue_style( 'admin-bar' );
 

trunk/wp-includes/css/admin-bar-rtl.css

@@ -1 @@
-#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks>ul>li>a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li.hover>a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover>ul{margin-left:-100%;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;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;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin>a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-me>a.hover,#wpadminbar li.ab-blog>a.hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.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;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover>ul{left:auto;right:100%;}
+#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks>ul>li>a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:hover>a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover>ul,#wpadminbar .menupop li.hover>ul{margin-left:-100%;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;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;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin>a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-me>a:hover,#wpadminbar li.ab-blog>a:hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.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;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover>ul,#wpadminbar #admin-bar-micro ul li.hover>ul{left:auto;right:100%;}

trunk/wp-includes/css/admin-bar-rtl.dev.css

@@ -26 +26 @@
 }
 
-#wpadminbar .quicklinks > ul > li.hover > a {
+#wpadminbar .quicklinks > ul > li:hover > a {
     border-right-color: #707070;
     border-left-color: #686868;
@@ -36 +36 @@
 }
 
-#wpadminbar .menupop li:hover > ul {
+#wpadminbar .menupop li:hover > ul,
+#wpadminbar .menupop li.hover > ul {
     margin-left:-100%;
 }
@@ -157 +158 @@
 }
 
-#wpadminbar li.ab-me > a.hover, 
-#wpadminbar li.ab-blog > a.hover {
+#wpadminbar li.ab-me > a:hover, 
+#wpadminbar li.ab-blog > a:hover {
     background-position: 33% 59.8%;
 }
@@ -212 +213 @@
 }
 
-#wpadminbar #admin-bar-micro ul li:hover > ul {
+#wpadminbar #admin-bar-micro ul li:hover > ul,
+#wpadminbar #admin-bar-micro ul li.hover > ul {
     left: auto;
     right: 100%;

trunk/wp-includes/css/admin-bar.css

@@ -1 @@
-#wpadminbar{direction:ltr;background:#666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;color:#ddd;font:12px Arial,Helvetica,sans-serif;height:28px;left:0;margin:0;position:fixed;top:0;width:100%;z-index:99999;min-width:960px;}#wpadminbar ul,#wpadminbar ul li{position:relative;z-index:99999;}#wpadminbar ul li img{vertical-align:middle!important;margin-right:8px!important;border:none!important;padding:0!important;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks>ul>li:hover>a,#wpadminbar .quicklinks>ul>li.hover>a{border-left-color:#707070;}#wpadminbar a{outline:none;}#wpadminbar .avatar{border:1px solid #999!important;padding:0!important;margin:-3px 5px 0 0!important;vertical-align:middle;float:none;display:inline!important;}#wpadminbar li:hover>ul{display:block;}#wpadminbar .menupop li:hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .menupop ul li a{color:#555!important;text-shadow:none;font-weight:normal;white-space:nowrap;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;padding-right:.8em;line-height:28px;}#wpadminbar .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat;padding-right:1.5em;line-height:28px;}#wpadminbar .menupop ul li a span#awaiting-mod{display:inline;background:#aaa;color:#fff;padding:1px 5px;font-size:10px;font-family:verdana;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#wpadminbar .menupop ul li a:hover span#awaiting-mod{background:#fff;color:#888;}#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);background:#fff;display:none;position:absolute;border:1px solid #dfdfdf;border-top:none!important;float:none;}html>body #wpadminbar .menupop ul{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;padding:0;background-image:none;}#wpadminbar .quicklinks a{border:none;color:#ddd!important;height:28px;text-shadow:#555 0 -1px 0;display:block;font:13px Arial,Helvetica,sans-serif;font-weight:normal;letter-spacing:normal;padding:0 .85em;line-height:28px;text-decoration:none!important;}#wpadminbar .quicklinks a:hover{text-shadow:#333 0 -1px 0;}#wpadminbar li.ab-sadmin{float:right;background:#555;}#wpadminbar li.ab-sadmin ul{right:0;float:right;}#wpadminbar li.ab-sadmin>a{font-size:11px!important;padding:0 7px!important;border:none!important;border-left:1px solid #666!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{right:0;float:right;text-align:left;width:100%;}#wpadminbar li.ab-sadmin ul li a{padding-left:1.75em;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 0 101.8% no-repeat;padding-left:1.25em;margin-left:-1.25em;line-height:28px;padding-right:0!important;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{color:#fff!important;background:#888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x!important;text-shadow:#666 0 -1px 0;}#wpadminbar li li:hover>a{color:#fff!important;}.quicklinks ul{list-style:none;margin:0;padding:0;text-align:left;}.quicklinks ul li{float:left;margin:0;}#adminbarsearch{float:right;}#adminbarsearch{height:18px;padding:3px;}#adminbarsearch *{color:#555;font-size:12px;}#adminbarsearch label,#adminbarsearch a{height:28px;color:#ccc;display:block;float:left;padding:3px 4px;text-shadow:0 -1px 0 #444;}#adminbarsearch a{text-decoration:underline;}#adminbarsearch a:hover{color:#fff;}#wpadminbar li.ab-me:hover,#wpadminbar li.ab-blog:hover{background:none;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{line-height:18px!important;border:none!important;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;height:28px;padding:0 1.15em 0 .7em;}#wpadminbar li.ab-me>a:hover,#wpadminbar li.ab-me>a.hover,#wpadminbar li.ab-blog>a:hover,#wpadminbar li.ab-blog>a.hover{background-position:67% 59.8%;}#wpadminbar li.ab-me img.avatar,#wpadminbar li.ab-blog img.avatar{margin:4px 0 0 0!important;vertical-align:middle;background:#eee;width:16px!important;height:16px!important;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-left:none!important;padding-left:.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;margin-top:0!important;}.adminbar-input{display:block!important;float:left!important;font:12px Arial,Helvetica,sans-serif!important;border:1px solid #626262!important;padding:2px 3px!important;margin-right:3px!important;background:#ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat!important;-webkit-border-radius:0!important;-khtml-border-radius:0!important;-moz-border-radius:0!important;border-radius:0!important;outline:none;text-shadow:0 1px 0 #fff;}button.adminbar-button{position:relative;border:0;cursor:pointer;overflow:visible;margin:0!important;float:left;background:url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;padding:0 14px 0 0;text-align:center;}button.adminbar-button span{position:relative;display:block;white-space:nowrap;height:19px;background:url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;padding:3px 0 0 14px;font:12px Arial,Helvetica,sans-serif!important;font-weight:bold!important;color:#444!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:active{background-position:right -184px!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:hover span{color:#000!important;}button.adminbar-button:active span{background-position:left -146px!important;}button.adminbar-button::-moz-focus-inner{border:none;}@media screen and(-webkit-min-device-pixel-ratio:0){button.adminbar-button span{margin-top:-1px;}}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .menupop ul li a:hover,* html #wpadminbar .myaccount a,* html .quicklinks a:hover,#wpadminbar .menupop:hover{background-image:none!important;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #adminbarsearch-wrap{position:absolute;top:0;}* html #wpadminbar ul,* html #wpadminbar ul li{zoom:1;}* html #wpadminbar .myaccount a{margin-left:0!important;padding-left:12px!important;}
+#wpadminbar{direction:ltr;background:#666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;color:#ddd;font:12px Arial,Helvetica,sans-serif;height:28px;left:0;margin:0;position:fixed;top:0;width:100%;z-index:99999;min-width:960px;}#wpadminbar ul,#wpadminbar ul li{position:relative;z-index:99999;}#wpadminbar ul li img{vertical-align:middle!important;margin-right:8px!important;border:none!important;padding:0!important;}#wpadminbar .quicklinks>ul>li>a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-right:none;}#wpadminbar .quicklinks>ul>li:hover>a{border-left-color:#707070;}#wpadminbar a{outline:none;}#wpadminbar .avatar{border:1px solid #999!important;padding:0!important;margin:-3px 5px 0 0!important;vertical-align:middle;float:none;display:inline!important;}#wpadminbar li:hover>ul,#wpadminbar li.hover>ul{display:block;}#wpadminbar .menupop li:hover>ul,#wpadminbar .menupop li.hover>ul{margin-left:100%;margin-top:-28px;}#wpadminbar .menupop ul li a{color:#555!important;text-shadow:none;font-weight:normal;white-space:nowrap;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;padding-right:.8em;line-height:28px;}#wpadminbar .menupop ul li a>span{display:block;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat;padding-right:1.5em;line-height:28px;}#wpadminbar .menupop ul li a span#awaiting-mod{display:inline;background:#aaa;color:#fff;padding:1px 5px;font-size:10px;font-family:verdana;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#wpadminbar .menupop ul li a:hover span#awaiting-mod{background:#fff;color:#888;}#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);background:#fff;display:none;position:absolute;border:1px solid #dfdfdf;border-top:none!important;float:none;}html>body #wpadminbar .menupop ul{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;padding:0;background-image:none;}#wpadminbar .quicklinks a{border:none;color:#ddd!important;height:28px;text-shadow:#555 0 -1px 0;display:block;font:13px Arial,Helvetica,sans-serif;font-weight:normal;letter-spacing:normal;padding:0 .85em;line-height:28px;text-decoration:none!important;}#wpadminbar .quicklinks a:hover{text-shadow:#333 0 -1px 0;}#wpadminbar li.ab-sadmin{float:right;background:#555;}#wpadminbar li.ab-sadmin ul{right:0;float:right;}#wpadminbar li.ab-sadmin>a{font-size:11px!important;padding:0 7px!important;border:none!important;border-left:1px solid #666!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{right:0;float:right;text-align:left;width:100%;}#wpadminbar li.ab-sadmin ul li a{padding-left:1.75em;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite.png?d=08102010) 0 101.8% no-repeat;padding-left:1.25em;margin-left:-1.25em;line-height:28px;padding-right:0!important;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{color:#fff!important;background:#888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x!important;text-shadow:#666 0 -1px 0;}#wpadminbar li li:hover>a{color:#fff!important;}.quicklinks ul{list-style:none;margin:0;padding:0;text-align:left;}.quicklinks ul li{float:left;margin:0;}#adminbarsearch{float:right;}#adminbarsearch{height:18px;padding:3px;}#adminbarsearch *{color:#555;font-size:12px;}#adminbarsearch label,#adminbarsearch a{height:28px;color:#ccc;display:block;float:left;padding:3px 4px;text-shadow:0 -1px 0 #444;}#adminbarsearch a{text-decoration:underline;}#adminbarsearch a:hover{color:#fff;}#wpadminbar li.ab-me:hover,#wpadminbar li.ab-blog:hover{background:none;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{line-height:18px!important;border:none!important;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;height:28px;padding:0 1.15em 0 .7em;}#wpadminbar li.ab-me>a:hover,#wpadminbar li.ab-blog>a:hover{background-position:67% 59.8%;}#wpadminbar li.ab-me img.avatar,#wpadminbar li.ab-blog img.avatar{margin:4px 0 0 0!important;vertical-align:middle;background:#eee;width:16px!important;height:16px!important;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-left:none!important;padding-left:.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;margin-top:0!important;}.adminbar-input{display:block!important;float:left!important;font:12px Arial,Helvetica,sans-serif!important;border:1px solid #626262!important;padding:2px 3px!important;margin-right:3px!important;background:#ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat!important;-webkit-border-radius:0!important;-khtml-border-radius:0!important;-moz-border-radius:0!important;border-radius:0!important;outline:none;text-shadow:0 1px 0 #fff;}button.adminbar-button{position:relative;border:0;cursor:pointer;overflow:visible;margin:0!important;float:left;background:url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;padding:0 14px 0 0;text-align:center;}button.adminbar-button span{position:relative;display:block;white-space:nowrap;height:19px;background:url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;padding:3px 0 0 14px;font:12px Arial,Helvetica,sans-serif!important;font-weight:bold!important;color:#444!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:active{background-position:right -184px!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:hover span{color:#000!important;}button.adminbar-button:active span{background-position:left -146px!important;}button.adminbar-button::-moz-focus-inner{border:none;}@media screen and(-webkit-min-device-pixel-ratio:0){button.adminbar-button span{margin-top:-1px;}}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .menupop ul li a:hover,* html #wpadminbar .myaccount a,* html .quicklinks a:hover,* html #wpadminbar .menupop:hover{background-image:none!important;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #adminbarsearch-wrap{position:absolute;top:0;}* html #wpadminbar ul,* html #wpadminbar ul li{zoom:1;}* html #wpadminbar .myaccount a{margin-left:0!important;padding-left:12px!important;}

trunk/wp-includes/css/admin-bar.dev.css

@@ -31 +31 @@
     border-right: none;
 }
-#wpadminbar .quicklinks > ul > li:hover > a,
-#wpadminbar .quicklinks > ul > li.hover > a {
+#wpadminbar .quicklinks > ul > li:hover > a {
     border-left-color: #707070;
 }
@@ -46 +45 @@
     display:inline !important;
 }
-#wpadminbar li:hover > ul {
+#wpadminbar li:hover > ul,
+#wpadminbar li.hover > ul {
     display:block;
 }
 
-#wpadminbar .menupop li:hover > ul {
+#wpadminbar .menupop li:hover > ul,
+#wpadminbar .menupop li.hover > ul {
     margin-left:100%;
     margin-top:-28px;
@@ -227 +228 @@
 }
 #wpadminbar li.ab-me > a:hover, 
-#wpadminbar li.ab-me > a.hover, 
-#wpadminbar li.ab-blog > a:hover,
-#wpadminbar li.ab-blog > a.hover {
+#wpadminbar li.ab-blog > a:hover {
     background-position: 67% 59.8%;
 }
@@ -339 +338 @@
 * html #wpadminbar .menupop ul li a:hover, 
 * html #wpadminbar .myaccount a, 
-* html .quicklinks a:hover,#wpadminbar .menupop:hover { 
+* html .quicklinks a:hover,
+* html #wpadminbar .menupop:hover {
     background-image: none !important; 
 }

trunk/wp-includes/script-loader.php

@@ -258 +258 @@
     $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
     $scripts->add_data( 'user-profile', 'group', 1 );   
+
+    $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101028');
+    $scripts->add_data( 'admin-bar', 'group', 1 );  
+    $scripts->localize( 'admin-bar', 'adminBarL10n', array(
+        'url' => __( 'URL:' ),
+        'noShortlink' => __( 'No shortlink available for this page.' ),
+    ) );
     
     if ( is_admin() ) {
@@ -494 +501 @@
     
     // Admin bar
-    $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101028' );
+    $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101029' );
     $styles->add( 'super-admin-bar', "/wp-includes/css/super-admin-bar$suffix.css", array(), '20101028' );