WordPress.org
Get WordPress

Make WordPress Core

Changeset 28032


Ignore:
Timestamp:
04/08/2014 02:31:02 AM (11 years ago)
Author:
nacin
Message:

Nuke the TinyMCE help dialog as it is duplicated by help tabs. This leaves just Keyboard Shortcuts.

fixes #27100.

Location:
trunk/src/wp-includes
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-includes/class-wp-editor.php

    r28027 r28032  
    963963
    964964            // WordPress strings
    965             'Editor Help' => __( 'Editor Help' ),
     965            'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
    966966            'Toolbar Toggle' => __( 'Toolbar Toggle' ),
    967967            'Insert Read More tag' => __( 'Insert Read More tag' ),

  • trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

    r28027 r28032  
    182182        editor.windowManager.open({
    183183            url: tinymce.baseURL + '/wp-mce-help.php',
    184             title: 'Editor Help',
     184            title: 'Keyboard Shortcuts',
    185185            width: 450,
    186186            height: 420,
    … …  
    212212
    213213    editor.addButton( 'wp_help', {
    214         tooltip: 'Editor Help',
     214        tooltip: 'Keyboard Shortcuts',
    215215        cmd: 'WP_Help'
    216216    });

  • trunk/src/wp-includes/js/tinymce/wp-mce-help.php

    r28028 r28032  
    1414<head>
    1515<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    16 <title><?php _e('Editor Help'); ?></title>
     16<title><?php _e('Keyboard Shortcuts'); ?></title>
    1717
    1818<?php wp_admin_css( 'wp-admin', true ); ?>
    … …  
    2828    }
    2929
    30     .wp-core-ui #tabs {
    31         margin-top: 1px;
    32         padding: 0 6px;
    33         position: absolute;
    34         top: 0;
    35         right: 0;
    36         left: 0;
    37         height: 31px;
    38         z-index: 1;
    39     }
    40 
    41     .wp-core-ui #tabs a {
    42         position: relative;
    43         float: left;
    44         padding: 6px 10px;
    45         margin: 0;
    46         height: 18px;
    47         line-height: 18px;
    48         text-decoration: none;
    49         -webkit-transition: none;
    50         transition: none;
    51     }
    52 
    53     #tabs a.active {
    54         margin: -1px -1px 0;
    55         background: #fff;
    56         border: 1px solid #ddd;
    57         border-bottom: none;
    58         color: #333;
    59     }
    60 
    61     #tabs .active:after {
    62         display: none;
    63     }
    64 
    65     #flipper {
     30    .wrap {
    6631        background-color: #fff;
    6732        border-top: 1px solid #ddd;
    68         height: 360px;
     33        height: 390px;
    6934        margin: 0;
    70         margin-top: 30px;
    7135        overflow: auto;
    7236        padding: 10px 16px;
    … …  
    139103</script>
    140104
    141 <div id="tabs">
    142     <a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="active"><?php _e('Basics'); ?></a>
    143     <a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a>
    144     <a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a>
    145     <a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a>
    146 </div>
     105<div class="wrap">
    147106
    148 <div id="flipper" class="wrap">
    149 
    150 <div id="content1">
    151     <h2><?php _e('Rich Editing Basics'); ?></h2>
    152     <p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.'); ?></p>
    153     <p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However, editing HTML is not the same as typing text.' );
    154         echo ' ' . __( 'Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css.' );
    155         echo ' ' . __( 'WordPress is producing valid HTML 5 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.');
    156     ?></p>
    157     <p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.'); ?></p>
    158     <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p>
    159 </div>
    160 
    161 <div id="content2" class="hidden">
    162     <h2><?php _e('Advanced Rich Editing'); ?></h2>
    163     <h3><?php _e('Images and Attachments'); ?></h3>
    164     <p><?php _e( 'If you want to upload an image or another media file from your computer, you can use the Add Media button above the editor. Select Upload Files or drag the files you wish to upload from the desktop and drop them into the browser window.' );
    165         echo ' ' . __( 'To insert your image into the post, first click on the thumbnail to reveal a menu of options. When you have selected the options you like, click "Insert into Post" and your image or file will appear in the post you are editing.' );
    166     ?><p>
    167     <p><?php _e( 'The Add Media button can also be used for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button, select Insert from URL, and enter the URL in the box which appears.' ); ?></p>
    168     <h3><?php _e('HTML in the Rich Editor'); ?></h3>
    169     <p><?php _e('Any HTML entered directly into the rich editor will show up as text when the post is viewed. What you see is what you get. When you want to include HTML elements that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and &lt;code&gt;. To do this, click the Text tab and edit the code, then switch back to Visual mode. If the code is valid and understood by the editor, you should see it rendered immediately.'); ?></p>
    170     <h3><?php _e('Pasting in the Rich Editor'); ?></h3>
    171     <p><?php _e('When pasting content from another web page the results can be inconsistent and depend on your browser and on the web page you are pasting from. The editor tries to correct any invalid HTML code that was pasted, but for best results try using the Text tab or the "Paste as text" button on the second row. Alternatively try pasting paragraph by paragraph. In most browsers to select one paragraph at a time, triple-click on it.'); ?></p>
    172     <p><?php _e('Pasting content from another application, like Word or Excel, is automatically handled. If you want it to appear as plain text instead, you can use "Paste as text" button on the second row, or paste directly in Text mode.'); ?></p>
    173 </div>
    174 
    175 <div id="content3" class="hidden">
    176     <h2><?php _e('Writing at Full Speed'); ?></h2>
     107<div>
    177108    <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.'); ?></p>
    178109
    … …  
    212143</div>
    213144
    214 <div id="content4" class="hidden">
    215     <h2><?php _e('About TinyMCE'); ?></h2>
    216 
    217     <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
    218     <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">'); ?></p>
    219     <p><?php _e('Copyright &copy; 2003-2014, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p>
    220     <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.'); ?></p>
    221145</div>
    222 
    223 </div>
    224 <script type="text/javascript">
    225     function d(id) {
    226         return document.getElementById(id);
    227     }
    228 
    229     function flipTab(n) {
    230         var i, c, t;
    231 
    232         for ( i = 1; i <= 4; i++ ) {
    233             c = d('content'+i.toString());
    234             t = d('tab'+i.toString());
    235             if ( n == i ) {
    236                 c.className = '';
    237                 t.className = 'active';
    238             } else {
    239                 c.className = 'hidden';
    240                 t.className = '';
    241             }
    242         }
    243     }
    244 
    245     if ( win && win.tinymce ) {
    246         d('version').innerHTML = win.tinymce.majorVersion + "." + win.tinymce.minorVersion;
    247         d('date').innerHTML = win.tinymce.releaseDate;
    248     }
    249 </script>
    250146</body>
    251147</html>

  • trunk/src/wp-includes/version.php

    r27916 r28032  
    1919 * @global string $tinymce_version
    2020 */
    21 $tinymce_version = '4021-20140401';
     21$tinymce_version = '4021-20140407';
    2222
    2323/**
Note: See TracChangeset for help on using the changeset viewer.