<!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>[18911] trunk/wp-admin: Revert [18861], [18862], [18864], [18874], [18879], and [18880].</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/18911">18911</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-07 04:57:12 +0000 (Fri, 07 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/18861">[18861]</a>, <a href="http://core.trac.wordpress.org/changeset/18862">[18862]</a>, <a href="http://core.trac.wordpress.org/changeset/18864">[18864]</a>, <a href="http://core.trac.wordpress.org/changeset/18874">[18874]</a>, <a href="http://core.trac.wordpress.org/changeset/18879">[18879]</a>, and <a href="http://core.trac.wordpress.org/changeset/18880">[18880]</a>. see <a href="http://core.trac.wordpress.org/ticket/18785">#18785</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.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="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworkindexphp">trunk/wp-admin/network/index.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="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/css/wp-admin.dev.css 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -1513,13 +1513,15 @@
</span><span class="cx">
</span><span class="cx"> #screen-options-wrap h5,
</span><span class="cx"> #contextual-help-wrap h5 {
</span><del>- margin: 12px 0 2px;
</del><ins>+ margin: 8px 0;
</ins><span class="cx"> font-size: 13px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .metabox-prefs label {
</span><ins>+ display: inline-block;
</ins><span class="cx"> padding-right: 15px;
</span><span class="cx"> white-space: nowrap;
</span><ins>+ line-height: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .metabox-prefs label input {
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/edit-comments.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -109,8 +109,7 @@
</span><span class="cx"> else
</span><span class="cx"> $title = __('Comments');
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
-$current_screen->add_option_context( '<p>test</p>' );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
</ins><span class="cx">
</span><span class="cx"> add_contextual_help( $current_screen, '<p>' . __( 'You can manage comments made on your site similar to the way you manage Posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'A yellow row means the comment is waiting for you to moderate it.' ) . '</p>' .
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/edit-form-advanced.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -158,19 +158,15 @@
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'advanced', $post);
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'side', $post);
</span><span class="cx">
</span><del>-$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) );
</del><ins>+add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> if ( 'post' == $post_type ) {
</span><span class="cx"> $customize_display = '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.') . '</p>';
</span><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'id' => 'customize-display',
</span><span class="cx"> 'title' => __('Customizing This Display'),
</span><del>- 'content' => $customize_display
</del><ins>+ 'content' => $customize_display,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $title_and_editor = '<p>' . __('<strong>Title</strong> - Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>';
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/edit-link-form.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -37,20 +37,17 @@
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'advanced', $link);
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'side', $link);
</span><span class="cx">
</span><del>-$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 2) );
</del><ins>+add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
</del><ins>+add_contextual_help($current_screen,
+ '<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>' .
+ '<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>' .
+ '<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>' .
+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>' ) . '</p>' .
+ '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<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>
-<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>
-<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>
-<p><strong>' . __( 'For more information:' ) . '</strong></p>
-<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_Screen" target="_blank">Documentation on Creating Links</a>' ) . '</p>
-<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' );
-
</del><span class="cx"> require_once ('admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/edit-tags.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -28,12 +28,8 @@
</span><span class="cx"> $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
</del><ins>+add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> switch ( $wp_list_table->current_action() ) {
</span><span class="cx">
</span><span class="cx"> case 'add-tag':
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/edit.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -148,9 +148,6 @@
</span><span class="cx">
</span><span class="cx"> $title = $post_type_object->labels->name;
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => $title, 'default' => 20) );
-$current_screen->add_option_context( '<p>test</p>' );
-
</del><span class="cx"> if ( 'post' == $post_type ) {
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
</span><span class="lines">@@ -183,6 +180,8 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => $title, 'default' => 20) );
+
</ins><span class="cx"> require_once('./admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/includes/deprecated.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -801,103 +801,6 @@
</span><span class="cx"> * @see WP_Screen::render_screen_meta()
</span><span class="cx"> */
</span><span class="cx"> function screen_meta( $screen ) {
</span><del>- _deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_screen_meta()' );
-
</del><span class="cx"> $current_screen = get_current_screen();
</span><span class="cx"> $current_screen->render_screen_meta();
</span><del>-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.7.0
- * @deprecated 3.3.0
- */
-function favorite_actions() {
- _deprecated_function( __FUNCTION__, '3.3' );
-}
-
-/**
- * Old way of adding contextual help text for a page. Use:
- * $current_screen->add_help_tab( array(
- * 'id' => 'my-id', // required
- * 'title' => __('My Tab'), // required
- * 'content' => 'help html'
- * ));
- *
- * Creates a 'Screen Info' help tab.
- *
- * @since 2.7.0
- * @deprecated 3.3.0
- *
- * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
- * @param string $help The content of a 'Screen Info' help tab.
- */
-function add_contextual_help($screen, $help) {
- //_deprecated_function( __FUNCTION__, '3.3', '$current_screen->add_help_tab()' );
-
- global $_wp_contextual_help;
-
- if ( is_string($screen) )
- $screen = convert_to_screen($screen);
-
- if ( !isset($_wp_contextual_help) )
- $_wp_contextual_help = array();
-
- $_wp_contextual_help[$screen->id] = $help;
-}
-
-/**
- * Old way of registering and configuring an admin screen option. Use $current_screen->add_option().
- *
- * @since 3.1.0
- * @deprecated 3.3.0
- *
- * @param string $option An option name.
- * @param mixed $args Option dependent arguments
- * @return void
- */
-function add_screen_option( $option, $args = array() ) {
- //_deprecated_function( __FUNCTION__, '3.3', '$current_screen->add_option()' );
-
- $current_screen = get_current_screen();
-
- if ( ! $current_screen )
- return;
-
- return $current_screen->add_option( $option, $args );
-}
-
-/**
- * Output the HTML for hiding metaboxes on the page, use $current_screen->render_metabox_prefs().
- *
- * Note that the outputted HTML contains the H5 heading and the DIV class="metabox-prefs".
- *
- * @since 2.7.0
- * @deprecated 3.3.0
- *
- * @param mixed $screen
- */
-function meta_box_prefs($screen) {
- //_deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_metabox_prefs()' );
-
- $current_screen = get_current_screen();
-
- if ( ! $current_screen )
- return;
-
- return $current_screen->render_metabox_prefs();
-}
-
-function get_screen_icon( $screen = '' ) {
- //_deprecated_function( __FUNCTION__, '3.3', '$current_screen->get_screen_icon()' );
-
- $current_screen = get_current_screen();
-
- if ( ! $current_screen )
- return;
-
- return $current_screen->get_screen_icon($screen);
-}
-
-
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/includes/screen.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> * @param string|object $screen The screen you want the headers for
</span><span class="cx"> * @return array Containing the headers in the format id => UI String
</span><span class="cx"> */
</span><del>-function get_column_headers( $screen ) { // TODO: fold into WP_Screen?
</del><ins>+function get_column_headers( $screen ) {
</ins><span class="cx"> if ( is_string( $screen ) )
</span><span class="cx"> $screen = convert_to_screen( $screen );
</span><span class="cx">
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> * @param string|object $screen The screen you want the hidden columns for
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function get_hidden_columns( $screen ) { // TODO: fold into WP_Screen
</del><ins>+function get_hidden_columns( $screen ) {
</ins><span class="cx"> if ( is_string( $screen ) )
</span><span class="cx"> $screen = convert_to_screen( $screen );
</span><span class="cx">
</span><span class="lines">@@ -43,6 +43,41 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * {@internal Missing Short Description}}
+ *
+ * @since 2.7.0
+ *
+ * @param unknown_type $screen
+ */
+function meta_box_prefs($screen) {
+ global $wp_meta_boxes;
+
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ if ( empty($wp_meta_boxes[$screen->id]) )
+ return;
+
+ $hidden = get_hidden_meta_boxes($screen);
+
+ foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) {
+ foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) {
+ foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) {
+ if ( false == $box || ! $box['title'] )
+ continue;
+ // Submit box cannot be hidden
+ if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
+ continue;
+ $box_id = $box['id'];
+ echo '<label for="' . $box_id . '-hide">';
+ echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />';
+ echo "{$box['title']}</label>\n";
+ }
+ }
+ }
+}
+
+/**
</ins><span class="cx"> * Get Hidden Meta Boxes
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="lines">@@ -50,7 +85,7 @@
</span><span class="cx"> * @param string|object $screen Screen identifier
</span><span class="cx"> * @return array Hidden Meta Boxes
</span><span class="cx"> */
</span><del>-function get_hidden_meta_boxes( $screen ) { // TODO: fold into WP_Screen
</del><ins>+function get_hidden_meta_boxes( $screen ) {
</ins><span class="cx"> if ( is_string( $screen ) )
</span><span class="cx"> $screen = convert_to_screen( $screen );
</span><span class="cx">
</span><span class="lines">@@ -62,7 +97,6 @@
</span><span class="cx"> $hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
</span><span class="cx"> else
</span><span class="cx"> $hidden = array( 'slugdiv' );
</span><del>-
</del><span class="cx"> $hidden = apply_filters('default_hidden_meta_boxes', $hidden, $screen);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,6 +104,118 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * {@internal Missing Short Description}}
+ *
+ * @since 2.7.0
+ */
+function favorite_actions( $screen = null ) {
+ $default_action = false;
+
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ if ( $screen->is_user )
+ return;
+
+ if ( isset($screen->post_type) ) {
+ $post_type_object = get_post_type_object($screen->post_type);
+ if ( 'add' != $screen->action )
+ $default_action = array('post-new.php?post_type=' . $post_type_object->name => array($post_type_object->labels->new_item, $post_type_object->cap->edit_posts));
+ else
+ $default_action = array('edit.php?post_type=' . $post_type_object->name => array($post_type_object->labels->name, $post_type_object->cap->edit_posts));
+ }
+
+ if ( !$default_action ) {
+ if ( $screen->is_network ) {
+ $default_action = array('sites.php' => array( __('Sites'), 'manage_sites'));
+ } else {
+ switch ( $screen->id ) {
+ case 'upload':
+ $default_action = array('media-new.php' => array(__('New Media'), 'upload_files'));
+ break;
+ case 'media':
+ $default_action = array('upload.php' => array(__('Edit Media'), 'upload_files'));
+ break;
+ case 'link-manager':
+ case 'link':
+ if ( 'add' != $screen->action )
+ $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
+ else
+ $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
+ break;
+ case 'users':
+ $default_action = array('user-new.php' => array(__('New User'), 'create_users'));
+ break;
+ case 'user':
+ $default_action = array('users.php' => array(__('Edit Users'), 'edit_users'));
+ break;
+ case 'plugins':
+ $default_action = array('plugin-install.php' => array(__('Install Plugins'), 'install_plugins'));
+ break;
+ case 'plugin-install':
+ $default_action = array('plugins.php' => array(__('Manage Plugins'), 'activate_plugins'));
+ break;
+ case 'themes':
+ $default_action = array('theme-install.php' => array(__('Install Themes'), 'install_themes'));
+ break;
+ case 'theme-install':
+ $default_action = array('themes.php' => array(__('Manage Themes'), 'switch_themes'));
+ break;
+ default:
+ $default_action = array('post-new.php' => array(__('New Post'), 'edit_posts'));
+ break;
+ }
+ }
+ }
+
+ if ( !$screen->is_network ) {
+ $actions = array(
+ 'post-new.php' => array(__('New Post'), 'edit_posts'),
+ 'edit.php?post_status=draft' => array(__('Drafts'), 'edit_posts'),
+ 'post-new.php?post_type=page' => array(__('New Page'), 'edit_pages'),
+ 'media-new.php' => array(__('Upload'), 'upload_files'),
+ 'edit-comments.php' => array(__('Comments'), 'moderate_comments')
+ );
+ } else {
+ $actions = array(
+ 'sites.php' => array( __('Sites'), 'manage_sites'),
+ 'users.php' => array( __('Users'), 'manage_network_users')
+ );
+ }
+
+ $default_key = array_keys($default_action);
+ $default_key = $default_key[0];
+ if ( isset($actions[$default_key]) )
+ unset($actions[$default_key]);
+ $actions = array_merge($default_action, $actions);
+ $actions = apply_filters( 'favorite_actions', $actions, $screen );
+
+ $allowed_actions = array();
+ foreach ( $actions as $action => $data ) {
+ if ( current_user_can($data[1]) )
+ $allowed_actions[$action] = $data[0];
+ }
+
+ if ( empty($allowed_actions) )
+ return;
+
+ $first = array_keys($allowed_actions);
+ $first = $first[0];
+ echo '<div id="favorite-actions">';
+ echo '<div id="favorite-first"><a href="' . $first . '">' . $allowed_actions[$first] . '</a></div><div id="favorite-toggle"><br /></div>';
+ echo '<div id="favorite-inside">';
+
+ array_shift($allowed_actions);
+
+ foreach ( $allowed_actions as $action => $label) {
+ echo "<div class='favorite-action'><a href='$action'>";
+ echo $label;
+ echo "</a></div>\n";
+ }
+ echo "</div></div>\n";
+}
+
+/**
</ins><span class="cx"> * Convert a screen string to a screen object
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -77,7 +223,7 @@
</span><span class="cx"> * @param string $screen The name of the screen
</span><span class="cx"> * @return object An object containing the safe screen name and id
</span><span class="cx"> */
</span><del>-function convert_to_screen( $screen ) { // TODO: fold into WP_Screen?
</del><ins>+function convert_to_screen( $screen ) {
</ins><span class="cx"> $screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() )
</span><span class="lines">@@ -85,20 +231,88 @@
</span><span class="cx"> elseif ( is_user_admin() )
</span><span class="cx"> $screen .= '-user';
</span><span class="cx">
</span><del>- // why do we need this? $screen = (string) apply_filters( 'screen_meta_screen', $screen );
</del><ins>+ $screen = (string) apply_filters( 'screen_meta_screen', $screen );
</ins><span class="cx"> $screen = (object) array('id' => $screen, 'base' => $screen);
</span><span class="cx"> return $screen;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function screen_icon( $for = '' ) { // TODO: fold into WP_Screen?
- global $current_screen;
</del><ins>+/**
+ * Add contextual help text for a page.
+ *
+ * Creates a 'Screen Info' help tab.
+ *
+ * @since 2.7.0
+ *
+ * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
+ * @param string $help The content of a 'Screen Info' help tab.
+ *
+ * @todo: deprecate?
+ */
+function add_contextual_help($screen, $help) {
+ global $_wp_contextual_help;
</ins><span class="cx">
</span><del>- if ( !isset($current_screen) )
</del><ins>+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ if ( !isset($_wp_contextual_help) )
+ $_wp_contextual_help = array();
+
+ $_wp_contextual_help[$screen->id] = $help;
+}
+
+/**
+ * Register and configure an admin screen option
+ *
+ * @since 3.1.0
+ *
+ * @param string $option An option name.
+ * @param mixed $args Option dependent arguments
+ * @return void
+ */
+function add_screen_option( $option, $args = array() ) {
+ $current_screen = get_current_screen();
+
+ if ( ! $current_screen )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo $current_screen->get_screen_icon( $for );
</del><ins>+ return $current_screen->add_option( $option, $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function screen_icon( $screen = '' ) {
+ echo get_screen_icon( $screen );
+}
+
+function get_screen_icon( $screen = '' ) {
+ global $current_screen, $typenow;
+
+ if ( empty($screen) )
+ $screen = $current_screen;
+ elseif ( is_string($screen) )
+ $name = $screen;
+
+ $class = 'icon32';
+
+ if ( empty($name) ) {
+ if ( !empty($screen->parent_base) )
+ $name = $screen->parent_base;
+ else
+ $name = $screen->base;
+
+ if ( 'edit' == $name && isset($screen->post_type) && 'page' == $screen->post_type )
+ $name = 'edit-pages';
+
+ $post_type = '';
+ if ( isset( $screen->post_type ) )
+ $post_type = $screen->post_type;
+ elseif ( $current_screen == $screen )
+ $post_type = $typenow;
+ if ( $post_type )
+ $class .= ' ' . sanitize_html_class( 'icon32-posts-' . $post_type );
+ }
+
+ return '<div id="icon-' . esc_attr( $name ) . '" class="' . $class . '"><br /></div>';
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Get the current screen object
</span><span class="cx"> *
</span><span class="lines">@@ -124,13 +338,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $id Screen id, optional.
</span><span class="cx"> */
</span><del>-function set_current_screen( $id = '' ) {
</del><ins>+function set_current_screen( $id = '' ) {
</ins><span class="cx"> global $current_screen;
</span><span class="cx">
</span><del>- if ( !is_a( $current_screen, 'WP_Screen' ) )
- $current_screen = new WP_Screen( $id );
</del><ins>+ $current_screen = new WP_Screen( $id );
</ins><span class="cx">
</span><del>- // why do we need this? $current_screen = apply_filters('current_screen', $current_screen);
</del><ins>+ $current_screen = apply_filters('current_screen', $current_screen);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -251,21 +464,28 @@
</span><span class="cx"> * @var array
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- private $_options = array(
- '_context' => '',
- '_screen_settings' => ''
- );
</del><ins>+ private $_options = array();
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><del>- * Show screen options if any.
</del><ins>+ * Stores the result of the public show_screen_options function.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> * @var bool
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- private $_show_options = false;
</del><ins>+ private $_show_screen_options;
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Stores the 'screen_settings' section of screen options.
+ *
+ * @since 3.3.0
+ * @var string
+ * @access private
+ */
+ private $_screen_settings;
+
+ /**
</ins><span class="cx"> * Constructor
</span><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="lines">@@ -280,19 +500,15 @@
</span><span class="cx"> if ( empty( $id ) ) {
</span><span class="cx"> $screen = $hook_suffix;
</span><span class="cx"> $screen = str_replace('.php', '', $screen);
</span><del>-
</del><span class="cx"> if ( preg_match('/-add|-new$/', $screen) )
</span><span class="cx"> $action = 'add';
</span><del>-
</del><span class="cx"> $screen = str_replace('-new', '', $screen);
</span><span class="cx"> $screen = str_replace('-add', '', $screen);
</span><span class="cx"> $this->id = $this->base = $screen;
</span><span class="cx"> } else {
</span><span class="cx"> $id = sanitize_key( $id );
</span><del>-
</del><span class="cx"> if ( false !== strpos($id, '-') ) {
</span><span class="cx"> list( $id, $typenow ) = explode('-', $id, 2);
</span><del>-
</del><span class="cx"> if ( taxonomy_exists( $typenow ) ) {
</span><span class="cx"> $id = 'edit-tags';
</span><span class="cx"> $taxnow = $typenow;
</span><span class="lines">@@ -307,26 +523,22 @@
</span><span class="cx"> // Map index to dashboard
</span><span class="cx"> if ( 'index' == $this->base )
</span><span class="cx"> $this->base = 'dashboard';
</span><del>-
</del><span class="cx"> if ( 'index' == $this->id )
</span><span class="cx"> $this->id = 'dashboard';
</span><span class="cx">
</span><span class="cx"> if ( 'edit' == $this->id ) {
</span><span class="cx"> if ( empty($typenow) )
</span><span class="cx"> $typenow = 'post';
</span><del>-
</del><span class="cx"> $this->id .= '-' . $typenow;
</span><span class="cx"> $this->post_type = $typenow;
</span><span class="cx"> } elseif ( 'post' == $this->id ) {
</span><span class="cx"> if ( empty($typenow) )
</span><span class="cx"> $typenow = 'post';
</span><del>-
</del><span class="cx"> $this->id = $typenow;
</span><span class="cx"> $this->post_type = $typenow;
</span><span class="cx"> } elseif ( 'edit-tags' == $this->id ) {
</span><span class="cx"> if ( empty($taxnow) )
</span><span class="cx"> $taxnow = 'post_tag';
</span><del>-
</del><span class="cx"> $this->id = 'edit-' . $taxnow;
</span><span class="cx"> $this->taxonomy = $taxnow;
</span><span class="cx"> }
</span><span class="lines">@@ -359,47 +571,26 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Adds an option for the screen.
</span><del>- * Use the 'add_screen_help_and_options' action to add screen options.
</del><ins>+ * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add screen options.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $option Option ID
</span><del>- * @param mixed $args Associative array of arguments particular to the default $option or the HTML string to be printed in the Screen Options tab.
</del><ins>+ * @param array $args Associative array of arguments particular to the given $option.
</ins><span class="cx"> */
</span><del>- public function add_option( $option, $args = null ) {
- if ( is_array($args) && !empty($option) )
- $this->_options[ $option ] = $args;
- elseif ( is_string($option) )
- $this->_options['_screen_settings'] .= $option;
- else
- return false;
-
- $this->_show_options = true;
- return true;
</del><ins>+ public function add_option( $option, $args = array() ) {
+ $this->_options[ $option ] = $args;
</ins><span class="cx"> }
</span><del>-
- /**
- * Adds option context.
- * Use the 'add_screen_help_and_options' action to add it. Will not be shown if there aren't any screen options.
- *
- * @since 3.3.0
- *
- * @param string $text
- */
- public function add_option_context( $text ) {
- $this->_options['_context'] .= $text;
- }
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a help tab to the contextual help for the screen.
</span><del>- * Use the 'add_screen_help_and_options' action to add contextual help tabs.
</del><ins>+ * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add contextual help tabs.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $args
</span><span class="cx"> * - string - title - Title for the tab.
</span><del>- * - string - id - Tab ID.
- * - string - section - Section title for the tab. Optional.
</del><ins>+ * - string - id - Tab ID. Optional.
</ins><span class="cx"> * - string - content - Help tab content in plain text or HTML. Optional.
</span><span class="cx"> * - callback - callback - A callback to generate the tab content. Optional.
</span><span class="cx"> *
</span><span class="lines">@@ -408,31 +599,32 @@
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'title' => false,
</span><span class="cx"> 'id' => false,
</span><del>- 'section' => false,
</del><span class="cx"> 'content' => '',
</span><del>- 'callback' => false
</del><ins>+ 'callback' => false,
</ins><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><del>- // Ensure we have title and ID.
- if ( ! $args['title'] || ! $args['id'] )
- return false;
</del><ins>+ // Ensure we have a title.
+ if ( ! $args['title'] )
+ return;
</ins><span class="cx">
</span><ins>+ // Create an id from the title if one is not provided.
+ if ( ! $args['id'] )
+ $args['id'] = sanitize_html_class( $args['title'] );
+
</ins><span class="cx"> $this->_help_tabs[] = $args;
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a sidebar to the contextual help for the screen.
</span><del>- * Use the 'add_screen_help_and_options' action to add a sidebar to the contextual help.
</del><ins>+ * Call this in template files after admin.php is loaded and before admin-header.php is loaded to add a sidebar to the contextual help.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $content Sidebar content in plain text or HTML.
</span><span class="cx"> */
</span><span class="cx"> public function add_help_sidebar( $content ) {
</span><del>- if ( empty($this->_help_sidebar) ) // add only one
- $this->_help_sidebar = $content;
</del><ins>+ $this->_help_sidebar = $content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -445,27 +637,29 @@
</span><span class="cx"> public function render_screen_meta() {
</span><span class="cx"> global $_wp_contextual_help;
</span><span class="cx">
</span><del>- // Intended for adding Help and Screen Options.
- do_action('add_screen_help_and_options', $this);
-
</del><span class="cx"> // Call old contextual_help_list filter.
</span><span class="cx"> if ( ! isset( $_wp_contextual_help ) )
</span><span class="cx"> $_wp_contextual_help = array();
</span><ins>+ $_wp_contextual_help = apply_filters( 'contextual_help_list', $_wp_contextual_help, $this );
</ins><span class="cx">
</span><del>- // why are we filtering a global? $_wp_contextual_help = apply_filters( 'contextual_help_list', $_wp_contextual_help, $this );
-
</del><span class="cx"> if ( isset( $_wp_contextual_help[ $this->id ] ) ) {
</span><span class="cx"> // Call old contextual_help filter.
</span><del>- // why are we filtering the same global second time??
</del><span class="cx"> $contextual_help = apply_filters( 'contextual_help', $_wp_contextual_help[ $this->id ], $this->id, $this );
</span><span class="cx">
</span><span class="cx"> $this->add_help_tab( array(
</span><del>- 'title' => __('Screen Info'),
- 'id' => 'screen-info',
- 'content' => $_wp_contextual_help[ $this->id ]
</del><ins>+ 'title' => __('Screen Info'),
+ 'content' => $contextual_help,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Add screen options tab
+ if ( $this->show_screen_options() ) {
+ $this->add_help_tab( array(
+ 'title' => __('Screen Options'),
+ 'callback' => array( $this, 'render_screen_options' ),
+ ) );
+ }
+
</ins><span class="cx"> // Time to render!
</span><span class="cx"> ?>
</span><span class="cx"> <div id="screen-meta" class='metabox-prefs'>
</span><span class="lines">@@ -473,60 +667,35 @@
</span><span class="cx"> <div id="contextual-help-wrap" class="hidden">
</span><span class="cx"> <div class="contextual-help-tabs">
</span><span class="cx"> <ul>
</span><del>- <?php
-
- if ( $this->_show_options ) {
- $class = true;
</del><ins>+ <?php foreach ( $this->_help_tabs as $i => $tab ):
+ $link_id = "tab-link-{$tab['id']}";
+ $panel_id = "tab-panel-{$tab['id']}";
+ $classes = ( $i == 0 ) ? 'active' : '';
</ins><span class="cx"> ?>
</span><del>- <li id="tab-link-screen-options" class="active">
- <a href="#tab-panel-screen-options">
- <?php _e('Screen Options'); ?>
- </a>
- </li>
- <?php
- }
</del><span class="cx">
</span><del>- foreach ( $this->_help_tabs as $i => $tab ) {
- $id = esc_attr($tab['id']);
- $class = empty($class) && $i == 0 ? ' class="active"' : '';
- ?>
- <li id="<?php echo "tab-link-$id"; ?>"<?php echo $class; ?>>
- <a href="<?php echo "#tab-panel-$id"; ?>">
</del><ins>+ <li id="<?php echo esc_attr( $link_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
+ <a href="<?php echo esc_url( "#$panel_id" ); ?>">
</ins><span class="cx"> <?php echo esc_html( $tab['title'] ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </li>
</span><del>- <?php } ?>
</del><ins>+ <?php endforeach; ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><del>- <?php
</del><span class="cx">
</span><del>- if ( $this->_help_sidebar )
- echo '<div class="contextual-help-sidebar">' . $this->_help_sidebar . '</div>';
</del><ins>+ <div class="contextual-help-sidebar">
+ <?php echo $this->_help_sidebar; ?>
+ </div>
</ins><span class="cx">
</span><del>- ?>
</del><span class="cx"> <div class="contextual-help-tabs-wrap">
</span><del>- <?php
-
- if ( $this->_show_options ) {
- $class2 = true;
- echo '<div id="tab-panel-screen-options" class="help-tab-content active">';
-
- if ( !empty($this->_options['_context']) )
- echo $this->_options['_context'];
-
- $this->render_screen_options();
- echo '</div>';
- }
-
- foreach ( $this->_help_tabs as $i => $tab ) {
- $class2 = empty($class2) && $i == 0 ? ' active' : '';
</del><ins>+ <?php foreach ( $this->_help_tabs as $i => $tab ):
+ $panel_id = "tab-panel-{$tab['id']}";
+ $classes = ( $i == 0 ) ? 'active' : '';
+ $classes .= ' help-tab-content';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>- <div id="<?php echo esc_attr( "tab-panel-{$tab['id']}" ); ?>" class="help-tab-content<?php echo $class2; ?>">
</del><ins>+ <div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
+ <h3><?php echo esc_html( $tab['title'] ); ?></h3>
</ins><span class="cx"> <?php
</span><del>- if ( $tab['section'] )
- echo '<h3>' . esc_html( $tab['section'] ) . '</h3>';
-
</del><span class="cx"> // Print tab content.
</span><span class="cx"> echo $tab['content'];
</span><span class="cx">
</span><span class="lines">@@ -535,57 +704,68 @@
</span><span class="cx"> call_user_func( $tab['callback'], $this );
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>- <?php } ?>
</del><ins>+ <?php endforeach; ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * Render the screen options tab.
- *
- * @since 3.3.0
- */
- public function render_screen_options() {
</del><ins>+ public function show_screen_options() {
+ global $wp_meta_boxes, $wp_list_table;
</ins><span class="cx">
</span><del>- $screen_settings = $this->_options['_screen_settings'];
</del><ins>+ if ( is_bool( $this->_show_screen_options ) )
+ return $this->_show_screen_options;
</ins><span class="cx">
</span><del>- // Default screen_settings for various screens.
- // TODO: should probably be set on these screens, not here.
</del><ins>+ $columns = get_column_headers( $this );
+
+ $show_screen = false;
+ if ( ! empty( $wp_meta_boxes[ $this->id ] ) || ! empty( $columns ) )
+ $show_screen = true;
+
+ // Check if there are per-page options.
+ $show_screen = $show_screen || isset( $this->_options['per_page'] );
+
+ $this->_screen_settings = apply_filters( 'screen_settings', '', $this );
+
</ins><span class="cx"> switch ( $this->id ) {
</span><span class="cx"> case 'widgets':
</span><del>- $screen_settings .= '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
</del><ins>+ $this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
+ $show_screen = true;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // TODO: deprecate
- $screen_settings = apply_filters( 'screen_settings', $screen_settings, $this );
</del><ins>+ if ( ! empty( $this->_screen_settings ) )
+ $show_screen = true;
</ins><span class="cx">
</span><del>- echo '<form id="adv-settings" action="" method="post">';
</del><ins>+ if ( ! empty( $this->_options ) )
+ $show_screen = true;
</ins><span class="cx">
</span><del>- $this->render_table_columns_prefs();
- $this->render_metabox_prefs();
- $this->render_screen_layout();
- $this->render_per_page_options();
- echo $screen_settings;
-
- wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false );
- echo '</form>';
-
</del><ins>+ $this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this );
+ return $this->_show_screen_options;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Render the option for hiding table columns on the page
</del><ins>+ * Render the screen options tab.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> */
</span><del>- function render_table_columns_prefs() {
</del><ins>+ public function render_screen_options() {
+ global $wp_meta_boxes, $wp_list_table;
+
</ins><span class="cx"> $columns = get_column_headers( $this );
</span><ins>+ $hidden = get_hidden_columns( $this );
</ins><span class="cx">
</span><del>- if ( ! empty( $columns ) ) {
- $hidden = get_hidden_columns( $this );
- ?>
</del><ins>+ ?>
+ <form id="adv-settings" action="" method="post">
+ <?php if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
+ <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
+ <div class="metabox-prefs">
+ <?php meta_box_prefs( $this ); ?>
+ <br class="clear" />
+ </div>
+ <?php endif;
+ if ( ! empty( $columns ) ) : ?>
</ins><span class="cx"> <h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
</span><span class="cx"> <div class="metabox-prefs">
</span><span class="cx"> <?php
</span><span class="lines">@@ -600,7 +780,6 @@
</span><span class="cx">
</span><span class="cx"> if ( 'comments' == $column )
</span><span class="cx"> $title = __( 'Comments' );
</span><del>-
</del><span class="cx"> $id = "$column-hide";
</span><span class="cx"> echo '<label for="' . $id . '">';
</span><span class="cx"> echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( !in_array($column, $hidden), true, false ) . ' />';
</span><span class="lines">@@ -609,45 +788,16 @@
</span><span class="cx"> ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span><del>- <?php }
- }
</del><ins>+ <?php endif;
</ins><span class="cx">
</span><del>- /**
- * Render the option for hiding metaboxes on the page
- *
- * @since 3.3.0
- */
- function render_metabox_prefs() {
- global $wp_meta_boxes;
</del><ins>+ $this->render_screen_layout();
+ $this->render_per_page_options();
+ echo $this->_screen_settings;
</ins><span class="cx">
</span><del>- if ( !empty( $wp_meta_boxes[ $this->id ] ) ) {
- $hidden = get_hidden_meta_boxes($this);
- ?>
- <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
- <div class="metabox-prefs">
- <?php
-
- foreach ( array_keys($wp_meta_boxes[$this->id]) as $context ) {
- foreach ( array_keys($wp_meta_boxes[$this->id][$context]) as $priority ) {
- foreach ( $wp_meta_boxes[$this->id][$context][$priority] as $box ) {
- if ( false == $box || ! $box['title'] )
- continue;
- // Submit box cannot be hidden
- if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
- continue;
- $box_id = $box['id'];
- echo '<label for="' . $box_id . '-hide">';
- echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />';
- echo "{$box['title']}</label>\n";
- }
- }
- }
-
- ?>
- <br class="clear" />
- </div>
- <?php
- }
</del><ins>+ ?>
+ <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
+ </form>
+ <?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -659,11 +809,10 @@
</span><span class="cx"> global $screen_layout_columns;
</span><span class="cx">
</span><span class="cx"> // Back compat for plugins using the filter instead of add_screen_option()
</span><del>- // TODO: deprecate it
</del><span class="cx"> $columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
</span><del>- $this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
</del><ins>+ add_screen_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $this->_options['layout_columns'] ) ) {
</span><span class="cx"> $screen_layout_columns = 0;
</span><span class="lines">@@ -701,7 +850,7 @@
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> */
</span><span class="cx"> function render_per_page_options() {
</span><del>- if ( empty( $this->_options['per_page'] ) )
</del><ins>+ if ( ! isset( $this->_options['per_page'] ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $per_page_label = $this->_options['per_page']['label'];
</span><span class="lines">@@ -750,26 +899,4 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
- function get_screen_icon( $for = '' ) {
-
- if ( !empty($for) && is_string($for) ) {
- $name = $for;
- } else {
- if ( !empty($this->parent_base) )
- $name = $this->parent_base;
- else
- $name = $this->base;
- }
-
- if ( 'edit' == $name && isset($this->post_type) && 'page' == $this->post_type )
- $name = 'edit-pages';
-
- $class = '';
- if ( !empty( $this->post_type ) )
- $class = ' ' . sanitize_html_class( 'icon32-posts-' . $this->post_type );
-
- return '<div id="icon-' . esc_attr( $name ) . '" class="icon32' . $class . '"><br /></div>';
- }
-}
-
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/index.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -23,65 +23,58 @@
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><span class="cx"> if ( is_user_admin() )
</span><del>- $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 1) );
</del><ins>+ add_screen_option('layout_columns', array('max' => 4, 'default' => 1) );
</ins><span class="cx"> else
</span><del>- $current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
</del><ins>+ add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
</del><span class="cx">
</span><span class="cx"> // Help tabs
</span><span class="cx">
</span><del>-$help = '<p>' . __('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the top bar.') . '</p>';
</del><ins>+$help_overview = '<p>' . __('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the top bar.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Overview'),
</span><del>- 'id' => 'overview',
- 'content' => $help
</del><ins>+ 'content' => $help_overview,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$help = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>
-<p>' . __('Links in the &#8220;admin bar&#8221; at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
</del><ins>+$help_navigation = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>';
+$help_navigation .= '<p>' . __('Links in the &#8220;admin bar&#8221; at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Navigation'),
</span><del>- 'id' => 'navigation',
- 'content' => $help
</del><ins>+ 'content' => $help_navigation,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$help = '<p>' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '</p>
-<p>' . __('<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '</p>
-<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>
-<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
</del><ins>+$help_layout = '<p>' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '</p>';
+$help_layout .= '<p>' . __('<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '</p>';
+$help_layout .= '<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>';
+$help_layout .= '<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Layout'),
</span><del>- 'id' => 'layout',
- 'content' => $help
</del><ins>+ 'content' => $help_layout,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$help = '<p>' . __('The boxes on your Dashboard screen are:') . '</p>
-<p>' . __('<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '</p>
-<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>
-<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>
-<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>
-<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>
-<p>' . __('<strong>WordPress Blog</strong> - Latest news from the official WordPress project.') . '</p>
-<p>' . __('<strong>Other WordPress News</strong> - Shows the <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a> feed. You can configure it to show a different feed of your choosing.') . '</p>
-<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
</del><ins>+$help_content = '<p>' . __('The boxes on your Dashboard screen are:') . '</p>';
+$help_content .= '<p>' . __('<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '</p>';
+$help_content .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
+$help_content .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
+$help_content .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
+$help_content .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
+$help_content .= '<p>' . __('<strong>WordPress Blog</strong> - Latest news from the official WordPress project.') . '</p>';
+$help_content .= '<p>' . __('<strong>Other WordPress News</strong> - Shows the <a href="http://planet.wordpress.org" target="_blank">WordPress Planet</a> feed. You can configure it to show a different feed of your choosing.') . '</p>';
+$help_content .= '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $current_screen->add_help_tab( array(
</span><span class="cx"> 'title' => __('Content'),
</span><del>- 'id' => 'content',
- 'content' => $help
</del><ins>+ 'content' => $help_content,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>-$current_screen->add_help_sidebar('
-<p><strong>' . __( 'For more information:' ) . '</strong></p>
-<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>
-<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>
-');
</del><ins>+$current_screen->add_help_sidebar(
+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
+ '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> include (ABSPATH . 'wp-admin/admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/link-manager.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx"> $title = __('Links');
</span><span class="cx"> $this_file = $parent_file = 'link-manager.php';
</span><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> add_contextual_help( $current_screen,
</span><span class="cx"> '<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
</span><span class="cx"> '<p>' . __('Links may be separated into categories; these are different than the categories used on your posts.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/nav-menus.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -445,17 +445,14 @@
</span><span class="cx"> if ( ! current_theme_supports( 'menus' ) && ! wp_get_nav_menus() )
</span><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('The current theme does not natively support menus, but you can use the &#8220;Custom Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p></div>';
</span><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
</del><ins>+$help = '<p>' . __('This feature allows you to use a custom menu in place of your theme&#8217;s default menus. If your theme does not support the custom menus feature yet (the new and old default themes, Twenty Eleven and Twenty Ten, do), you can learn about adding this support by following the Documentation link in this tab. You can still use the &#8220;Custom Menu&#8221; widget to add menus to a sidebar.') . '</p>';
+$help .= '<p>' . __('You can create custom menus for your site. These menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '</p>';
+$help .= '<p>' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You&#8217;ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>';
+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
</ins><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<p>' . __('This feature allows you to use a custom menu in place of your theme&#8217;s default menus. If your theme does not support the custom menus feature yet (the new and old default themes, Twenty Eleven and Twenty Ten, do), you can learn about adding this support by following the Documentation link in this tab. You can still use the &#8220;Custom Menu&#8221; widget to add menus to a sidebar.') . '</p>
-<p>' . __('You can create custom menus for your site. These menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '</p>
-<p>' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You&#8217;ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>
-<p><strong>' . __('For more information:') . '</strong></p>
-<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>
-<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' );
</del><ins>+add_contextual_help($current_screen, $help);
</ins><span class="cx">
</span><span class="cx"> // Get the admin header
</span><span class="cx"> require_once( './admin-header.php' );
</span></span></pre></div>
<a id="trunkwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/index.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/index.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/network/index.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -38,12 +38,8 @@
</span><span class="cx"> wp_enqueue_script( 'plugin-install' );
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-$current_screen->add_option('layout_columns', array('max' => 4, 'default' => 2) );
</del><ins>+add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> require_once( '../admin-header.php' );
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/network/site-themes.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -122,12 +122,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_thickbox();
</span><del>-$current_screen->add_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
</del><ins>+add_screen_option( 'per_page', array( 'label' => _x( 'Themes', 'themes per page (screen options)' ) ) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> $site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
</span><span class="cx"> $title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
</span><span class="cx"> $title = sprintf( __('Edit Site: %s'), $site_url_no_http );
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/network/site-users.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -153,12 +153,8 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
</del><ins>+add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> $site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
</span><span class="cx"> $title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
</span><span class="cx"> $title = sprintf( __('Edit Site: %s'), $site_url_no_http );
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/network/sites.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -22,12 +22,8 @@
</span><span class="cx"> $title = __( 'Sites' );
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<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>' .
</span><span class="cx"> '<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>' .
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/network/themes.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -201,12 +201,8 @@
</span><span class="cx">
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<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>' .
</span><span class="cx"> '<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>' .
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/network/users.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -227,12 +227,8 @@
</span><span class="cx"> $title = __( 'Users' );
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
-
</del><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
</span><span class="cx"> '<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>' .
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/plugin-install.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -35,19 +35,16 @@
</span><span class="cx">
</span><span class="cx"> do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
</span><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from WordPress core by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/plugins/') . '</p>' .
+ '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting a popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
+ '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, Newest, and Recently Updated plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
+ '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click Upload in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>' .
+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from WordPress core by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/plugins/') . '</p>
-<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting a popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>
-<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, Newest, and Recently Updated plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>
-<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click Upload in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>
-<p><strong>' . __('For more information:') . '</strong></p>
-<p>' . __('<a href="http://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>') . '</p>
-<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' );
-
</del><span class="cx"> include(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/plugins.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -316,21 +316,18 @@
</span><span class="cx"> wp_enqueue_script('plugin-install');
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' ), 'default' => 999 ) );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' ), 'default' => 999 ) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
+ '<p>' . sprintf(__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your <code>/wp-content/plugins</code> directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '</p>' .
+ '<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
+ '<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>' .
+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Managing_Plugins#Plugin_Management" target="_blank">Documentation on Managing Plugins</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>
-<p>' . sprintf(__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your <code>/wp-content/plugins</code> directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '</p>
-<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>
-<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>
-<p><strong>' . __('For more information:') . '</strong></p>
-<p>' . __('<a href="http://codex.wordpress.org/Managing_Plugins#Plugin_Management" target="_blank">Documentation on Managing Plugins</a>') . '</p>
-<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' );
-
</del><span class="cx"> $title = __('Plugins');
</span><span class="cx"> $parent_file = 'plugins.php';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/upload.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -143,21 +143,18 @@
</span><span class="cx"> wp_enqueue_script( 'jquery-ui-draggable' );
</span><span class="cx"> wp_enqueue_script( 'media' );
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
</del><ins>+add_contextual_help( $current_screen,
+ '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the <em>Screen Options</em> tab to customize the display of this screen.' ) . '</p>' .
+ '<p>' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '</p>' .
+ '<p>' . __( 'Hovering over a row reveals action links: <em>Edit</em>, <em>Delete Permanently</em>, and <em>View</em>. Clicking <em>Edit</em> or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking <em>Delete Permanently</em> will delete the file from the media library (as well as from any posts to which it is currently attached). <em>View</em> will take you to the display page for that file.' ) . '</p>' .
+ '<p>' . __( 'If a media file has not been attached to any post, you will see that in the <em>Attached To</em> column, and can click on <em>Attach File</em> to launch a small popup that will allow you to search for a post and attach the file.' ) . '</p>' .
+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="http://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>' .
+ '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the <em>Screen Options</em> tab to customize the display of this screen.' ) . '</p>
-<p>' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '</p>
-<p>' . __( 'Hovering over a row reveals action links: <em>Edit</em>, <em>Delete Permanently</em>, and <em>View</em>. Clicking <em>Edit</em> or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking <em>Delete Permanently</em> will delete the file from the media library (as well as from any posts to which it is currently attached). <em>View</em> will take you to the display page for that file.' ) . '</p>
-<p>' . __( 'If a media file has not been attached to any post, you will see that in the <em>Attached To</em> column, and can click on <em>Attach File</em> to launch a small popup that will allow you to search for a post and attach the file.' ) . '</p>
-<p><strong>' . __( 'For more information:' ) . '</strong></p>
-<p>' . __( '<a href="http://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>
-<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>' );
-
</del><span class="cx"> require_once('./admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/users.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -17,21 +17,19 @@
</span><span class="cx"> $title = __('Users');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><del>-$current_screen->add_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</del><ins>+add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</ins><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
</del><ins>+// contextual help - choose Help on the top right of admin panel to preview this.
+add_contextual_help($current_screen,
+ '<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>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</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>' .
+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<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>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</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>
-<p><strong>' . __('For more information:') . '</strong></p>
-<p>' . __('<a href="http://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>
-<p>' . __('<a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>
-<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' );
-
</del><span class="cx"> if ( empty($_REQUEST) ) {
</span><span class="cx"> $referer = '<input type="hidden" name="wp_http_referer" value="'. esc_attr(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
</span><span class="cx"> } elseif ( isset($_REQUEST['wp_http_referer']) ) {
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (18910 => 18911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2011-10-07 03:29:49 UTC (rev 18910)
+++ trunk/wp-admin/widgets.php 2011-10-07 04:57:12 UTC (rev 18911)
</span><span class="lines">@@ -35,21 +35,19 @@
</span><span class="cx"> $title = __( 'Widgets' );
</span><span class="cx"> $parent_file = 'themes.php';
</span><span class="cx">
</span><del>-$current_screen->add_option_context(
-'<p>test</p>'
-);
</del><ins>+$help = '
+ <p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
+ <p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>
+ <p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
+ <p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
+ <p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>
+ <p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>
+';
+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
+add_contextual_help($current_screen, $help);
</ins><span class="cx">
</span><del>-add_contextual_help( $current_screen, '
-<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
-<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>
-<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
-<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
-<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>
-<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>
-<p><strong>' . __('For more information:') . '</strong></p>
-<p>' . __('<a href="http://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</a>') . '</p>
-<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' );
-
</del><span class="cx"> // These are the widgets grouped by sidebar
</span><span class="cx"> $sidebars_widgets = wp_get_sidebars_widgets();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>