From 65a10cedbb46dbcad2b8cbbab90d866d848b4af5 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 1 Dec 2011 01:24:39 +0000 Subject: [PATCH] Help tweaks for themes, plugins screens. props jane, see #19020. git-svn-id: http://svn.automattic.com/wordpress/trunk@19510 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/custom-background.php | 2 +- wp-admin/nav-menus.php | 9 +++++---- wp-admin/plugin-install.php | 16 ++++++++-------- wp-admin/plugins.php | 2 +- wp-admin/themes.php | 8 ++++---- wp-admin/widgets.php | 3 ++- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index eaa7912c69..b2701a664f 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -297,7 +297,7 @@ if ( get_background_image() ) { - +
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index d1d38ad6e2..ef1eafc5a4 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -448,15 +448,16 @@ if ( ! current_theme_supports( 'menus' ) && ! wp_get_nav_menus() ) get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), -'content' => - '

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

' +'content' => + '

' . __('This feature allows you to use a custom menu in place of your theme’s default menus.') . '

' . + '

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

' . + '

' . __('If your theme does not support the custom menus feature yet (the default themes, Twenty Eleven and Twenty Ten, do), you can learn about adding this support by following the Documentation link to the side.') . '

' ) ); get_current_screen()->add_help_tab( array( 'id' => 'create-menus', 'title' => __('Create Menus'), 'content' => - '

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

-

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

' + '

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

' ) ); get_current_screen()->set_help_sidebar( diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index ff398999c9..70905b96e6 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -36,18 +36,18 @@ $body_id = $tab; do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information. get_current_screen()->add_help_tab( array( -'id' => 'finding-plugins', -'title' => __('Finding Plugins'), +'id' => 'overview', +'title' => __('Overview'), 'content' => - '

' . 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 WordPress.org Plugin Directory 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/') . '

' . - '

' . __('If you know what you’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.') . '

' . - '

' . __('If you just want to get an idea of what’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.') . '

' + '

' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory 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/') . '

' ) ); get_current_screen()->add_help_tab( array( -'id' => 'uploading-plugin', -'title' => __('Uploading Plugins'), +'id' => 'adding-plugins', +'title' => __('Adding Plugins'), 'content' => - '

' . __('If you want to install a plugin that you’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.') . '

' + '

' . __('If you know what you’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.') . '

' . + '

' . __('If you just want to get an idea of what’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.') . '

' . + '

' . __('If you want to install a plugin that you’ve downloaded elsewhere, click the Upload in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '

' ) ); get_current_screen()->set_help_sidebar( diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 62acb93087..2cb23baa9e 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -327,7 +327,7 @@ get_current_screen()->add_help_tab( array( ) ); get_current_screen()->add_help_tab( array( 'id' => 'compatibility-problems', -'title' => __('Compatibility Problems'), +'title' => __('Troubleshooting'), 'content' => '

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

' diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 13a440530c..bb84ca1143 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -41,8 +41,8 @@ $help_manage = '

' . __('Aside from the default theme included with your WordP '

' . __('You can see your active theme at the top of the screen. Below are the other themes you have installed that are not currently in use. You can see what your site would look like with one of these themes by clicking the Preview link. To change themes, click the Activate link.') . '

'; get_current_screen()->add_help_tab( array( - 'id' => 'manage-themes', - 'title' => __('Manage Themes'), + 'id' => 'overview', + 'title' => __('Overview'), 'content' => $help_manage, ) ); @@ -54,8 +54,8 @@ if ( current_user_can( 'install_themes' ) ) { } get_current_screen()->add_help_tab( array( - 'id' => 'install-themes', - 'title' => __('Install Themes'), + 'id' => 'adding-themes', + 'title' => __('Adding Themes'), 'content' => $help_install, ) ); } diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 92cbcb13d5..e9354cb9dc 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -54,7 +54,8 @@ get_current_screen()->add_help_tab( array( 'id' => 'missing-widgets', 'title' => __('Missing Widgets'), 'content' => - '

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

' + '

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

' . + '

' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive area, where all your widgets and their settings will have been saved.') . '

' ) ); get_current_screen()->set_help_sidebar(