From 813ca40b2f4e375a0b7fb504a94048c872331d6b Mon Sep 17 00:00:00 2001 From: markjaquith Date: Thu, 5 Jul 2012 15:28:13 +0000 Subject: [PATCH] Switch "HTML" tab to "Text" in DFW mode. Update documentation and inline comments to refer to the "Text" tab or mode instead of "HTML". see #20993 git-svn-id: http://core.svn.wordpress.org/trunk@21212 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-advanced.php | 4 ++-- wp-admin/js/wp-fullscreen.dev.js | 2 +- wp-includes/class-wp-editor.php | 4 ++-- wp-includes/js/tinymce/wp-mce-help.php | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index c22c68aaf3..2a5d56fab9 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -173,7 +173,7 @@ 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 HTML. 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 HTML mode allows you to enter raw HTML along with your post text. 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 HTML 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. 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.') . '

'; get_current_screen()->add_help_tab( array( 'id' => 'title-post-editor', @@ -214,7 +214,7 @@ if ( 'post' == $post_type ) { ); } elseif ( 'page' == $post_type ) { $about_pages = '

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

' . - '

' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '

'; + '

' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '

'; get_current_screen()->add_help_tab( array( 'id' => 'about-pages', diff --git a/wp-admin/js/wp-fullscreen.dev.js b/wp-admin/js/wp-fullscreen.dev.js index 4d4d8c487d..af96124157 100644 --- a/wp-admin/js/wp-fullscreen.dev.js +++ b/wp-admin/js/wp-fullscreen.dev.js @@ -576,7 +576,7 @@ PubSub.prototype.publish = function( topic, args ) { return false; }); - // word count in HTML mode + // word count in Text mode if ( typeof(wpWordCount) != 'undefined' ) { txtarea.keyup( function(e) { diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 8d2e6f527a..5d305b5bb8 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -34,7 +34,7 @@ final class _WP_Editors { 'textarea_name' => $editor_id, // set the textarea name to something different, square brackets [] can be used here 'textarea_rows' => get_option('default_post_edit_rows', 10), // rows="..." 'tabindex' => '', - 'editor_css' => '', // intended for extra styles for both visual and HTML editors buttons, needs to include the