<!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>[19438] trunk/wp-admin: Indent cleanup.</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/19438">19438</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-11-23 23:08:02 +0000 (Wed, 23 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Indent cleanup. see <a href="http://core.trac.wordpress.org/ticket/19020">#19020</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (19437 => 19438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2011-11-23 23:07:48 UTC (rev 19437)
+++ trunk/wp-admin/user-new.php 2011-11-23 23:08:02 UTC (rev 19438)
</span><span class="lines">@@ -139,21 +139,21 @@
</span><span class="cx"> if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
</span><span class="cx"> $do_both = true;
</span><span class="cx">
</span><del>- get_current_screen()->add_help_tab( array(
- 'id' => 'add-new-user',
- 'title' => __('Adding New Users'),
- 'content' => '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
- '<ul>' .
- '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
- '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
- '<li>' . __('Authors can publish and manage their own posts.') . '</li>' .
- '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
- '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
- '</ul>' .
- ( is_multisite() ? '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' : '<p>' . __('You must assign a password to the new user, but don&#8217;t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' ).
- ( is_multisite() ? '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to recieve a welcome email.') . '</p>' : '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>' ) .
- '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>'
- ) );
</del><ins>+get_current_screen()->add_help_tab( array(
+'id' => 'add-new-user',
+'title' => __('Adding New Users'),
+'content' => '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
+ '<ul>' .
+ '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
+ '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
+ '<li>' . __('Authors can publish and manage their own posts.') . '</li>' .
+ '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
+ '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
+ '</ul>' .
+ ( is_multisite() ? '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' : '<p>' . __('You must assign a password to the new user, but don&#8217;t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' ).
+ ( is_multisite() ? '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to recieve a welcome email.') . '</p>' : '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>' ) .
+ '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>'
+) );
</ins><span class="cx">
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (19437 => 19438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2011-11-23 23:07:48 UTC (rev 19437)
+++ trunk/wp-admin/users.php 2011-11-23 23:08:02 UTC (rev 19438)
</span><span class="lines">@@ -20,33 +20,33 @@
</span><span class="cx"> add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</span><span class="cx">
</span><span class="cx"> // contextual help - choose Help on the top right of admin panel to preview this.
</span><del>- get_current_screen()->add_help_tab( array(
- 'id' => 'screen-info',
- 'title' => __('Users List'),
- 'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
- '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
- ) ) ;
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'screen-info',
+ 'title' => __('Users List'),
+ 'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
+ '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
+) ) ;
</ins><span class="cx">
</span><del>- get_current_screen()->add_help_tab( array(
- 'id' => 'customize-display',
- 'title' => __('Customizing This Display'),
- 'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
- '<ul>' .
- '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
- '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
- '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
- '</ul>'
- ) );
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'customize-display',
+ 'title' => __('Customizing This Display'),
+ 'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
+ '<ul>' .
+ '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
+ '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
+ '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
+ '</ul>'
+) );
</ins><span class="cx">
</span><del>- get_current_screen()->add_help_tab( array(
- 'id' => 'row-actions',
- 'title' => __('Action Links'),
- 'content' => '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
- '<ul>' .
- '<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>' .
- ( is_multisite() ? '<li>' . __('Remove allows you to remove a user from your site. It does not delete their posts.') . '</li>' : '<li>' . __('Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts.') . '</li>' ) .
- '</ul>'
- ) );
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'row-actions',
+ 'title' => __('Action Links'),
+ 'content' => '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
+ '<ul>' .
+ '<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>' .
+ ( is_multisite() ? '<li>' . __('Remove allows you to remove a user from your site. It does not delete their posts.') . '</li>' : '<li>' . __('Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts.') . '</li>' ) .
+ '</ul>'
+) );
</ins><span class="cx">
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre>
</div>
</div>
</body>
</html>