X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..b3ddbea8a296025a672b3c3ddca158dc51ed8080:/wp-admin/admin-header.php

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 61ba38b2..18b5ff3c 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -12,22 +12,37 @@ if ( ! defined( 'WP_ADMIN' ) )
 
 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );
+
+if ( is_network_admin() )
+	$admin_title = __( 'Network Admin' );
+elseif ( is_user_admin() )
+	$admin_title = __( 'Global Dashboard' );
+else
+	$admin_title = get_bloginfo( 'name' );
+
+if ( $admin_title == $title )
+	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
+else
+	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
+
+$admin_title = apply_filters( 'admin_title', $admin_title, $title );
+
 wp_user_settings();
-wp_menu_unfold();
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php echo $title; ?> &lsaquo; <?php bloginfo('name') ?>  &#8212; WordPress</title>
+<title><?php echo $admin_title; ?></title>
 <?php
 
-wp_admin_css( 'css/global' );
+wp_admin_css( 'global' );
 wp_admin_css();
-wp_admin_css( 'css/colors' );
-wp_admin_css( 'css/ie' );
+wp_admin_css( 'colors' );
+wp_admin_css( 'ie' );
 if ( is_multisite() )
-	wp_admin_css( 'css/ms' );
+	wp_admin_css( 'ms' );
 wp_enqueue_script('utils');
 
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
@@ -52,7 +67,6 @@ var userSettings = {
 <?php
 
 if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
-	add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
 	wp_enqueue_script('quicktags');
 }
 
@@ -67,6 +81,16 @@ do_action('admin_head');
 if ( get_user_setting('mfold') == 'f' )
 	$admin_body_class .= ' folded';
 
+if ( is_admin_bar_showing() )
+	$admin_body_class .= ' admin-bar';
+
+if ( is_rtl() )
+	$admin_body_class .= ' rtl';
+
+$admin_body_class .= ' branch-' . str_replace( '.', '-', floatval( $wp_version ) );
+$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
+$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
+
 if ( $is_iphone ) { ?>
 <style type="text/css">.row-actions{visibility:visible;}</style>
 <?php } ?>
@@ -83,12 +107,19 @@ document.body.className = c;
 </script>
 
 <div id="wpwrap">
+<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
 <div id="wpcontent">
 <div id="wphead">
 <?php
-$blog_name = get_bloginfo('name', 'display');
+
+if ( is_network_admin() )
+	$blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
+elseif ( is_user_admin() )
+	$blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
+else
+	$blog_name = get_bloginfo('name', 'display');
 if ( '' == $blog_name ) {
-	$blog_name = '&nbsp;';
+	$blog_name = __( 'Visit Site' );
 } else {
 	$blog_name_excerpt = wp_html_excerpt($blog_name, 40);
 	if ( $blog_name != $blog_name_excerpt )
@@ -106,41 +137,65 @@ if ( function_exists('mb_strlen') ) {
 }
 ?>
 
-<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="32" height="32" />
+<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>
-<?php if ( current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
-	<a id="privacy-on-link" href="options-privacy.php" title="<?php echo esc_attr( apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') ) ); ?>"><?php echo apply_filters('privacy_on_link_text', __('Search Engines Blocked') ); ?></a>
-<?php endif; ?>
 </h1>
 
-<?php do_action('in_admin_header'); ?>
+<?php
+
+do_action('in_admin_header');
 
-<div id="wphead-info">
-<div id="user_info">
-<p><?php
 $links = array();
-$links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
-$links[15] = '| <a href="' . wp_logout_url() . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a>';
 
-$links = apply_filters('admin_user_info_links', $links, $current_user);
-ksort($links);
+// Generate user profile and info links.
+$links[5] = sprintf( __('Howdy, %1$s'), $user_identity );
 
-echo implode(' ', $links);
-?></p>
-</div>
+$links[8] = '<a href="profile.php" title="' . esc_attr__('Edit your profile') . '">' . __('Your Profile') . '</a>';
 
-<?php favorite_actions($current_screen); ?>
+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">
 <?php
-unset($title_class, $blog_name);
-
-require(ABSPATH . 'wp-admin/menu-header.php');
+unset($title_class, $blog_name, $total_update_count, $update_title);
 
 $current_screen->parent_file = $parent_file;
 $current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
@@ -151,7 +206,14 @@ $current_screen->parent_base = str_replace('.php', '', $current_screen->parent_b
 <?php
 screen_meta($current_screen);
 
-do_action('admin_notices');
+if ( is_network_admin() )
+	do_action('network_admin_notices');
+elseif ( is_user_admin() )
+	do_action('user_admin_notices');
+else
+	do_action('admin_notices');
+
+do_action('all_admin_notices');
 
 if ( $parent_file == 'options-general.php' )
 	require(ABSPATH . 'wp-admin/options-head.php');
