Changeset 18683 for trunk/wp-admin/admin-header.php

Timestamp:

09/16/2011 05:01:54 AM (14 years ago)

Author:

koopersmith

Message:

Admin bar UX improvements. First pass, see #18197

File:

• trunk/wp-admin/admin-header.php (modified) (2 diffs)

trunk/wp-admin/admin-header.php

@@ -63 +63 @@
     decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
     isRtl = <?php echo (int) is_rtl(); ?>;
-    
+
     function wp_set_width_class() {
         var w = document.body.clientWidth, bc = document.body.className;
@@ -119 +119 @@
 <?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
 <div id="wpcontent">
-<div id="wphead">
-<?php
-
-if ( is_network_admin() )
-    $blog_name = sprintf( __('Network Admin: %s'), esc_html($current_site->site_name) );
-elseif ( is_user_admin() )
-    $blog_name = sprintf( __('Global Dashboard: %s'), esc_html($current_site->site_name) );
-else
-    $blog_name = get_bloginfo('name', 'display');
-if ( '' == $blog_name ) {
-    $blog_name = __( 'Visit Site' );
-} else {
-    $blog_name_excerpt = wp_html_excerpt($blog_name, 40);
-    if ( $blog_name != $blog_name_excerpt )
-        $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
-    $blog_name = $blog_name_excerpt;
-    unset($blog_name_excerpt);
-}
-$title_class = '';
-if ( function_exists('mb_strlen') ) {
-    if ( mb_strlen($blog_name, 'UTF-8') > 30 )
-        $title_class = 'class="long-title"';
-} else {
-    if ( strlen($blog_name) > 30 )
-        $title_class = 'class="long-title"';
-}
-?>
-
-<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="16" height="16" />
-<h1 id="site-heading" <?php echo $title_class ?>>
-    <a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
-        <span id="site-title"><?php echo $blog_name ?></span>
-    </a>
-</h1>
 
 <?php
-
 do_action('in_admin_header');
-
-$links = array();
-
-// Generate user profile and info links.
-$links[5] = sprintf( __('Howdy, %1$s'), $user_identity );
-
-$links[8] = '<a href="profile.php" title="' . esc_attr__('Edit your profile') . '">' . __('Your Profile') . '</a>';
-
-if ( is_multisite() && is_super_admin() ) {
-    if ( !is_network_admin() )
-        $links[10] = '<a href="' . network_admin_url() . '" title="' . ( ! empty( $update_title ) ? $update_title : esc_attr__('Network Admin') ) . '">' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . '</a>';
-    else
-        $links[10] = '<a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
-}
-
-$links[15] = '<a href="' . wp_logout_url() . '" title="' . esc_attr__('Log Out') . '">' . __('Log Out') . '</a>';
-
-$links = apply_filters( 'admin_user_info_links', $links, $current_user );
-ksort( $links );
-
-// Trim whitespace and pipes from links, then convert to list items.
-$links = array_map( 'trim', $links, array_fill( 0, count( $links ), " |\n\t" ) );
-
-$howdy = array_shift( $links );
-
-$links_no_js = implode( ' | ', $links );
-$links_js = '<li>' . implode( '</li><li>', $links ) . '</li>';
-
 ?>
-
-<div id="wphead-info">
-<div id="user_info">
-    <p class="hide-if-js"><?php echo "$howdy | $links_no_js"; ?></p>
-
-    <div class="hide-if-no-js">
-        <p><?php echo $howdy; ?></p>
-        <div id="user_info_arrow"></div>
-        <div id="user_info_links_wrap"><div id="user_info_links">
-            <ul><?php echo $links_js; ?></ul>
-        </div></div>
-    </div>
-</div>
-</div>
-
-</div>
 
 <div id="wpbody">