<!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>[31517] trunk/src/wp-admin: Provide proper label associations and descriptions throughout the network admin</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 { 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/31517">31517</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/31517","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-23 02:28:41 +0000 (Mon, 23 Feb 2015)</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'>Provide proper label associations and descriptions throughout the network admin
* Add labels previously missing for many inputs throughout the network admin screen.
* Add proper `aria-describedby` attributes to provide better descriptions.
* Wrap grouped inputs with `fieldset` elements.
* Remove now unneeded `title` attributes when appropriate.
Props cfoellmann, afercia, rianrietveld.
Fixes <a href="https://core.trac.wordpress.org/ticket/38406">#38406</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $edit .= $this->row_actions( $actions );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the checkbox ( because the user is editable, otherwise it's empty )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checkbox = '<label class="screen-reader-text" for="cb-select-' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
</ins><span class="cx" style="display: block; padding: 0 10px"> . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/includes/dashboard.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,14 +379,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo network_admin_url('users.php'); ?>" method="get">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="search" name="s" value="" size="30" autocomplete="off" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+ <input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="search" name="s" value="" size="30" autocomplete="off" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+ <input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/includes/ms.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,8 +476,11 @@
</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"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php _e( 'Site Upload Space Quota '); ?></th>
- <td><input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" value="<?php echo $quota; ?>" /> <?php _e( 'MB (Leave blank for network default)' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><label for="blog-upload-space-number"><?php _e( 'Site Upload Space Quota' ); ?></label></th>
+ <td>
+ <input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" id="blog-upload-space-number" aria-describedby="blog-upload-space-desc" value="<?php echo $quota; ?>" />
+ <span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e( 'Size in megabytes' ); ?></span> <?php _e( 'MB (Leave blank for network default)' ); ?></span>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* translators: My sites label */ ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Primary Site' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $all_blogs = get_blogs_of_user( get_current_user_id() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,7 +795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $all_blogs ) > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = false;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select name="primary_blog">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select name="primary_blog" id="primary_blog">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach( (array) $all_blogs as $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $primary_blog == $blog->userblog_id )
</span><span class="cx" style="display: block; padding: 0 10px"> $found = true;
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/settings.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,8 +134,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="admin_email" type="email" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
+ <p class="description" id="admin-email-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,15 +151,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $reg = get_site_option( 'registration' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset>
+ <legend class="screen-reader-text"><?php _e( 'New registrations settings' ) ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled.' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered.' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
- <?php if ( is_subdomain_install() )
- _e( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' );
- ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_subdomain_install() ) {
+ echo '<p class="description">' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' ) . '</p>';
+ } ?>
+ </fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,8 +185,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="illegal_names" type="text" id="illegal_names" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
+ <p class="description" id="illegal-names-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,9 +197,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $limited_email_domains = get_site_option( 'limited_email_domains' );
</span><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="limited-email-domains-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,9 +208,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="banned-email-domains-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,9 +223,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="welcome-email-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The welcome email sent to new site owners.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,9 +233,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="welcome-user-email-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The welcome email sent to new users.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,9 +243,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="first-post-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The first post on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,9 +253,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="first-page-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The first page on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,9 +263,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description" id="first-comment-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The first comment on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,8 +273,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" size="40" name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_site_option('first_comment_author') ?>" />
+ <p class="description" id="first-comment-author-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The author of the first comment on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,8 +282,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" size="40" name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
- <p class="description">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
+ <p class="description" id="first-comment-url-desc">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The URL for the first comment on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,18 +294,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Site upload space' ) ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+ <p class="screen-reader-text" id="blog-upload-space-desc">
+ <?php _e( 'Size in megabytes' ) ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><input name="upload_filetypes" type="text" id="upload_filetypes" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td>
+ <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
+ <p class="description" id="upload-filetypes-desc">
+ <?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
+ </p>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td>
+ <?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
+ <p class="screen-reader-text" id="fileupload-maxk-desc">
+ <?php _e( 'Size in kilobytes' ) ?>
+ </p>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,9 +377,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $admin_menus The menu items available.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fieldset_end = '';
+ if ( count( (array) $menu_items ) > 1 ) {
+ echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable menus' ) . '</legend>';
+ $fieldset_end = '</fieldset>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu_items as $key => $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $fieldset_end;
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/site-info.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,35 +124,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Domain' ) ?></th>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $is_main_site ) { ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><?php _e( 'Domain' ) ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><code><?php echo $parsed['scheme'] . '://' . esc_attr( $details->domain ) ?></code></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="domain"><?php _e( 'Domain' ) ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo $parsed['scheme'] . '://'; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $is_main_site ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Path' ) ?></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $is_main_site ) { ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <td><code><?php echo esc_attr( $details->path ) ?></code></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="path"><?php _e( 'Path' ) ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" /><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input type="checkbox" name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="checkbox" name="update_home_url" id="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <label for="update_home_url"><?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _ex( 'Registered', 'site' ) ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Last Updated' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,10 +169,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Attributes' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset>
+ <legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $field_label; ?></label><br/>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/site-new.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,24 +127,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Site Address' ) ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="site-address"><?php _e( 'Site Address' ) ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_subdomain_install() ) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="blog[domain]" type="text" class="regular-text" id="site-address" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" id="site-address" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" />
</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">- echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p id="site-address-desc">' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Site Title' ) ?></th>
- <td><input name="blog[title]" type="text" class="regular-text" id="site-title" title="<?php esc_attr_e( 'Title' ) ?>"/></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
+ <td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Admin Email' ) ?></th>
- <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></td>
+ <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><span class="cx" style="display: block; padding: 0 10px"> <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/site-settings.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,14 +138,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $option->option_value, "\n" ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><code><?php echo esc_html( $option->option_value ) ?></code></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-users.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/site-users.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,12 +262,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Username' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="newuser"><?php _e( 'Username' ); ?></label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Role' ); ?></th>
- <td><select name="new_role" id="new_role_0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="new_role_adduser"><?php _e( 'Role' ); ?></label></th>
+ <td><select name="new_role" id="new_role_adduser">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,16 +291,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Username' ) ?></th>
- <td><input type="text" class="regular-text" name="user[username]" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
+ <td><input type="text" class="regular-text" name="user[username]" id="user_username" /></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Email' ) ?></th>
- <td><input type="text" class="regular-text" name="user[email]" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
+ <td><input type="text" class="regular-text" name="user[email]" id="user_email" /></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Role' ); ?></th>
- <td><select name="new_role" id="new_role_0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="new_role_newuser"><?php _e( 'Role' ); ?></label></th>
+ <td><select name="new_role" id="new_role_newuser">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/user-new.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/user-new.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,12 +87,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Username' ) ?></th>
- <td><input type="text" class="regular-text" name="user[username]" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
+ <td><input type="text" class="regular-text" name="user[username]" id="username" /></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><?php _e( 'Email' ) ?></th>
- <td><input type="text" class="regular-text" name="user[email]" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
+ <td><input type="text" class="regular-text" name="user[email]" id="email"/></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><span class="cx" style="display: block; padding: 0 10px"> <td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2015-02-23 01:33:11 UTC (rev 31516)
+++ trunk/src/wp-admin/network/users.php 2015-02-23 02:28:41 UTC (rev 31517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_dropdown = "<select name='blog[$user_id][$key]'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+ $user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_list = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blog_users as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $user->ID, $allusers ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Delete all content.' ); ?></label></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo __( 'Attribute all content to:' ) . "</label>\n" . $user_dropdown; ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>