WordPress.org
Get WordPress

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-header.php

    r14999 r17217  
    1313get_admin_page_title();
    1414$title = esc_html( strip_tags( $title ) );
     15
     16if ( is_network_admin() )
     17    $admin_title = __( 'Network Admin' );
     18elseif ( is_user_admin() )
     19    $admin_title = __( 'Global Dashboard' );
     20else
     21    $admin_title = get_bloginfo( 'name' );
     22
     23if ( $admin_title == $title )
     24    $admin_title = sprintf( __( '%1$s — WordPress' ), $title );
     25else
     26    $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
     27
     28$admin_title = apply_filters( 'admin_title', $admin_title, $title );
     29
    1530wp_user_settings();
    1631wp_menu_unfold();
     32
    1733?>
    1834<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    … …  
    2036<head>
    2137<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    22 <title><?php echo $title; ?> &lsaquo; <?php bloginfo('name') ?>  &#8212; WordPress</title>
     38<title><?php echo $admin_title; ?></title>
    2339<?php
    2440
    25 wp_admin_css( 'css/global' );
     41wp_admin_css( 'global' );
    2642wp_admin_css();
    27 wp_admin_css( 'css/colors' );
    28 wp_admin_css( 'css/ie' );
     43wp_admin_css( 'colors' );
     44wp_admin_css( 'ie' );
    2945if ( is_multisite() )
    30     wp_admin_css( 'css/ms' );
     46    wp_admin_css( 'ms' );
    3147wp_enqueue_script('utils');
    3248
    … …  
    5470if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
    5571    add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
     72    add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
    5673    wp_enqueue_script('quicktags');
    5774}
    … …  
    6784if ( get_user_setting('mfold') == 'f' )
    6885    $admin_body_class .= ' folded';
     86
     87if ( is_admin_bar_showing() )
     88    $admin_body_class .= ' admin-bar';
    6989
    7090if ( $is_iphone ) { ?>
    … …  
    87107<div id="wphead">
    88108<?php
    89 $blog_name = get_bloginfo('name', 'display');
     109
     110if ( is_network_admin() )
     111    $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
     112elseif ( is_user_admin() )
     113    $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
     114else
     115    $blog_name = get_bloginfo('name', 'display');
    90116if ( '' == $blog_name ) {
    91     $blog_name = '&nbsp;';
     117    $blog_name = __( 'Visit Site' );
    92118} else {
    93119    $blog_name_excerpt = wp_html_excerpt($blog_name, 40);
    … …  
    112138        <span id="site-title"><?php echo $blog_name ?></span>
    113139    </a>
    114 <?php if ( current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
     140<?php if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
    115141    <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>
    116142<?php endif; ?>
    … …  
    124150$links = array();
    125151$links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
    126 $links[15] = '| <a href="' . wp_logout_url() . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a>';
     152if ( is_multisite() && is_super_admin() ) {
     153    if ( !is_network_admin() )
     154        $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>';
     155    else
     156        $links[10] = '| <a href="' . get_dashboard_url( get_current_user_id() ) . '" title="' . esc_attr__('Site Admin') . '">' . __('Site Admin') . '</a>';
     157}
     158$links[15] = '| <a href="' . wp_logout_url() . '" title="' . esc_attr__('Log Out') . '">' . __('Log Out') . '</a>';
    127159
    128160$links = apply_filters('admin_user_info_links', $links, $current_user);
    … …  
    139171<div id="wpbody">
    140172<?php
    141 unset($title_class, $blog_name);
     173unset($title_class, $blog_name, $total_update_count, $update_title);
    142174
    143175require(ABSPATH . 'wp-admin/menu-header.php');
    … …  
    152184screen_meta($current_screen);
    153185
    154 do_action('admin_notices');
     186if ( is_network_admin() )
     187    do_action('network_admin_notices');
     188elseif ( is_user_admin() )
     189    do_action('user_admin_notices');
     190else
     191    do_action('admin_notices');
     192
     193do_action('all_admin_notices');
    155194
    156195if ( $parent_file == 'options-general.php' )
Note: See TracChangeset for help on using the changeset viewer.