<!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" />
<title>[54191] trunk/src: Login and Registration: Access improvements to network signup.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54191">54191</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54191","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-16 23:11:41 +0000 (Fri, 16 Sep 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Login and Registration: Access improvements to network signup.
Fix a variety of accessibility issues with the network registration and activation screens. Fix associations between error messages and fields, improve labels for radio buttons, add fieldset and legend to properly group fields.
Props afercia, allisonplus, sabernhardt.
Fixes <a href="https://core.trac.wordpress.org/ticket/40361">#40361</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-activate.php 2022-09-16 22:37:48 UTC (rev 54190)
+++ trunk/src/wp-activate.php 2022-09-16 23:11:41 UTC (rev 54191)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,10 +105,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_activate_stylesheet() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- form { margin-top: 2em; }
- #submit, #key { width: 90%; font-size: 24px; }
- #language { margin-top: .5em; }
- .error { background: #f66; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .wp-activate-container { width: 90%; margin: 0 auto; }
+ .wp-activate-container form { margin-top: 2em; }
+ #submit, #key { width: 100%; font-size: 24px; box-sizing: border-box; }
+ #language { margin-top: 0.5em; }
+ .wp-activate-container .error { background: #f66; color: #333; }
</ins><span class="cx" style="display: block; padding: 0 10px"> span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: 600; }
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( $blog_details->path . 'wp-activate.php' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="key"><?php _e( 'Activation Key:' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <br /><input type="text" name="key" id="key" value="" size="50" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <br /><input type="text" name="key" id="key" value="" size="50" autofocus="autofocus" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,9 +214,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<script type="text/javascript">
- var key_input = document.getElementById('key');
- key_input && key_input.focus();
-</script>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> get_footer( 'wp-activate' );
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2022-09-16 22:37:48 UTC (rev 54190)
+++ trunk/src/wp-signup.php 2022-09-16 23:11:41 UTC (rev 54191)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,25 +57,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_signup_stylesheet() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .mu_register { width: 90%; margin:0 auto; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .mu_register { width: 90%; margin: 0 auto; }
</ins><span class="cx" style="display: block; padding: 0 10px"> .mu_register form { margin-top: 2em; }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .mu_register .error { font-weight: 600; padding: 10px; color: #333333; background: #FFEBE8; border: 1px solid #CC0000; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .mu_register fieldset,
+ .mu_register legend { margin: 0; padding: 0; border: none; }
+ .mu_register .error { font-weight: 600; padding: 10px; color: #333; background: #ffebe8; border: 1px solid #c00; }
</ins><span class="cx" style="display: block; padding: 0 10px"> .mu_register input[type="submit"],
</span><span class="cx" style="display: block; padding: 0 10px"> .mu_register #blog_title,
</span><span class="cx" style="display: block; padding: 0 10px"> .mu_register #user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> .mu_register #blogname,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .mu_register #user_name { width: 100%; font-size: 24px; margin: 5px 0; box-sizing: border-box; }
</ins><span class="cx" style="display: block; padding: 0 10px"> .mu_register #site-language { display: block; }
</span><span class="cx" style="display: block; padding: 0 10px"> .mu_register .prefix_address,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .mu_register .suffix_address { font-size: 18px; display:inline; }
- .mu_register label { font-weight: 600; font-size: 15px; display: block; margin: 10px 0; }
- .mu_register label.checkbox { display:inline; }
- .mu_register .mu_alert { font-weight: 600; padding: 10px; color: #333333; background: #ffffe0; border: 1px solid #e6db55; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .mu_register .suffix_address { font-size: 18px; display: inline-block; direction: ltr; }
+ .mu_register label,
+ .mu_register legend,
+ .mu_register .label-heading { font-weight: 600; font-size: 15px; display: block; margin: 10px 0; }
+ .mu_register legend + p,
+ .mu_register input + p { margin-top: 0; }
+ .mu_register label.checkbox { display: inline; }
+ .mu_register .mu_alert { font-weight: 600; padding: 10px; color: #333; background: #ffffe0; border: 1px solid #e6db55; }
+ .mu_register .mu_alert a { color: inherit; text-decoration: underline; }
+ .mu_register .signup-options .wp-signup-radio-button { display: block; }
+ .mu_register .privacy-intro .wp-signup-radio-button { margin-right: 0.5em; }
+ .rtl .mu_register .wp-signup-blogname { direction: ltr; text-align: right; }
</ins><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_head', 'wpmu_signup_stylesheet' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_head', 'wpmu_signup_stylesheet' );
</del><span class="cx" style="display: block; padding: 0 10px"> get_header( 'wp-signup' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,18 +120,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="blogname">' . __( 'Site Domain:' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errmsg = $errors->get_error_message( 'blogname' );
- if ( $errmsg ) {
- ?>
- <p class="error"><?php echo $errmsg; ?></p>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg_blogname = $errors->get_error_message( 'blogname' );
+ $errmsg_blogname_aria = '';
+ if ( $errmsg_blogname ) {
+ $errmsg_blogname_aria = 'wp-signup-blogname-error ';
+ echo '<p class="error" id="wp-signup-blogname-error">' . $errmsg_blogname . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" /><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div class="wp-signup-blogname"><span class="prefix_address" id="prefix-address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" aria-describedby="' . $errmsg_blogname_aria . 'prefix-address" /></div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $site_domain = preg_replace( '|^www\.|', '', $current_network->domain );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" /><span class="suffix_address">.' . esc_html( $site_domain ) . '</span><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div class="wp-signup-blogname"><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" aria-describedby="' . $errmsg_blogname_aria . 'suffix-address" /><span class="suffix_address" id="suffix-address">.' . esc_html( $site_domain ) . '</span></div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,13 +153,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="blog_title"><?php _e( 'Site Title:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errmsg = $errors->get_error_message( 'blog_title' );
- if ( $errmsg ) {
- ?>
- <p class="error"><?php echo $errmsg; ?></p>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg_blog_title = $errors->get_error_message( 'blog_title' );
+ $errmsg_blog_title_aria = '';
+ if ( $errmsg_blog_title ) {
+ $errmsg_blog_title_aria = ' aria-describedby="wp-signup-blog-title-error"';
+ echo '<p class="error" id="wp-signup-blog-title-error">' . $errmsg_blog_title . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" autocomplete="off" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" autocomplete="off"' . $errmsg_blog_title_aria . ' />';
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,19 +207,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="privacy">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="privacy-intro">
- <?php _e( 'Privacy:' ); ?>
- <?php _e( 'Allow search engines to index this site.' ); ?>
- <br style="clear:both" />
- <label class="checkbox" for="blog_public_on">
- <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php echo $blog_public_on_checked; ?> />
- <strong><?php _e( 'Yes' ); ?></strong>
- </label>
- <label class="checkbox" for="blog_public_off">
- <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php echo $blog_public_off_checked; ?> />
- <strong><?php _e( 'No' ); ?></strong>
- </label>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset class="privacy-intro">
+ <legend>
+ <span class="label-heading"><?php _e( 'Privacy:' ); ?></span>
+ <?php _e( 'Allow search engines to index this site.' ); ?>
+ </legend>
+ <p class="wp-signup-radio-buttons">
+ <span class="wp-signup-radio-button">
+ <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php echo $blog_public_on_checked; ?> />
+ <label class="checkbox" for="blog_public_on"><?php _e( 'Yes' ); ?></label>
+ </span>
+ <span class="wp-signup-radio-button">
+ <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php echo $blog_public_off_checked; ?> />
+ <label class="checkbox" for="blog_public_off"><?php _e( 'No' ); ?></label>
+ </span>
+ </p>
+ </fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,26 +269,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Username.
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="user_name">' . __( 'Username:' ) . '</label>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errmsg = $errors->get_error_message( 'user_name' );
- if ( $errmsg ) {
- echo '<p class="error">' . $errmsg . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg_username = $errors->get_error_message( 'user_name' );
+ $errmsg_username_aria = '';
+ if ( $errmsg_username ) {
+ $errmsg_username_aria = 'wp-signup-username-error ';
+ echo '<p class="error" id="wp-signup-username-error">' . $errmsg_username . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input name="user_name" type="text" id="user_name" value="' . esc_attr( $user_name ) . '" autocapitalize="none" autocorrect="off" maxlength="60" autocomplete="username" /><br />';
- _e( '(Must be at least 4 characters, letters and numbers only.)' );
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="user_name" type="text" id="user_name" value="<?php echo esc_attr( $user_name ); ?>" autocapitalize="none" autocorrect="off" maxlength="60" autocomplete="username" aria-describedby="<?php echo $errmsg_username_aria; ?>wp-signup-username-description" />
+ <p id="wp-signup-username-description"><?php _e( '(Must be at least 4 characters, lowercase letters and numbers only.)' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="user_email"><?php _e( 'Email Address:' ); ?></label>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errmsg = $errors->get_error_message( 'user_email' );
- if ( $errmsg ) {
- ?>
- <p class="error"><?php echo $errmsg; ?></p>
- <?php } ?>
- <input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" /><br /><?php _e( 'Your registration email is sent to this address. (Double-check your email address before continuing.)' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Email address.
+ echo '<label for="user_email">' . __( 'Email Address:' ) . '</label>';
+ $errmsg_email = $errors->get_error_message( 'user_email' );
+ $errmsg_email_aria = '';
+ if ( $errmsg_email ) {
+ $errmsg_email_aria = 'wp-signup-email-error ';
+ echo '<p class="error" id="wp-signup-email-error">' . $errmsg_email . '</p>';
+ }
+ ?>
+ <input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" aria-describedby="<?php echo $errmsg_email_aria; ?>wp-signup-email-description" />
+ <p id="wp-signup-email-description"><?php _e( 'Your registration email is sent to this address. (Double-check your email address before continuing.)' ); ?></p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errmsg = $errors->get_error_message( 'generic' );
- if ( $errmsg ) {
- echo '<p class="error">' . $errmsg . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Extra fields.
+ $errmsg_generic = $errors->get_error_message( 'generic' );
+ if ( $errmsg_generic ) {
+ echo '<p class="error" id="wp-signup-generic-error">' . $errmsg_generic . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the end of the new user account registration form.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,19 +630,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php show_user_form( $user_name, $user_email, $errors ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <?php if ( 'blog' === $active_signup ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'blog' === $active_signup ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input id="signupblog" type="hidden" name="signup_for" value="blog" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php } elseif ( 'user' === $active_signup ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php elseif ( 'user' === $active_signup ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input id="signupblog" type="hidden" name="signup_for" value="user" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php } else { ?>
- <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
- <label class="checkbox" for="signupblog"><?php _e( 'Gimme a site!' ); ?></label>
- <br />
- <input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
- <label class="checkbox" for="signupuser"><?php _e( 'Just a username, please.' ); ?></label>
- <?php } ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php else : ?>
+ <fieldset class="signup-options">
+ <legend><?php _e( 'Create a site or only a username:' ); ?></legend>
+ <p class="wp-signup-radio-buttons">
+ <span class="wp-signup-radio-button">
+ <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
+ <label class="checkbox" for="signupblog"><?php _e( 'Gimme a site!' ); ?></label>
+ </span>
+ <span class="wp-signup-radio-button">
+ <input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
+ <label class="checkbox" for="signupuser"><?php _e( 'Just a username, please.' ); ?></label>
+ </span>
+ </p>
+ </fieldset>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Next' ); ?>" /></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,19 +868,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <?php _e( 'If you have not received your email yet, there are a number of things you can do:' ); ?>
- <ul id="noemail-tips">
- <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ); ?></strong></p></li>
- <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ); ?></p></li>
- <li>
- <?php
- /* translators: %s: Email address. */
- printf( __( 'Have you entered your email correctly? You have entered %s, if it’s incorrect, you will not receive your email.' ), $user_email );
- ?>
- </li>
- </ul>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'If you have not received your email yet, there are a number of things you can do:' ); ?></p>
+ <ul id="noemail-tips">
+ <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ); ?></strong></p></li>
+ <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ); ?></p></li>
+ <li>
+ <?php
+ /* translators: %s: Email address. */
+ printf( __( 'Have you entered your email correctly? You have entered %s, if it’s incorrect, you will not receive your email.' ), $user_email );
+ ?>
+ </li>
+ </ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-signup.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'signup_finished' );
</span></span></pre>
</div>
</div>
</body>
</html>