<!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>[13384] trunk: more multisite UX rebranding, See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13384">13384</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-24 20:45:02 +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="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (13383 => 13384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-02-24 20:14:12 UTC (rev 13383)
+++ trunk/wp-activate.php 2010-02-24 20:45:02 UTC (rev 13384)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> if ( $signup->domain . $signup->path == '' ) {
</span><span class="cx"> printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
</span><span class="cx"> } else {
</span><del>- printf(__('<p class="lead-in">Your blog at <a href="%1$s">%2$s</a> is active. You may now login to your blog using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
</del><ins>+ printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now login to your site using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (13383 => 13384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-02-24 20:14:12 UTC (rev 13383)
+++ trunk/wp-signup.php 2010-02-24 20:45:02 UTC (rev 13384)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> global $current_site;
</span><span class="cx"> // Blog name
</span><span class="cx"> if ( !is_subdomain_install() )
</span><del>- echo '<label for="blogname">' . __('Blog Name:') . '</label>';
</del><ins>+ echo '<label for="blogname">' . __('Site Name:') . '</label>';
</ins><span class="cx"> else
</span><del>- echo '<label for="blogname">' . __('Blog Domain:') . '</label>';
</del><ins>+ echo '<label for="blogname">' . __('Site Domain:') . '</label>';
</ins><span class="cx">
</span><span class="cx"> if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if ( !is_user_logged_in() ) {
</span><span class="cx"> print '(<strong>' . __( 'Your address will be ' );
</span><span class="cx"> if ( !is_subdomain_install() )
</span><del>- print $current_site->domain . $current_site->path . __( 'blogname' );
</del><ins>+ print $current_site->domain . $current_site->path . __( 'sitename' );
</ins><span class="cx"> else
</span><span class="cx"> print __( 'domain.' ) . $current_site->domain . $current_site->path;
</span><span class="cx"> echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> // Blog Title
</span><span class="cx"> ?>
</span><del>- <label for="blog_title"><?php _e('Blog Title:') ?></label>
</del><ins>+ <label for="blog_title"><?php _e('Site Title:') ?></label>
</ins><span class="cx"> <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><span class="cx"> <?php }
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <div id="privacy">
</span><span class="cx"> <p class="privacy-intro">
</span><span class="cx"> <label for="blog_public_on"><?php _e('Privacy:') ?></label>
</span><del>- <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
</del><ins>+ <?php _e('I would like my site to appear in search engines like Google and Technorati, and in public listings around this network.'); ?>
</ins><span class="cx"> <div style="clear:both;"></div>
</span><span class="cx"> <label class="checkbox" for="blog_public_on">
</span><span class="cx"> <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
</span><span class="lines">@@ -160,19 +160,19 @@
</span><span class="cx"> $blog_title = $filtered_results['blog_title'];
</span><span class="cx"> $errors = $filtered_results['errors'];
</span><span class="cx">
</span><del>- echo '<h2>' . sprintf( __('Get <em>another</em> %s blog in seconds'), $current_site->site_name ) . '</h2>';
</del><ins>+ echo '<h2>' . sprintf( __('Get <em>another</em> %s site in seconds'), $current_site->site_name ) . '</h2>';
</ins><span class="cx">
</span><span class="cx"> if ( $errors->get_error_code() ) {
</span><span class="cx"> echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
</del><ins>+ <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart's content, but write responsibly."), $current_user->display_name) ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $blogs = get_blogs_of_user($current_user->ID);
</span><span class="cx"> if ( !empty($blogs) ) { ?>
</span><span class="cx"> <p>
</span><del>- <?php _e('Blogs you are already a member of:') ?>
</del><ins>+ <?php _e('Sites you are already a member of:') ?>
</ins><span class="cx"> <ul>
</span><span class="cx"> <?php foreach ( $blogs as $blog ) {
</span><span class="cx"> echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";
</span><span class="lines">@@ -181,12 +181,12 @@
</span><span class="cx"> </p>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>- <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
</del><ins>+ <p><?php _e("If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!") ?></p>
</ins><span class="cx"> <form id="setupform" method="post" action="wp-signup.php">
</span><span class="cx"> <input type="hidden" name="stage" value="gimmeanotherblog" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Blog') ?>" /></p>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Site') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -216,9 +216,9 @@
</span><span class="cx">
</span><span class="cx"> function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
</span><span class="cx"> ?>
</span><del>- <h2><?php printf(__('The blog %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</del><ins>+ <h2><?php printf(__('The site %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</ins><span class="cx"> <p>
</span><del>- <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog. <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
</del><ins>+ <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="cx"> do_action('signup_finished');
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> <input id="signupblog" type="hidden" name="signup_for" value="user" />
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
</span><del>- <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
</del><ins>+ <label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
</ins><span class="cx"> <br />
</span><span class="cx"> <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
</span><span class="cx"> <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
</span><span class="lines">@@ -352,11 +352,11 @@
</span><span class="cx">
</span><span class="cx"> function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
</span><span class="cx"> ?>
</span><del>- <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</del><ins>+ <h2><?php printf(__('Congratulations! Your new site, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</ins><span class="cx">
</span><del>- <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>
</del><ins>+ <p><?php _e('But, before you can start using your site, <strong>you must activate it</strong>.') ?></p>
</ins><span class="cx"> <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>
</span><del>- <p><?php _e('If you do not activate your blog within two days, you will have to sign up again.'); ?></p>
</del><ins>+ <p><?php _e('If you do not activate your site within two days, you will have to sign up again.'); ?></p>
</ins><span class="cx"> <h2><?php _e('Still waiting for your email?'); ?></h2>
</span><span class="cx"> <p>
</span><span class="cx"> <?php _e("If you haven't received your email yet, there are a number of things you can do:") ?>
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> else
</span><span class="cx"> $proto = 'http://';
</span><span class="cx"> $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
</span><del>- echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new blog."), $login_url );
</del><ins>+ echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url );
</ins><span class="cx"> } else {
</span><span class="cx"> switch ($_POST['stage']) {
</span><span class="cx"> case 'validate-user-signup' :
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> if ( $active_signup == 'all' || $active_signup == 'blog' )
</span><span class="cx"> validate_blog_signup();
</span><span class="cx"> else
</span><del>- _e( "Blog registration has been disabled." );
</del><ins>+ _e( "Site registration has been disabled." );
</ins><span class="cx"> break;
</span><span class="cx"> case 'gimmeanotherblog':
</span><span class="cx"> validate_another_blog_signup();
</span><span class="lines">@@ -427,9 +427,9 @@
</span><span class="cx"> else
</span><span class="cx"> $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
</span><span class="cx"> if ( $active_signup == 'blog' || $active_signup == 'all' )
</span><del>- printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
</del><ins>+ printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
</ins><span class="cx"> else
</span><del>- printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
</del><ins>+ printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>