<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16474] trunk/wp-admin: Titles for network admin and global dashboard.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16474">16474</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-18 23:02:52 +0000 (Thu, 18 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Titles for network admin and global dashboard. see <a href="http://trac.wordpress.org/ticket/15477">#15477</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminnetworkindexphp">trunk/wp-admin/network/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (16473 => 16474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-11-18 22:51:36 UTC (rev 16473)
+++ trunk/wp-admin/admin-header.php 2010-11-18 23:02:52 UTC (rev 16474)
</span><span class="lines">@@ -13,14 +13,25 @@
</span><span class="cx"> get_admin_page_title();
</span><span class="cx"> $title = esc_html( strip_tags( $title ) );
</span><span class="cx">
</span><del>-$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, get_bloginfo( 'name' ) );
</del><ins>+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 );
+
</ins><span class="cx"> $admin_title = apply_filters( 'admin_title', $admin_title, $title );
</span><span class="cx">
</span><span class="cx"> wp_user_settings();
</span><span class="cx"> wp_menu_unfold();
</span><span class="cx">
</span><span class="cx"> // Save the ID of the last blog admin area visited if super admin.
</span><del>-if ( is_multisite() && !is_network_admin() && is_super_admin() ) {
</del><ins>+if ( is_multisite() && is_blog_admin() && is_super_admin() ) {
</ins><span class="cx"> $last_blog = get_user_option('last-blog-admin-visited');
</span><span class="cx"> if ( $last_blog != $blog_id )
</span><span class="cx"> update_user_option(get_current_user_id(), 'last-blog-admin-visited', $blog_id, true);
</span><span class="lines">@@ -102,9 +113,9 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() )
</span><del>- $blog_name = esc_html($current_site->site_name);
</del><ins>+ $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) );
</ins><span class="cx"> elseif ( is_user_admin() )
</span><del>- $blog_name = __('Global Dashboard');
</del><ins>+ $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) );
</ins><span class="cx"> else
</span><span class="cx"> $blog_name = get_bloginfo('name', 'display');
</span><span class="cx"> if ( '' == $blog_name ) {
</span></span></pre></div>
<a id="trunkwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index.php (16473 => 16474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index.php 2010-11-18 22:51:36 UTC (rev 16473)
+++ trunk/wp-admin/network/index.php 2010-11-18 23:02:52 UTC (rev 16474)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> if ( ! current_user_can( 'manage_network' ) )
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><del>-$title = __( 'Network Dashboard' );
</del><ins>+$title = __( 'Dashboard' );
</ins><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span></span></pre>
</div>
</div>
</body>
</html>