Changeset 16474

Timestamp:

11/18/2010 11:02:52 PM (14 years ago)

Author:

ryan

Message:

Titles for network admin and global dashboard. see #15477

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (3 diffs)
• network/index.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -14 +14 @@
 $title = esc_html( strip_tags( $title ) );
 
-$admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, get_bloginfo( 'name' ) );
+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 — WordPress' ), $title );
+else
+    $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
+
 $admin_title = apply_filters( 'admin_title', $admin_title, $title );
 
@@ -21 +32 @@
 
 // Save the ID of the last blog admin area visited if super admin.
-if ( is_multisite() && !is_network_admin() && is_super_admin() ) {
+if ( is_multisite() && is_blog_admin() && is_super_admin() ) {
     $last_blog = get_user_option('last-blog-admin-visited');
     if ( $last_blog != $blog_id )
@@ -103 +114 @@
 
 if ( is_network_admin() )
-    $blog_name = esc_html($current_site->site_name);
+    $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
 elseif ( is_user_admin() )
-    $blog_name = __('Global Dashboard');
+    $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
 else
     $blog_name = get_bloginfo('name', 'display');

trunk/wp-admin/network/index.php

@@ -20 +20 @@
     wp_die( __( 'You do not have permission to access this page.' ) );
 
-$title = __( 'Network Dashboard' );
+$title = __( 'Dashboard' );
 $parent_file = 'index.php';