From 9b9424aa775154f430a6f1c67f2458b9de0d8ce1 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 2 Dec 2014 05:15:23 +0000 Subject: [PATCH] Admin help text changes for the General Settings screen, post editing screen, network settings screen, and user editing screen. Fixes #30547 Props kpdesign Built from https://develop.svn.wordpress.org/trunk@30705 git-svn-id: http://core.svn.wordpress.org/trunk@30695 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-advanced.php | 6 +++++- wp-admin/network/settings.php | 1 + wp-admin/options-general.php | 3 ++- wp-admin/user-edit.php | 1 + wp-includes/version.php | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 631cb90cf0..217eb43356 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -281,7 +281,11 @@ if ( 'post' == $post_type ) { ) ); $title_and_editor = '

' . __('Title - Enter a title for your post. After you enter a title, you’ll see the permalink below, which you can edit.') . '

'; - $title_and_editor .= '

' . __('Post editor - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically. You can insert media files by clicking the icons above the post editor and following the directions. You can go to the distraction-free writing screen via the Fullscreen icon in Visual mode (second to last in the top row) or the Fullscreen button in Text mode (last in the row). Once there, you can make buttons visible by hovering over the top area. Exit Fullscreen back to the regular post editor.') . '

'; + $title_and_editor .= '

' . __( 'Post editor - Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.' ) . '

'; + $title_and_editor .= '

' . __( 'Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. ') . '

'; + $title_and_editor .= '

' . __( 'The Text mode allows you to enter HTML along with your post text. Line breaks will be converted to paragraphs automatically.' ) . '

'; + $title_and_editor .= '

' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '

'; + $title_and_editor .= '

' . __( 'You can enable distraction-free writing via the Fullscreen icon (last in the top row). This feature is not available for old browsers or devices with small screens, and requires that Editor Expand be enabled in Screen Options.' ) . '

'; $title_and_editor .= '

' . __( 'Keyboard users: When you’re working in the visual editor, you can use Alt + F10 to access the toolbar.' ) . '

'; get_current_screen()->add_help_tab( array( diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index 1d304dd124..d3d8584f9e 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -54,6 +54,7 @@ get_current_screen()->add_help_tab( array( '

' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '

' . '

' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what᾿s put in the first post, page, comment, comment author, and comment URL.') . '

' . '

' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '

' . + '

' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '

' . '

' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '

' . '

' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '

' ) ); diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index ed7806fb48..629c4d2f35 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -91,7 +91,8 @@ if ( ! is_multisite() ) { '

' . __('If you want site visitors to be able to register themselves, as opposed to 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 admin.') . '

'; } -$options_help .= '

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

' . +$options_help .= '

' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '

' . + '

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

' . '

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

'; get_current_screen()->add_help_tab( array( diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index fb1272eff1..56df98f909 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -48,6 +48,7 @@ else $profile_help = '

' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '

' . '

' . __('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. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '

' . '

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

' . + '

' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out of All Other Sessions button. The button will only display if you are logged in to more than one device.' ) . '

' . '

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

'; diff --git a/wp-includes/version.php b/wp-includes/version.php index 4d58584a9e..7c1d78d4d1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30704'; +$wp_version = '4.1-beta2-30705'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.