Ticket #28654: 28654.4.diff

src/wp-admin/edit-form-advanced.php

@@ -319 +319 @@
 }
 
 if ( 'post' == $post_type || 'page' == $post_type ) {
-        $inserting_media = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
+        $inserting_media  = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) either by clicking the Add Media button, or by dragging and dropping media directly into the editor. From the Insert Media popup, you can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post.' ) . '</p>';
+        $inserting_media .= '<p>' . __( 'To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
         $inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to <a href="http://codex.wordpress.org/Embeds">learn more about embeds</a>.' ) . '</p>';
 
         get_current_screen()->add_help_tab( array(

src/wp-admin/plugin-install.php

@@ -45 +45 @@
  */
 do_action( "install_plugins_pre_$tab" );
 
+$overview  = '<p>' . __( 'Plugins hook into WordPress to extend its functionality with custom features. They are developed independently from the core WordPress application by thousands of developers all over the world.' ) . '</p>';
+$overview .= '<p>' . sprintf( __( 'All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses.' ), 'https://wordpress.org/plugins/' ) . '</p>';
+$overview .= '<p>' . __( 'You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.' ) . '</p>';
+
 get_current_screen()->add_help_tab( array(
-'id'            => 'overview',
-'title'         => __('Overview'),
-'content'       =>
-        '<p>' . 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 <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.'), 'https://wordpress.org/plugins/') . '</p>'
+        'id'      => 'overview',
+        'title'   => __('Overview'),
+        'content' => $overview,
 ) );
+
+$browsing_plugins  = '<p>' . __( 'If you know what plugin you&#8217;re looking for, using the Search Plugins box is your best bet. Or, if you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.' ) . '</p>';
+$browsing_plugins .= '<p>' . __( 'You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.' ) . '</p>';
+if ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+        $browsing_plugins .= '<p>' . __( 'If you&#8217;re running the Beta Tester plugin or a development version of WordPress, the Beta Testing link in the upper left of the screen provides quick access to plugins you might find useful.' ) . '</p>';
+}
+
 get_current_screen()->add_help_tab( array(
-'id'            => 'adding-plugins',
-'title'         => __('Adding Plugins'),
-'content'       =>
-        '<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 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, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
-        '<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
-        '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
+        'id'      => 'browsing-plugins',
+        'title'   => __( 'Browsing Plugins' ),
+        'content' => $browsing_plugins,
 ) );
 
+$adding_plugins  = '<p>' . __( 'There are a variety of ways to install plugins from within WordPress:' ) . '</p>';
+$adding_plugins .= '<ul><li>' . __( '<strong>Click the Install Now button</strong> to install a plugin from the cards list.' ) . '</li>';
+$adding_plugins .= '<li>' . __( '<strong>Click the More Details link</strong> in the upper right of a plugin card to launch a popup with extended information and reviews.' ) . '</li>';
+$adding_plugins .= '<li>' . __( 'To install a plugin that you&#8217;ve downloaded elsewhere, <strong>click the Upload Plugin button</strong> in the upper left of the screen, then follow the directions to upload the plugin&#8217;s .zip file.' ) . '</li></ul>';
+
+get_current_screen()->add_help_tab( array(
+        'id'      => 'adding-plugins',
+        'title'   => __( 'Adding Plugins' ),
+        'content' => $adding_plugins,
+) );
+
 get_current_screen()->set_help_sidebar(
         '<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>' .

src/wp-admin/upload.php

@@ -29 +29 @@
         ) );
 
         get_current_screen()->add_help_tab( array(
-                'id'            => 'overview',
-                'title'         => __( 'Overview' ),
-                'content'       =>
-                        '<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 Screen Options tab to customize the display of this screen.' ) . '</p>'
+                'id'      => 'overview',
+                'title'   => __( 'Overview' ),
+                'content' =>
+                        '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can narrow the list by file type/status or date using the filters at the top of the screen.' ) . '</p>' .
+                        '<p>' . __( 'You can view media in a list view with columns or an endless media grid by toggling the grid or list icons at the top of the screen.' ) . '</p>'
         ) );
 
+        get_current_screen()->add_help_tab( array(
+                'id'      => 'attachment-details',
+                'title'   => __( 'Attachment Details' ),
+                'content' =>
+                        '<p>' . __( 'Clicking an item in the media grid will reveal an Attachment Details popup. In this popup, you&#8217;ll see a larger preview of the media item, meta information, and fields for editing the caption, title, description, and more. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
+                        '<p>' . __( 'Use the arrow buttons at the top of the popup, or the left and right arrow keys on your keyboard to navigate between between media items from the grid view.' ) . '</p>'
+        ) );
+
+        get_current_screen()->add_help_tab( array(
+                'id'      => 'deleting-media',
+                'title'   => __( 'Deleting Media' ),
+                'content' =>
+                        '<p>' . __( 'To delete one or more media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to the media grid screen.' ) . '</p>'
+        ) );
+
         get_current_screen()->set_help_sidebar(
                 '<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>' .
@@ -186 +202 @@
 'id'            => 'overview',
 'title'         => __('Overview'),
 'content'       =>
-        '<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 Screen Options 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>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can narrow the list by file type/status or date using the filters at the top of the screen.' ) . '</p>' .
+        '<p>' . __( 'You can view media in a list view with columns or an endless media grid by toggling the grid or list icons at the top of the screen.' ) . '</p>' .
+        '<p>' . __( 'Use the Screen Options tab to customize the display of this screen, including which columns to show or hide and how many items to list per page.' ) . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
 'id'            => 'actions-links',
@@ -199 +216 @@
 'id'            => 'attaching-files',
 'title'         => __('Attaching Files'),
 'content'       =>
-        '<p>' . __( '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.' ) . '</p>'
+        '<p>' . __( 'If a media file has not been attached to any post, you will see that in the Uploaded To column, and can click on the Attach link to launch a small popup that will allow you to search for a post or page and attach the file.' ) . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(