<!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>[21854] trunk/wp-admin/network/site-users.php: Simplify the markup and hierarchy of the Add Existing and Add New user forms on site-users.php.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21854">21854</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-15 19:38:23 +0000 (Sat, 15 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the markup and hierarchy of the Add Existing and Add New user forms on site-users.php. props obenland, fixes <a href="http://core.trac.wordpress.org/ticket/21223">#21223</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (21853 => 21854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2012-09-15 19:29:59 UTC (rev 21853)
+++ trunk/wp-admin/network/site-users.php 2012-09-15 19:38:23 UTC (rev 21854)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> <?php $wp_list_table->views(); ?>
</span><span class="cx">
</span><del>-<form method="post" action="site-users.php?action=update-site">
</del><ins>+<form method="post" action="site-users.php?action=update-site" class="site-users">
</ins><span class="cx"> <?php wp_nonce_field( 'edit-site' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="cx">
</span><span class="lines">@@ -249,13 +249,7 @@
</span><span class="cx"> <?php do_action( 'network_site_users_after_list_table', '' );?>
</span><span class="cx">
</span><span class="cx"> <?php if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
</span><del>-<h4 id="add-user"><?php _e('Add User to This Site') ?></h4>
- <?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
-<p><?php _e( 'You may add from existing network users, or set up a new user to add to this site.' ); ?></p>
- <?php else : ?>
-<p><?php _e( 'You may add from existing network users to this site.' ); ?></p>
- <?php endif; ?>
-<h5 id="add-existing-user"><?php _e('Add Existing User') ?></h5>
</del><ins>+<h3 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h3>
</ins><span class="cx"> <form action="site-users.php?action=adduser" id="adduser" method="post">
</span><span class="cx"> <?php wp_nonce_field( 'edit-site' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="lines">@@ -265,26 +259,25 @@
</span><span class="cx"> <td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Role'); ?></th>
</del><ins>+ <th scope="row"><?php _e( 'Role' ); ?></th>
</ins><span class="cx"> <td><select name="new_role" id="new_role_0">
</span><span class="cx"> <?php
</span><span class="cx"> reset( $editblog_roles );
</span><del>- foreach ( $editblog_roles as $role => $role_assoc ){
</del><ins>+ foreach ( $editblog_roles as $role => $role_assoc ) {
</ins><span class="cx"> $name = translate_user_role( $role_assoc['name'] );
</span><del>- $selected = ( $role == $default_role ) ? 'selected="selected"' : '';
- echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
</del><ins>+ echo '<option ' . selected( $default_role, $role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
</span><del>- <?php submit_button( __('Add User'), 'primary', 'add-user', false, array( 'id' => 'submit-add-existing-user' ) ); ?>
</del><ins>+ <?php submit_button( __( 'Add User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-existing-user' ) ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
</span><del>-<h5 id="add-new-user"><?php _e('Add New User') ?></h5>
</del><ins>+<h3 id="add-new-user"><?php _e( 'Add New User' ); ?></h3>
</ins><span class="cx"> <form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
</span><span class="cx"> <?php wp_nonce_field( 'edit-site' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="lines">@@ -298,14 +291,13 @@
</span><span class="cx"> <td><input type="text" class="regular-text" name="user[email]" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Role'); ?></th>
</del><ins>+ <th scope="row"><?php _e( 'Role' ); ?></th>
</ins><span class="cx"> <td><select name="new_role" id="new_role_0">
</span><span class="cx"> <?php
</span><span class="cx"> reset( $editblog_roles );
</span><del>- foreach ( $editblog_roles as $role => $role_assoc ){
</del><ins>+ foreach ( $editblog_roles as $role => $role_assoc ) {
</ins><span class="cx"> $name = translate_user_role( $role_assoc['name'] );
</span><del>- $selected = ( $role == $default_role ) ? 'selected="selected"' : '';
- echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
</del><ins>+ echo '<option ' . selected( $default_role, $role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select></td>
</span><span class="lines">@@ -315,7 +307,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
</span><del>- <?php submit_button( __('Add New User'), 'primary', 'add-user', false, array( 'id' => 'submit-add-user' ) ); ?>
</del><ins>+ <?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>