Changeset 16070 for trunk/wp-includes/admin-bar.php

Timestamp:

10/29/2010 07:25:58 AM (16 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.

File:

• trunk/wp-includes/admin-bar.php (modified) (4 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;
     }