WordPress.org
Get WordPress

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r17217 r14999  
    1313get_admin_page_title();
    1414$title = esc_html( strip_tags( $title ) );
    15 
    16 if ( is_network_admin() )
    17     $admin_title = __( 'Network Admin' );
    18 elseif ( is_user_admin() )
    19     $admin_title = __( 'Global Dashboard' );
    20 else
    21     $admin_title = get_bloginfo( 'name' );
    22 
    23 if ( $admin_title == $title )
    24     $admin_title = sprintf( __( '%1$s — WordPress' ), $title );
    25 else
    26     $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
    27 
    28 $admin_title = apply_filters( 'admin_title', $admin_title, $title );
    29 
    3015wp_user_settings();
    3116wp_menu_unfold();
    32 
    3317?>
    3418<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    … …  
    3620<head>
    3721<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    38 <title><?php echo $admin_title; ?></title>
     22<title><?php echo $title; ?> &lsaquo; <?php bloginfo('name') ?>  &#8212; WordPress</title>
    3923<?php
    4024
    41 wp_admin_css( 'global' );
     25wp_admin_css( 'css/global' );
    4226wp_admin_css();
    43 wp_admin_css( 'colors' );
    44 wp_admin_css( 'ie' );
     27wp_admin_css( 'css/colors' );
     28wp_admin_css( 'css/ie' );
    4529if ( is_multisite() )
    46     wp_admin_css( 'ms' );
     30    wp_admin_css( 'css/ms' );
    4731wp_enqueue_script('utils');
    4832
    … …  
    7054if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
    7155    add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
    72     add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
    7356    wp_enqueue_script('quicktags');
    7457}
    … …  
    8467if ( get_user_setting('mfold') == 'f' )
    8568    $admin_body_class .= ' folded';
    86 
    87 if ( is_admin_bar_showing() )
    88     $admin_body_class .= ' admin-bar';
    8969
    9070if ( $is_iphone ) { ?>
    … …  
    10787<div id="wphead">
    10888<?php
    109 
    110 if ( is_network_admin() )
    111     $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
    112 elseif ( is_user_admin() )
    113     $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
    114 else
    115     $blog_name = get_bloginfo('name', 'display');
     89$blog_name = get_bloginfo('name', 'display');
    11690if ( '' == $blog_name ) {
    117     $blog_name = __( 'Visit Site' );
     91    $blog_name = '&nbsp;';
    11892} else {
    11993    $blog_name_excerpt = wp_html_excerpt($blog_name, 40);
    … …  
    138112        <span id="site-title"><?php echo $blog_name ?></span>
    139113    </a>
    140 <?php if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
     114<?php if ( current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
    141115    <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>
    142116<?php endif; ?>
    … …  
    150124$links = array();
    151125$links[5] = sprintf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity);
    152 if ( 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>';
     126$links[15] = '| <a href="' . wp_logout_url() . '" title="' . __('Log Out') . '">' . __('Log Out') . '</a>';
    159127
    160128$links = apply_filters('admin_user_info_links', $links, $current_user);
    … …  
    171139<div id="wpbody">
    172140<?php
    173 unset($title_class, $blog_name, $total_update_count, $update_title);
     141unset($title_class, $blog_name);
    174142
    175143require(ABSPATH . 'wp-admin/menu-header.php');
    … …  
    184152screen_meta($current_screen);
    185153
    186 if ( is_network_admin() )
    187     do_action('network_admin_notices');
    188 elseif ( is_user_admin() )
    189     do_action('user_admin_notices');
    190 else
    191     do_action('admin_notices');
    192 
    193 do_action('all_admin_notices');
     154do_action('admin_notices');
    194155
    195156if ( $parent_file == 'options-general.php' )
Note: See TracChangeset for help on using the changeset viewer.