<!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>[19514] trunk/wp-admin: Use WP_Screen::add_help_tab().</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/19514">19514</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-12-01 02:22:07 +0000 (Thu, 01 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use WP_Screen::add_help_tab(). see <a href="http://core.trac.wordpress.org/ticket/19020">#19020</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminmediaphp">trunk/wp-admin/media.php</a></li>
<li><a href="#trunkwpadminmysitesphp">trunk/wp-admin/my-sites.php</a></li>
<li><a href="#trunkwpadminnetworkindexphp">trunk/wp-admin/network/index.php</a></li>
<li><a href="#trunkwpadminnetworksettingsphp">trunk/wp-admin/network/settings.php</a></li>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksitenewphp">trunk/wp-admin/network/site-new.php</a></li>
<li><a href="#trunkwpadminnetworksitesettingsphp">trunk/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
<li><a href="#trunkwpadminnetworkupgradephp">trunk/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunkwpadminnetworkusernewphp">trunk/wp-admin/network/user-new.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/comment.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -45,9 +45,13 @@
</span><span class="cx"> case 'editcomment' :
</span><span class="cx"> $title = __('Edit Comment');
</span><span class="cx">
</span><del>- add_contextual_help( $current_screen, '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
- '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
- );
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+ '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</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="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/custom-background.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -80,12 +80,15 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function admin_load() {
</span><del>- add_contextual_help( $this->page,
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
</ins><span class="cx"> '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>'
</span><del>- );
</del><ins>+ ) );
</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="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/custom-header.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -99,11 +99,14 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function help() {
</span><del>- add_contextual_help( $this->page,
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
</ins><span class="cx"> '<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'If you want to discard your custom header and go back to the default included in your theme, click on the buttons to remove the custom image and restore the original header image.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the Save Changes button.' ) . '</p>'
</span><del>- );
</del><ins>+ ) );
</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="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/edit-link-form.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -39,11 +39,14 @@
</span><span class="cx">
</span><span class="cx"> add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
</ins><span class="cx"> '<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/" target="_blank">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>'
</span><del>-);
</del><ins>+) );
</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="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/edit-tags.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> $help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'help-overview',
</del><ins>+ 'id' => 'overview',
</ins><span class="cx"> 'title' => __('Overview'),
</span><span class="cx"> 'content' => $help,
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/media.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -67,12 +67,15 @@
</span><span class="cx"> wp_enqueue_script('image-edit');
</span><span class="cx"> wp_enqueue_style('imgareaselect');
</span><span class="cx">
</span><del>- add_contextual_help( $current_screen,
- '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
- '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
- '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
- '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
- );
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
+ '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
+ '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
+ '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</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="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/my-sites.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -35,10 +35,13 @@
</span><span class="cx"> $title = __( 'My Sites' );
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
- '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
+ '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</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="trunkwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/index.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -22,12 +22,15 @@
</span><span class="cx"> $title = __( 'Dashboard' );
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('Until WordPress 3.0, running multiple sites required using WordPress MU instead of regular WordPress. In version 3.0, these applications have merged. If you are a former MU user, you should be aware of the following changes:') . '</p>' .
- '<ul><li>' . __('Site Admin is now Super Admin (we highly encourage you to get yourself a cape!).') . '</li>' .
- '<li>' . __('Blogs are now called Sites; Site is now called Network.') . '</li></ul>' .
- '<p>' . __('The Right Now box provides the network administrator with links to the screens to either create a new site or user, or to search existing users and sites. Screens for Sites and Users are also accessible through the left-hand navigation in the Network Admin section.') . '</p>'
-);
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('Until WordPress 3.0, running multiple sites required using WordPress MU instead of regular WordPress. In version 3.0, these applications have merged. If you are a former MU user, you should be aware of the following changes:') . '</p>' .
+ '<ul><li>' . __('Site Admin is now Super Admin (we highly encourage you to get yourself a cape!).') . '</li>' .
+ '<li>' . __('Blogs are now called Sites; Site is now called Network.') . '</li></ul>' .
+ '<p>' . __('The Right Now box provides the network administrator with links to the screens to either create a new site or user, or to search existing users and sites. Screens for Sites and Users are also accessible through the left-hand navigation in the Network Admin section.') . '</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="trunkwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/settings.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/settings.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/settings.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -19,17 +19,20 @@
</span><span class="cx"> $title = __( 'Network Settings' );
</span><span class="cx"> $parent_file = 'settings.php';
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen,
- '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
- '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
- '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
- '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
- '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
- '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
- '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' .
- '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
- '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
+ '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
+ '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
+ '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
+ '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
+ '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
+ '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' .
+ '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
+ '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</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="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/site-info.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -16,13 +16,16 @@
</span><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
- '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
- '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
- '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
- '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
-);
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
+ '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
+ '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
+ '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+ '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</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="trunkwpadminnetworksitenewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-new.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-new.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/site-new.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -16,10 +16,13 @@
</span><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
- '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
-);
</del><ins>+ get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
+ '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</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="trunkwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-settings.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-settings.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/site-settings.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -16,13 +16,16 @@
</span><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
- '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
- '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
- '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
- '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
+ '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
+ '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
+ '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+ '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</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="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/site-themes.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -21,13 +21,16 @@
</span><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
- '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
- '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
- '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
- '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
+ '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
+ '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
+ '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+ '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</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="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/site-users.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -19,13 +19,16 @@
</span><span class="cx"> $wp_list_table = _get_list_table('WP_Users_List_Table');
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
- '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
- '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
- '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
- '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
+ '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
+ '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
+ '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+ '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</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="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/sites.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -24,18 +24,21 @@
</span><span class="cx">
</span><span class="cx"> add_screen_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
- '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
- '<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
- '<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' .
- '<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
- '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
- '<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
- '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
- '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
- '<p>' . __('Clicking on bold headings can re-sort this table.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
+ '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
+ '<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
+ '<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' .
+ '<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
+ '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
+ '<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
+ '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
+ '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
+ '<p>' . __('Clicking on bold headings can re-sort this table.') . '</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="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/themes.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -203,11 +203,14 @@
</span><span class="cx">
</span><span class="cx"> add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
- '<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
- '<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
+ '<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
+ '<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '</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="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/upgrade.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -18,11 +18,14 @@
</span><span class="cx"> $title = __( 'Update Network' );
</span><span class="cx"> $parent_file = 'upgrade.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Admin Bar). Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
- '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
- '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Admin Bar). Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
+ '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
+ '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</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="trunkwpadminnetworkusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/user-new.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/user-new.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/user-new.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -17,10 +17,13 @@
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to add users to this network.'));
</span><span class="cx">
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
- '<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
+ '<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</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="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/network/users.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -229,14 +229,17 @@
</span><span class="cx">
</span><span class="cx"> add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
- '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
- '<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' .
- '<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' .
- '<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' .
- '<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</p>'
-);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
+ '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
+ '<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' .
+ '<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' .
+ '<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' .
+ '<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</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="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (19513 => 19514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2011-12-01 01:51:34 UTC (rev 19513)
+++ trunk/wp-admin/theme-install.php 2011-12-01 02:22:07 UTC (rev 19514)
</span><span class="lines">@@ -42,7 +42,11 @@
</span><span class="cx"> $help .= '<p>' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, $help);
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' => $help
+) );
</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>