<!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>[13379] trunk/wp-admin: more multisite UX rebranding, See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13379">13379</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-24 19:56:10 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>more multisite UX rebranding, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (13378 => 13379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-02-24 19:25:13 UTC (rev 13378)
+++ trunk/wp-admin/ms-admin.php 2010-02-24 19:56:10 UTC (rev 13379)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> $c_blogs = get_blog_count();
</span><span class="cx">
</span><span class="cx"> $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
</span><del>-$blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );
</del><ins>+$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
</ins><span class="cx">
</span><span class="cx"> $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13378 => 13379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-02-24 19:25:13 UTC (rev 13378)
+++ trunk/wp-admin/ms-edit.php 2010-02-24 19:56:10 UTC (rev 13379)
</span><span class="lines">@@ -141,14 +141,14 @@
</span><span class="cx"> wp_die( __('You do not have permission to access this page.') );
</span><span class="cx">
</span><span class="cx"> if ( is_array( $_POST[ 'blog' ] ) == false )
</span><del>- wp_die( "Can't create an empty blog." );
</del><ins>+ wp_die( "Can't create an empty site." );
</ins><span class="cx"> $blog = $_POST['blog'];
</span><span class="cx"> $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) );
</span><span class="cx"> $email = sanitize_email( $blog[ 'email' ] );
</span><span class="cx"> $title = $blog[ 'title' ];
</span><span class="cx">
</span><span class="cx"> if ( empty($domain) || empty($email) )
</span><del>- wp_die( __('Missing blog address or email address.') );
</del><ins>+ wp_die( __('Missing site address or email address.') );
</ins><span class="cx"> if ( !is_email( $email ) )
</span><span class="cx"> wp_die( __('Invalid email address') );
</span><span class="cx">
</span><span class="lines">@@ -178,8 +178,8 @@
</span><span class="cx"> $dashboard_blog = get_dashboard_blog();
</span><span class="cx"> if ( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id )
</span><span class="cx"> update_user_option( $user_id, 'primary_blog', $id, true );
</span><del>- $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) );
- wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Blog Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
</del><ins>+ $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) );
+ wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Site Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
</ins><span class="cx"> wpmu_welcome_notification( $id, $user_id, $password, $title, array( "public" => 1 ) );
</span><span class="cx"> wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) );
</span><span class="cx"> exit();
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists('language_attributes') ) language_attributes(); ?>>
</span><span class="cx"> <head>
</span><del>- <title><?php _e("WordPress MU &rsaquo; Confirm your action"); ?></title>
</del><ins>+ <title><?php _e("WordPress &rsaquo; Confirm your action"); ?></title>
</ins><span class="cx">
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</span><span class="cx"> <?php wp_admin_css( 'install', true ); ?>
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> $user = new WP_User( $val );
</span><span class="cx"> if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) )
</span><del>- wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a site admnistrator.' ), $user->user_login ) );
</del><ins>+ wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network admnistrator.' ), $user->user_login ) );
</ins><span class="cx"> if ( isset($_POST['alluser_spam']) ) {
</span><span class="cx"> $userfunction = 'all_spam';
</span><span class="cx"> $blogs = get_blogs_of_user( $val, true );
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (13378 => 13379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-02-24 19:25:13 UTC (rev 13378)
+++ trunk/wp-admin/ms-options.php 2010-02-24 19:56:10 UTC (rev 13379)
</span><span class="lines">@@ -21,13 +21,13 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e('Site Options') ?></h2>
</del><ins>+ <h2><?php _e('Network Options') ?></h2>
</ins><span class="cx"> <form method="post" action="ms-edit.php?action=siteoptions">
</span><span class="cx"> <?php wp_nonce_field( "siteoptions" ); ?>
</span><del>- <h3><?php _e('Operational Settings <em>(These settings cannot be modified by blog owners)</em>') ?></h3>
</del><ins>+ <h3><?php _e('Operational Settings <em>(These settings cannot be modified by site owners)</em>') ?></h3>
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><del>- <th scope="row"><?php _e('Site Name') ?></th>
</del><ins>+ <th scope="row"><?php _e('Network Name') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input name="site_name" type="text" id="site_name" style="width: 95%" value="<?php echo esc_attr($current_site->site_name) ?>" size="45" />
</span><span class="cx"> <br />
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><del>- <th scope="row"><?php _e('Site Admin Email') ?></th>
</del><ins>+ <th scope="row"><?php _e('Network Admin Email') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input name="admin_email" type="text" id="admin_email" style="width: 95%" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" size="45" />
</span><span class="cx"> <br />
</span><span class="lines">@@ -52,12 +52,12 @@
</span><span class="cx"> ?>
</span><span class="cx"> <td>
</span><span class="cx"> <label><input name="registration" type="radio" id="registration1" value='none' <?php checked( get_site_option('registration'), 'none') ?> /> <?php _e('Disabled'); ?></label><br />
</span><del>- <label><input name="registration" type="radio" id="registration2" value='all' <?php checked( get_site_option('registration'), 'all') ?> /> <?php _e('Enabled. Blogs and user accounts can be created.'); ?></label><br />
</del><ins>+ <label><input name="registration" type="radio" id="registration2" value='all' <?php checked( get_site_option('registration'), 'all') ?> /> <?php _e('Enabled. Sites and user accounts can be created.'); ?></label><br />
</ins><span class="cx"> <label><input name="registration" type="radio" id="registration3" value='user' <?php checked( get_site_option('registration'), 'user') ?> /> <?php _e('Only user account can be created.'); ?></label><br />
</span><del>- <label><input name="registration" type="radio" id="registration4" value='blog' <?php checked( get_site_option('registration'), 'blog') ?> /> <?php _e('Only logged in users can create new blogs.'); ?></label><br />
- <p><?php _e('Disable or enable registration and who or what can be registered. (Default=all)'); ?></p>
</del><ins>+ <label><input name="registration" type="radio" id="registration4" value='blog' <?php checked( get_site_option('registration'), 'blog') ?> /> <?php _e('Only logged in users can create new sites.'); ?></label><br />
+ <p><?php _e('Disable or enable registration and who or what can be registered. (Default=Disabled)'); ?></p>
</ins><span class="cx"> <?php if ( is_subdomain_install() ) {
</span><del>- echo '<p>' . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant blog.') . '</p>';
</del><ins>+ echo '<p>' . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant site.') . '</p>';
</ins><span class="cx"> } ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input name="registrationnotification" type="radio" id="registrationnotification1" value='yes' <?php checked( get_site_option('registrationnotification'), 'yes') ?> /> <?php _e('Yes'); ?><br />
</span><span class="cx"> <input name="registrationnotification" type="radio" id="registrationnotification2" value='no' <?php checked( get_site_option('registrationnotification'), 'no') ?> /> <?php _e('No'); ?><br />
</span><del>- <?php _e('Send the site admin an email notification every time someone registers a blog or user account.') ?>
</del><ins>+ <?php _e('Send the network admin an email notification every time someone registers a site or user account.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -79,14 +79,14 @@
</span><span class="cx"> <th scope="row"><?php _e('Add New Users') ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <a name='addnewusers'></a>
</span><del>- <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users') ) ?> /> <?php _e('Yes'); ?><br />
- <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0) ?> /> <?php _e('No'); ?><br />
- <?php _e('Allow blog administrators to add new users to their blog via the Users->Add New page.') ?>
</del><ins>+ <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users'), 1 ) ?> /> <?php _e('Yes'); ?><br />
+ <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0 ) ?> /> <?php _e('No'); ?><br />
+ <?php _e('Allow site administrators to add new users to their site via the Users->Add New page.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span><del>- <th scope="row"><?php _e('Dashboard Blog') ?></th>
</del><ins>+ <th scope="row"><?php _e('Dashboard Site') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <?php
</span><span class="cx"> if ( $dashboard_blog = get_site_option( 'dashboard_blog' ) ) {
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr($blogname); ?>" />
</span><span class="cx"> <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr($blogname); ?>" size="30" />
</span><span class="cx"> <br />
</span><del>- <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this blog as subscribers (or the user role defined below) if they don't have a blog. Leave blank for the main blog. 'Subscriber' users on old blog will be moved to the new blog if changed. New blog will be created if it does not exist." ); ?>
</del><ins>+ <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this site as subscribers (or the user role defined below) if they don't have a site. Leave blank for the main site. 'Subscriber' users on old site will be moved to the new site if changed. New site will be created if it does not exist." ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="cx"> <br />
</span><del>- <?php _e( "The default role for new users on the Dashboard blog. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?>
</del><ins>+ <?php _e( "The default role for new users on the Dashboard site. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input name="illegal_names" type="text" id="illegal_names" style="width: 95%" value="<?php echo esc_attr( implode( " ", get_site_option('illegal_names') ) ); ?>" size="45" />
</span><span class="cx"> <br />
</span><del>- <?php _e('Users are not allowed to register these blogs. Separate names by spaces.') ?>
</del><ins>+ <?php _e('Users are not allowed to register these sites. Separate names by spaces.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><span class="cx"> <textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('If you want to limit blog registrations to certain domains. One domain per line.') ?>
</del><ins>+ <?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="banned_email_domains" id="banned_email_domains" cols='40' rows='5'><?php echo get_site_option('banned_email_domains') == '' ? '' : @implode( "\n", get_site_option('banned_email_domains') ); ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('If you want to ban certain email domains from blog registrations. One domain per line.') ?>
</del><ins>+ <?php _e('If you want to ban certain email domains from site registrations. One domain per line.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="welcome_email" id="welcome_email" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('welcome_email') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('The welcome email sent to new blog owners.') ?>
</del><ins>+ <?php _e('The welcome email sent to new site owners.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('First post on a new blog.') ?>
</del><ins>+ <?php _e('First post on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_page" id="first_page" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('First page on a new blog.') ?>
</del><ins>+ <?php _e('First page on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_comment" id="first_comment" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('First comment on a new blog.') ?>
</del><ins>+ <?php _e('First comment on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input type="text" size='40' name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
</span><span class="cx"> <br />
</span><del>- <?php _e('Author of first comment on a new blog.') ?>
</del><ins>+ <?php _e('Author of first comment on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input type="text" size='40' name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" />
</span><span class="cx"> <br />
</span><del>- <?php _e('URL on first comment on a new blog.') ?>
</del><ins>+ <?php _e('URL on first comment on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -208,14 +208,14 @@
</span><span class="cx"> <?php _e( 'The media upload buttons to display on the "Write Post" page. Make sure you update the "Upload File Types" below as well.' ); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>- <th scope="row"><?php _e('Blog upload space check') ?></th>
</del><ins>+ <th scope="row"><?php _e('Site upload space check') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='0' <?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php _e( 'Enabled' ); ?></label><br />
</span><span class="cx"> <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='1' <?php checked( get_site_option( 'upload_space_check_disabled' ) ) ?>/> <?php _e( 'Disabled' ); ?></label><br />
</span><span class="cx"> <?php _e( 'By default there is a limit on the total size of files uploaded but it can be disabled here.' ); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>- <th scope="row"><?php _e('Blog upload space') ?></th>
</del><ins>+ <th scope="row"><?php _e('Site upload space') ?></th>
</ins><span class="cx"> <td><input name="blog_upload_space" type="text" id="blog_upload_space" value="<?php echo esc_attr( get_site_option('blog_upload_space', 10) ) ?>" size="3" /> MB</td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -231,25 +231,25 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Admin Notice Feed') ?></th>
</span><span class="cx"> <td><input name="admin_notice_feed" style="width: 95%" type="text" id="admin_notice_feed" value="<?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?>" size="80" /><br />
</span><del>- <?php _e( 'Display the latest post from this RSS or Atom feed on all blog dashboards. Leave blank to disable.' ); ?><br />
</del><ins>+ <?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?><br />
</ins><span class="cx"> <?php if ( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' )
</span><del>- echo __( "A good one to use would be the feed from your main blog: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td>
</del><ins>+ echo __( "A good one to use would be the feed from your main site: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <h3><?php _e('Administration Settings') ?></h3>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><del>- <th scope="row"><?php _e('Site Admins') ?></th>
</del><ins>+ <th scope="row"><?php _e('Network Admins') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input name="site_admins" type="text" id="site_admins" style="width: 95%" value="<?php echo esc_attr( implode(' ', get_site_option( 'site_admins', array( 'admin' ) ) ) ) ?>" size="45" />
</span><span class="cx"> <br />
</span><del>- <?php _e('These users may login to the main blog and administer the site. Space separated list of usernames.') ?>
</del><ins>+ <?php _e('These users may login to the main site and administer the network. Space separated list of usernames.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>- <h3><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></h3>
</del><ins>+ <h3><?php _e('Network Wide Settings <em>(These settings may be overridden by site owners)</em>') ?></h3>
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php
</span><span class="cx"> $languages = get_available_languages();
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (13378 => 13379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-02-24 19:25:13 UTC (rev 13378)
+++ trunk/wp-admin/ms-sites.php 2010-02-24 19:56:10 UTC (rev 13379)
</span><span class="lines">@@ -23,43 +23,43 @@
</span><span class="cx"> <?php
</span><span class="cx"> switch ($_GET['action']) {
</span><span class="cx"> case 'all_notspam':
</span><del>- _e('Blogs mark as not spam !');
</del><ins>+ _e('Sites mark as not spam !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'all_spam':
</span><del>- _e('Blogs mark as spam !');
</del><ins>+ _e('Sites mark as spam !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'all_delete':
</span><del>- _e('Blogs deleted !');
</del><ins>+ _e('Sites deleted !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'delete':
</span><del>- _e('Blog deleted !');
</del><ins>+ _e('Site deleted !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'add-blog':
</span><del>- _e('Blog added !');
</del><ins>+ _e('Site added !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'archive':
</span><del>- _e('Blog archived !');
</del><ins>+ _e('Site archived !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'unarchive':
</span><del>- _e('Blog unarchived !');
</del><ins>+ _e('Site unarchived !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'activate':
</span><del>- _e('Blog activated !');
</del><ins>+ _e('Site activated !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'deactivate':
</span><del>- _e('Blog deactivated !');
</del><ins>+ _e('Site deactivated !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'unspam':
</span><del>- _e('Blog mark as not spam !');
</del><ins>+ _e('Site mark as not spam !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'spam':
</span><del>- _e('Blog mark as spam !');
</del><ins>+ _e('Site mark as spam !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'umature':
</span><del>- _e('Blog mark as not mature !');
</del><ins>+ _e('Site mark as not mature !');
</ins><span class="cx"> break;
</span><span class="cx"> case 'mature':
</span><del>- _e('Blog mark as mature !');
</del><ins>+ _e('Site mark as mature !');
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> _e('Options saved !');
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
</span><span class="cx"> <div class='metabox-holder' style='width:49%;float:left;'>
</span><span class="cx"> <div id="blogedit_bloginfo" class="postbox " >
</span><del>- <h3 class='hndle'><span><?php _e('Blog info (wp_blogs)'); ?></span></h3>
</del><ins>+ <h3 class='hndle'><span><?php _e('Site info (wp_blogs)'); ?></span></h3>
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="blogedit_blogoptions" class="postbox " >
</span><del>- <h3 class='hndle'><span><?php printf( __('Blog options (%soptions)'), $blog_prefix ); ?></span></h3>
</del><ins>+ <h3 class='hndle'><span><?php printf( __('Site options (%soptions)'), $blog_prefix ); ?></span></h3>
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> if ( $out != '' ) {
</span><span class="cx"> ?>
</span><span class="cx"> <div id="blogedit_blogthemes" class="postbox">
</span><del>- <h3 class='hndle'><span><?php esc_html_e('Blog Themes'); ?></span></h3>
</del><ins>+ <h3 class='hndle'><span><?php esc_html_e('Site Themes'); ?></span></h3>
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr><th style="font-weight:bold;"><?php esc_html_e('Theme'); ?></th></tr>
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> // Blog users
</span><span class="cx"> $blogusers = get_users_of_blog( $id );
</span><span class="cx"> if ( is_array( $blogusers ) ) {
</span><del>- echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __('Blog Users') . '</span></h3><div class="inside">';
</del><ins>+ echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __('Site Users') . '</span></h3><div class="inside">';
</ins><span class="cx"> echo '<table class="form-table">';
</span><span class="cx"> echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>";
</span><span class="cx"> reset($blogusers);
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="blogedit_miscoptions" class="postbox">
</span><del>- <h3 class='hndle'><span><?php _e('Misc Blog Actions') ?></span></h3>
</del><ins>+ <h3 class='hndle'><span><?php _e('Misc Site Actions') ?></span></h3>
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php do_action( 'wpmueditblogaction', $id ); ?>
</span><span class="lines">@@ -507,21 +507,21 @@
</span><span class="cx"> $actions[] = "<a href='" . get_admin_url($blog['blog_id']) . "' class='edit'>" . __('Backend') . '</a>';
</span><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) . '">' . __('Activate') . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) . '">' . __('Activate') . '</a>';
</ins><span class="cx"> else
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], "archived" ) == '1' )
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';
</ins><span class="cx"> else
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) . '">' . __('Archive') . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the site %s" ), $blogname ) ) . '">' . __('Archive') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], "spam" ) == '1' )
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the site %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';
</ins><span class="cx"> else
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';
</ins><span class="cx">
</span><del>- $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) . '">' . __("Delete") . '</a>';
</del><ins>+ $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the site %s" ), $blogname ) ) . '">' . __("Delete") . '</a>';
</ins><span class="cx">
</span><span class="cx"> $actions[] = "<a href='" . get_home_url($blog['blog_id']) . "' rel='permalink'>" . __('Visit') . '</a>';
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (13378 => 13379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-02-24 19:25:13 UTC (rev 13378)
+++ trunk/wp-admin/ms-users.php 2010-02-24 19:56:10 UTC (rev 13379)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php if ( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
</span><del>- <p><a href="ms-sites.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
</del><ins>+ <p><a href="ms-sites.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Sites for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <?php foreach( (array) $posts_columns as $column_id => $column_display_name) {
</span><span class="cx"> if ( $column_id == 'blogs' ) {
</span><del>- echo '<th scope="col">'.__('Blogs').'</th>';
</del><ins>+ echo '<th scope="col">'.__('Sites').'</th>';
</ins><span class="cx"> } elseif ( $column_id == 'checkbox') {
</span><span class="cx"> echo '<th scope="col" class="check-column"><input type="checkbox" /></th>';
</span><span class="cx"> } else { ?>
</span></span></pre>
</div>
</div>
</body>
</html>