From 3d51303ca315bf8ada8507ef8e2719a6e420bc4d Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 1 Dec 2011 01:17:14 +0000 Subject: [PATCH] Help tweaks for users, tools. props jane, see #19020. git-svn-id: http://svn.automattic.com/wordpress/trunk@19509 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/export.php | 6 +++--- wp-admin/import.php | 6 +++--- wp-admin/tools.php | 7 ++++--- wp-admin/user-edit.php | 4 ++-- wp-admin/user-new.php | 33 ++++++++++++++++++++++++--------- wp-admin/users.php | 32 ++++++++++++++++++++------------ 6 files changed, 56 insertions(+), 32 deletions(-) diff --git a/wp-admin/export.php b/wp-admin/export.php index d43b04a282..700655246b 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -39,8 +39,8 @@ function add_js() { add_action( 'admin_head', 'add_js' ); get_current_screen()->add_help_tab( array( - 'id' => 'export', - 'title' => __('Export'), + 'id' => 'overview', + 'title' => __('Overview'), 'content' => '

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

', ) ); @@ -125,7 +125,7 @@ function export_date_options() {

-

+

diff --git a/wp-admin/import.php b/wp-admin/import.php index d107a34700..f9d813709c 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -17,8 +17,8 @@ if ( !current_user_can('import') ) $title = __('Import'); get_current_screen()->add_help_tab( array( - 'id' => 'import', - 'title' => __('Import'), + 'id' => 'overview', + 'title' => __('Overview'), 'content' => '

' . __('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 importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '

', ) ); @@ -130,7 +130,7 @@ if ( empty($importers) ) { } if ( current_user_can('install_plugins') ) - echo '

' . sprintf( __('If the importer you need is not listed, search the plugins directory to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '

'; + echo '

' . sprintf( __('If the importer you need is not listed, search the plugin directory to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '

'; ?> diff --git a/wp-admin/tools.php b/wp-admin/tools.php index ba1a084821..7889727752 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -18,8 +18,9 @@ get_current_screen()->add_help_tab( array( ) ); get_current_screen()->add_help_tab( array( 'id' => 'converter', - 'title' => __('Categories Tags Converter'), - 'content' => '

' . __('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 to convert tags into categories or vice versa.') . '

', + 'title' => __('Categories and Tags Converter'), + 'content' => '

' . __('Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierachy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '

' . + '

' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, return to this screen and the link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '

', ) ); get_current_screen()->set_help_sidebar( @@ -57,7 +58,7 @@ $tags = get_taxonomy('post_tag'); if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>

-

Use this to convert categories to tags or tags to categories.'), 'import.php' ); ?>

+

Categories and Tags Converter available from the Import screen.'), 'import.php' ); ?>

' . __('Your profile contains information about you (your &# '

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

'; get_current_screen()->add_help_tab( array( - 'id' => 'your-profile', - 'title' => __('Your Profile'), + 'id' => 'overview', + 'title' => __('Overview'), 'content' => $profile_help, ) ); diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 64d0f6bf04..8dd4e7dbdd 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -139,20 +139,35 @@ $do_both = false; if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') ) $do_both = true; +$help = '

' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '

'; + +if ( is_multisite() ) { + $help .= '

' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users.') . '

' . + '

' . __('New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to recieve a welcome email.') . '

'; +} else { + $help .= '

' . __('You must assign a password to the new user, which they can change after logging in. 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.') . '

'; +} + +$help .= '

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

'; + get_current_screen()->add_help_tab( array( -'id' => 'add-new-user', -'title' => __('Adding New Users'), -'content' => '

' . __('To add a new user to your site, fill in the form on this screen. If you’re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '

' . + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => $help, +) ); + +get_current_screen()->add_help_tab( array( +'id' => 'user-roles', +'title' => __('User Roles'), +'content' => '

' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '

' . '' . - ( is_multisite() ? '

' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users.') . '

' : '

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

' ). - ( is_multisite() ? '

' . __('New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to recieve a welcome email.') . '

' : '

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

' + '
  • ' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '
    • ' . + '' ) ); get_current_screen()->set_help_sidebar( diff --git a/wp-admin/users.php b/wp-admin/users.php index f287c86131..6e404c3164 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -21,15 +21,15 @@ add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (sc // contextual help - choose Help on the top right of admin panel to preview this. get_current_screen()->add_help_tab( array( - 'id' => 'screen-info', - 'title' => __('Users List'), + 'id' => 'overview', + 'title' => __('Overview'), 'content' => '

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

    ' . '

    ' . __('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_tab( array( - 'id' => 'customize-display', - 'title' => __('Customizing This Display'), + 'id' => 'screen-display', + 'title' => __('Screen Display'), 'content' => '

    ' . __('You can customize the display of this screen in a number of ways:') . '

    ' . '' ) ); +$help = '

    ' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '

    ' . + ''; + get_current_screen()->add_help_tab( array( - 'id' => 'row-actions', - 'title' => __('Action Links'), - 'content' => '

    ' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '

    ' . - '' + 'id' => 'actions', + 'title' => __('Actions'), + 'content' => $help, ) ); - +unset( $help ); + get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' .