From 3ad1f6795853222711634422317eb0bd173e888d Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 2 Nov 2011 03:12:37 +0000 Subject: [PATCH] Use add_help_sidebar(). see #19020 git-svn-id: http://svn.automattic.com/wordpress/trunk@19111 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/custom-background.php | 20 +++++++++++++------- wp-admin/custom-header.php | 17 +++++++++++------ wp-admin/edit-comments.php | 6 +++++- wp-admin/edit-link-form.php | 5 ++++- wp-admin/edit-tags.php | 10 +++++++--- wp-admin/edit.php | 10 ++++++++-- wp-admin/export.php | 5 ++++- wp-admin/import.php | 5 ++++- wp-admin/link-manager.php | 5 ++++- wp-admin/media-upload.php | 5 ++++- wp-admin/nav-menus.php | 9 ++++++--- wp-admin/options-discussion.php | 5 ++++- wp-admin/options-general.php | 5 ++++- wp-admin/options-media.php | 5 ++++- wp-admin/options-permalink.php | 5 ++++- wp-admin/options-privacy.php | 5 ++++- wp-admin/options-reading.php | 5 ++++- wp-admin/options-writing.php | 5 ++++- wp-admin/plugins.php | 5 ++++- wp-admin/themes.php | 9 ++++++--- wp-admin/tools.php | 5 ++++- wp-admin/update-core.php | 5 ++++- wp-admin/upload.php | 5 ++++- wp-admin/user-edit.php | 6 ++++-- wp-admin/user-new.php | 6 ++++-- wp-admin/users.php | 5 ++++- wp-admin/widgets.php | 10 +++++++--- 27 files changed, 139 insertions(+), 49 deletions(-) diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index 98c0e4f86a..6d6b61b85d 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -80,13 +80,19 @@ class Custom_Background { * @since 3.0.0 */ function admin_load() { - add_contextual_help( $this->page, '

' . __( 'You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color.' ) . '

' . - '

' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '

' . - '

' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '

' . - '

' . __( 'Don’t forget to click on the Save Changes button when you are finished.' ) . '

' . - '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Custom Background' ) . '

' . - '

' . __( 'Support Forums' ) . '

' ); + add_contextual_help( $this->page, + '

' . __( 'You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color.' ) . '

' . + '

' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '

' . + '

' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '

' . + '

' . __( 'Don’t forget to click on the Save Changes button when you are finished.' ) . '

' + ); + + get_current_screen()->add_help_sidebar( + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Custom Background' ) . '

' . + '

' . __( 'Support Forums' ) . '

' + ); + wp_enqueue_script('custom-background'); wp_enqueue_style('farbtastic'); } diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 1c78cf953a..7b4ef851b6 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -99,12 +99,17 @@ class Custom_Image_Header { * @since 3.0.0 */ function help() { - add_contextual_help( $this->page, '

' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately.' ) . '

' . - '

' . __( 'If you want to discard your custom header and go back to the default included in your theme, click on the buttons to remove the custom image and restore the original header image.' ) . '

' . - '

' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the Save Changes button.' ) . '

' . - '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Custom Header' ) . '

' . - '

' . __( 'Support Forums' ) . '

' ); + add_contextual_help( $this->page, + '

' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately.' ) . '

' . + '

' . __( 'If you want to discard your custom header and go back to the default included in your theme, click on the buttons to remove the custom image and restore the original header image.' ) . '

' . + '

' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the Save Changes button.' ) . '

' + ); + + get_current_screen()->add_help_sidebar( + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Custom Header' ) . '

' . + '

' . __( 'Support Forums' ) . '

' + ); } /** diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index cce196b789..d97df12bc5 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -116,13 +116,17 @@ add_contextual_help( $current_screen, '

' . __( 'You can manage comments made '

' . __( 'In the Author column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '

' . '

' . __( 'In the Comment column, above each comment it says “Submitted on,” followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site. Hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '

' . '

' . __( 'In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The “#” permalink symbol below leads to that post on your live site. The small bubble with the number in it shows how many comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.' ) . '

' . - '

' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link below to learn more.' ) . '

' . + '

' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link below to learn more.' ) . '

' +); + +get_current_screen()->add_help_sidebar( '

' . __( 'For more information:' ) . '

' . '

' . __( 'Documentation on Comments' ) . '

' . '

' . __( 'Documentation on Comment Spam' ) . '

' . '

' . __( 'Documentation on Keyboard Shortcuts' ) . '

' . '

' . __( 'Support Forums' ) . '

' ); + require_once('./admin-header.php'); ?> diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index 0dd0222971..027d8e8119 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -42,7 +42,10 @@ add_screen_option('layout_columns', array('max' => 2, 'default' => 2) ); add_contextual_help($current_screen, '

' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields.' ) . '

' . '

' . __( '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’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '

' . - '

' . __( 'XFN stands for XHTML Friends Network, 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.' ) . '

' . + '

' . __( 'XFN stands for XHTML Friends Network, 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.' ) . '

' +); + +get_current_screen()->add_help_sidebar( '

' . __( 'For more information:' ) . '

' . '

' . __( 'Documentation on Creating Links' ) . '

' . '

' . __( 'Support Forums' ) . '

' diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 7cf21c95db..851b102bad 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -225,8 +225,11 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) $help .= '
  • ' . __( 'Description - The description is not prominent by default; however, some themes may display it.' ) . '
    • ' . '' . - '

    ' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '

    ' . - '

    ' . __( 'For more information:' ) . '

    '; + '

    ' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '

    '; + + add_contextual_help($current_screen, $help); + + $help = '

    ' . __( 'For more information:' ) . '

    '; if ( 'category' == $taxonomy ) $help .= '

    ' . __( 'Documentation on Categories' ) . '

    '; @@ -237,7 +240,8 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help .= '

    ' . __('Support Forums') . '

    '; - add_contextual_help($current_screen, $help); + get_current_screen()->add_help_sidebar( $help ); + unset($help); } diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 933219ea6a..1d2e86b38c 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -164,7 +164,10 @@ if ( 'post' == $post_type ) { '
  • ' . __('Trash removes your post from this list and places it in the trash, from which you can permanently delete it.') . '
    • ' . '
  • ' . __('Preview will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post’s status.') . '
    • ' . '' . - '

    ' . __('You can also edit multiple posts at once. Select the posts you want to edit using the checkboxes, select Edit from the Bulk Actions menu and click Apply. You will be able to change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '

    ' . + '

    ' . __('You can also edit multiple posts at once. Select the posts you want to edit using the checkboxes, select Edit from the Bulk Actions menu and click Apply. You will be able to change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '

    ' + ); + + get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Managing Posts') . '

    ' . '

    ' . __('Support Forums') . '

    ' @@ -173,7 +176,10 @@ if ( 'post' == $post_type ) { add_contextual_help($current_screen, '

    ' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the “Parent” of the other, creating a group of Pages.') . '

    ' . '

    ' . __('Managing Pages is very similar to managing Posts, and the screens can be customized in the same way.') . '

    ' . - '

    ' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a Page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple Pages at once.') . '

    ' . + '

    ' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a Page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple Pages at once.') . '

    ' + ); + + get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Managing Pages') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/export.php b/wp-admin/export.php index 024ccf6cf2..b31000986f 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -40,7 +40,10 @@ add_action( 'admin_head', 'add_js' ); add_contextual_help( $current_screen, '

    ' . __('You can export a file of your site’s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '

    ' . - '

    ' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '

    ' . + '

    ' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Export') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/import.php b/wp-admin/import.php index ed9a45261b..b4bd468a28 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -18,7 +18,10 @@ $title = __('Import'); add_contextual_help($current_screen, '

    ' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '

    ' . - '

    ' . __('In previous versions of WordPress, all the importers were built-in, but they have been turned into plugins as of version 3.0 since most people only use them once or infrequently.') . '

    ' . + '

    ' . __('In previous versions of WordPress, all the importers were built-in, but they have been turned into plugins as of version 3.0 since most people only use them once or infrequently.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Import') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index bb03b3888b..0d7afd31dc 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -44,7 +44,10 @@ add_contextual_help( $current_screen, '

    ' . sprintf(__('You can add links here to be displayed on your site, usually using Widgets. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '

    ' . '

    ' . __('Links may be separated into categories; these are different than the categories used on your posts.') . '

    ' . '

    ' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '

    ' . - '

    ' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '

    ' . + '

    ' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Managing Links') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php index 1331f0afef..9f41ff680c 100644 --- a/wp-admin/media-upload.php +++ b/wp-admin/media-upload.php @@ -64,7 +64,10 @@ if ( isset($_GET['inline']) ) { add_contextual_help( $current_screen, '

    ' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share.') . '

    ' . - '

    ' . __('There are two options for uploading files: Select Files will open the Flash-based uploader (multiple file upload allowed), or you can use the Browser Uploader. Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen. Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '

    ' . + '

    ' . __('There are two options for uploading files: Select Files will open the Flash-based uploader (multiple file upload allowed), or you can use the Browser Uploader. Clicking Select Files opens a navigation window showing you files in your operating system. Selecting Open after clicking on the file you want activates a progress bar on the uploader screen. Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '

    ' + ); + + get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Uploading Media Files') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 953ba09d56..fda4970ae6 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -448,12 +448,15 @@ if ( ! current_theme_supports( 'menus' ) && ! wp_get_nav_menus() ) $help = '

    ' . __('This feature allows you to use a custom menu in place of your theme’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 “Custom Menu” widget to add menus to a sidebar.') . '

    '; $help .= '

    ' . __('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.') . '

    '; $help .= '

    ' . __('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’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’t forget to click Save when you’re finished.') . '

    '; -$help .= '

    ' . __('For more information:') . '

    '; -$help .= '

    ' . __('Documentation on Menus') . '

    '; -$help .= '

    ' . __('Support Forums') . '

    '; add_contextual_help($current_screen, $help); +get_current_screen()->add_help_sidebar( + '

    ' . __('For more information:') . '

    ' . + '

    ' . __('Documentation on Menus') . '

    ' . + '

    ' . __('Support Forums') . '

    ' +); + // Get the admin header require_once( './admin-header.php' ); ?> diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index a69e2738ca..8f587770ab 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -17,7 +17,10 @@ $parent_file = 'options-general.php'; add_contextual_help($current_screen, '

    ' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won’t all fit here! :) Use the documentation link below to get information on what each discussion setting does.') . '

    ' . - '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Discussion Settings') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 56e3e28f5b..c65c32b46d 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -64,7 +64,10 @@ add_contextual_help($current_screen, '

    ' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '

    ' . '

    ' . __('If you want site visitors to be able to register themselves, as opposed to being registered by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site administrator.') . '

    ' . '

    ' . __('UTC means Coordinated Universal Time.') . '

    ' . - '

    ' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on General Settings') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php index 6e3a29cecf..d2c67752a7 100644 --- a/wp-admin/options-media.php +++ b/wp-admin/options-media.php @@ -19,7 +19,10 @@ add_contextual_help($current_screen, '

    ' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '

    ' . '

    ' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.') . '

    ' . ( is_multisite() ? '' : '

    ' . __('Uploading Options gives you folder and path choices for storing your files in your installation’s directory.') . '

    ' ) . - '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Media Settings') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 8f9e32eb73..7b152487b1 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -20,7 +20,10 @@ add_contextual_help($current_screen, '

    ' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there.') . '

    ' . '

    ' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%.') . '

    ' . '

    ' . __('The Optional fields let you customize the “category” and “tag” base names that will appear in archive URLs. For example, the page listing all posts in the “Uncategorized” category could be /topics/uncategorized instead of /category/uncategorized.') . '

    ' . - '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Permalinks Settings') . '

    ' . '

    ' . __('Documentation on Using Permalinks') . '

    ' . diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php index 73b9ac1c13..a771afbf89 100644 --- a/wp-admin/options-privacy.php +++ b/wp-admin/options-privacy.php @@ -18,7 +18,10 @@ $parent_file = 'options-general.php'; add_contextual_help($current_screen, '

    ' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the second option here. Note that your privacy is not complete; your site is still visible on the web.') . '

    ' . '

    ' . __('When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, “Search Engines Blocked,” to remind you that your site is not being crawled.') . '

    ' . - '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Privacy Settings') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 08c408ec22..7cc74c1bb2 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -45,7 +45,10 @@ add_contextual_help($current_screen, '

    ' . __('This screen contains the settings that affect the display of your content.') . '

    ' . '

    ' . sprintf(__('You can choose what’s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two Pages. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '

    ' . '

    ' . __('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display, whether to show full text or a summary, and the character set encoding.') . '

    ' . - '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Reading Settings') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 115e1435db..fc407541c3 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -17,7 +17,10 @@ $parent_file = 'options-general.php'; add_contextual_help($current_screen, '

    ' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within these administration screens, while the rest control external publishing methods. For more information on any of these methods, use the documentation links below.') . '

    ' . - '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' . + '

    ' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Writing Settings') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index ad7b6e1f08..d488e59e33 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -322,7 +322,10 @@ add_contextual_help($current_screen, '

    ' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '

    ' . '

    ' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '

    ' . '

    ' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’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.') . '

    ' . - '

    ' . sprintf( __('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '

    ' . + '

    ' . sprintf( __('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Managing Plugins') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/themes.php b/wp-admin/themes.php index a463841279..9e12de6aae 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -42,11 +42,14 @@ $help .= '

    ' . __('You can see your active theme at the top of the screen. Bel if ( current_user_can('install_themes') ) $help .= '

    ' . sprintf(__('If you would like to see more themes to choose from, click on the “Install Themes” tab and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'http://wordpress.org/extend/themes/') . '

    '; -$help .= '

    ' . __('For more information:') . '

    '; -$help .= '

    ' . __('Documentation on Using Themes') . '

    '; -$help .= '

    ' . __('Support Forums') . '

    '; add_contextual_help($current_screen, $help); +get_current_screen()->add_help_sidebar( + '

    ' . __('For more information:') . '

    ' . + '

    ' . __('Documentation on Using Themes') . '

    ' . + '

    ' . __('Support Forums') . '

    ' +); + add_thickbox(); wp_enqueue_script( 'theme-preview' ); wp_enqueue_script( 'theme' ); diff --git a/wp-admin/tools.php b/wp-admin/tools.php index 48528ae513..88bc4e8e94 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -14,7 +14,10 @@ $title = __('Tools'); add_contextual_help($current_screen, '

    ' . __('Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you’ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options.') . '

    ' . '

    ' . __('The Use This link for the Categories and Tags Converter will take you to the Import page, where that Converter is one of the plugins you can download. Once that plugin is installed, the link on this page takes you to a screen where you can choose conversion either way.') . '

    ' . - '

    ' . __('Note: Turbo/Gears is no longer promoted on this screen as it was in previous versions due to the fact that Google has discontinued support for it.') . '

    ' . + '

    ' . __('Note: Turbo/Gears is no longer promoted on this screen as it was in previous versions due to the fact that Google has discontinued support for it.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Tools') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index cf2c727ef9..e4c80facf8 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -421,7 +421,10 @@ $parent_file = 'tools.php'; add_contextual_help($current_screen, '

    ' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '

    ' . '

    ' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '

    ' . - '

    ' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '

    ' . + '

    ' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Updating WordPress') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/upload.php b/wp-admin/upload.php index ac4e4894c9..f2f7037865 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -149,7 +149,10 @@ add_contextual_help( $current_screen, '

    ' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '

    ' . '

    ' . __( '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.' ) . '

    ' . '

    ' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file’s name displays a simple screen to edit that individual file’s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '

    ' . - '

    ' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '

    ' . + '

    ' . __( 'If a media file has not been attached to any post, you will see that in the Attached To column, and can click on Attach File to launch a small popup that will allow you to search for a post and attach the file.' ) . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __( 'For more information:' ) . '

    ' . '

    ' . __( 'Documentation on Media Library' ) . '

    ' . '

    ' . __( 'Support Forums' ) . '

    ' diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index b1d2e9a022..8c3ae9707e 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -42,13 +42,15 @@ add_contextual_help($current_screen, '

    ' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '

    ' . '

    ' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '

    ' . '

    ' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '

    ' . - '

    ' . __('Remember to click the Update Profile button when you are finished.') . '

    ' . + '

    ' . __('Remember to click the Update Profile button when you are finished.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on User Profiles') . '

    ' . '

    ' . __('Support Forums') . '

    ' ); - $wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer)); $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ); diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index ed7074a1ef..1c214fe1eb 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -125,7 +125,6 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { } } - $title = __('Add New User'); $parent_file = 'users.php'; @@ -144,7 +143,10 @@ add_contextual_help($current_screen, '' . '

    ' . __('You must assign a password to the new user, but don’t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '

    ' . '

    ' . __('New users will receive an email letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email.') . '

    ' . - '

    ' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '

    ' . + '

    ' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Adding New Users') . '

    ' . '

    ' . __('Support Forums') . '

    ' diff --git a/wp-admin/users.php b/wp-admin/users.php index 8626093c39..79ba1c0d1b 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -23,7 +23,10 @@ add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (sc add_contextual_help($current_screen, '

    ' . __('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.') . '

    ' . '

    ' . __('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.') . '

    ' . - '

    ' . __('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.') . '

    ' . + '

    ' . __('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.') . '

    ' +); + +get_current_screen()->add_help_sidebar( '

    ' . __('For more information:') . '

    ' . '

    ' . __('Documentation on Managing Users') . '

    ' . '

    ' . __('Descriptions of Roles and Capabilities') . '

    ' . diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 529cd14585..a85923cd34 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -43,11 +43,15 @@ $help = '

    ' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '

    ' . __('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.') . '

    '; -$help .= '

    ' . __('For more information:') . '

    '; -$help .= '

    ' . __('Documentation on Widgets') . '

    '; -$help .= '

    ' . __('Support Forums') . '

    '; + add_contextual_help($current_screen, $help); +get_current_screen()->add_help_sidebar( + '

    ' . __('For more information:') . '

    ' . + '

    ' . __('Documentation on Widgets') . '

    ' . + '

    ' . __('Support Forums') . '

    ' +); + // These are the widgets grouped by sidebar $sidebars_widgets = wp_get_sidebars_widgets();