WordPress.org
Get WordPress

Make WordPress Core

Changeset 21266


Ignore:
Timestamp:
07/13/2012 12:26:49 AM (14 years ago)
Author:
azaozz
Message:

TinyMCE: update the keyboard shortcuts: Alt + letter for Firefox and WebKit, Alt + Shift + letter for IE and Opera, add shortcut for DFW (Alt + W), see #21214, fixes #21197, fixes #17992

Location:
trunk/wp-includes/js/tinymce
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-includes/js/tinymce/langs/wp-langs-en.js

    r20114 r21266  
    171171},
    172172fullscreen:{
    173 desc:"Toggle fullscreen mode (Alt + Shift + G)"
     173desc:"Toggle fullscreen mode (Alt + G)"
    174174},
    175175media:{
    … …  
    187187},
    188188spellchecker:{
    189 desc:"Toggle spellchecker (Alt + Shift + N)",
     189desc:"Toggle spellchecker (Alt + N)",
    190190menu:"Spellchecker settings",
    191191ignore_word:"Ignore word",
    … …  
    244244italic_desc:"Italic (Ctrl + I)",
    245245underline_desc:"Underline",
    246 striketrough_desc:"Strikethrough (Alt + Shift + D)",
    247 justifyleft_desc:"Align Left (Alt + Shift + L)",
    248 justifycenter_desc:"Align Center (Alt + Shift + C)",
    249 justifyright_desc:"Align Right (Alt + Shift + R)",
    250 justifyfull_desc:"Align Full (Alt + Shift + J)",
    251 bullist_desc:"Unordered list (Alt + Shift + U)",
    252 numlist_desc:"Ordered list (Alt + Shift + O)",
     246striketrough_desc:"Strikethrough (Alt + D)",
     247justifyleft_desc:"Align Left (Alt + L)",
     248justifycenter_desc:"Align Center (Alt + C)",
     249justifyright_desc:"Align Right (Alt + R)",
     250justifyfull_desc:"Align Full (Alt + J)",
     251bullist_desc:"Unordered list (Alt + U)",
     252numlist_desc:"Ordered list (Alt + O)",
    253253outdent_desc:"Outdent",
    254254indent_desc:"Indent",
    255255undo_desc:"Undo (Ctrl + Z)",
    256256redo_desc:"Redo (Ctrl + Y)",
    257 link_desc:"Insert/edit link (Alt + Shift + A)",
    258 unlink_desc:"Unlink (Alt + Shift + S)",
    259 image_desc:"Insert/edit image (Alt + Shift + M)",
     257link_desc:"Insert/edit link (Alt + A)",
     258unlink_desc:"Unlink (Alt + S)",
     259image_desc:"Insert/edit image (Alt + M)",
    260260cleanup_desc:"Cleanup messy code",
    261261code_desc:"Edit HTML Source",
    … …  
    275275newdocument_desc:"New document",
    276276help_desc:"Help",
    277 blockquote_desc:"Blockquote (Alt + Shift + Q)",
     277blockquote_desc:"Blockquote (Alt + Q)",
    278278clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.",
    279279path:"Path",
    … …  
    453453
    454454tinyMCE.addI18n("en.wordpress",{
    455 wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Shift + Z)",
    456 wp_more_desc:"Insert More Tag (Alt + Shift + T)",
    457 wp_page_desc:"Insert Page break (Alt + Shift + P)",
    458 wp_help_desc:"Help (Alt + Shift + H)",
     455wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Z)",
     456wp_more_desc:"Insert More Tag (Alt + T)",
     457wp_page_desc:"Insert Page break (Alt + P)",
     458wp_help_desc:"Help (Alt + H)",
    459459wp_more_alt:"More...",
    460460wp_page_alt:"Next page...",
    … …  
    464464add_audio:"Add Audio",
    465465editgallery:"Edit Gallery",
    466 delgallery:"Delete Gallery"
     466delgallery:"Delete Gallery",
     467wp_fullscreen_desc:"Distraction Free Writing mode (Alt + W)"
    467468});
    468469

  • trunk/wp-includes/js/tinymce/langs/wp-langs.php

    r20601 r21266  
    205205
    206206                'fullscreen' => array(
    207                         'desc' => __('Toggle fullscreen mode (Alt + Shift + G)')
     207                        'desc' => __('Toggle fullscreen mode (Alt + G)')
    208208                ),
    209209
    … …  
    226226
    227227                'spellchecker' => array(
    228                         'desc' => __('Toggle spellchecker (Alt + Shift + N)'),
     228                        'desc' => __('Toggle spellchecker (Alt + N)'),
    229229                        'menu' => __('Spellchecker settings'),
    230230                        'ignore_word' => __('Ignore word'),
    … …  
    287287                'italic_desc' => __('Italic (Ctrl + I)'),
    288288                'underline_desc' => __('Underline'),
    289                 'striketrough_desc' => __('Strikethrough (Alt + Shift + D)'),
    290                 'justifyleft_desc' => __('Align Left (Alt + Shift + L)'),
    291                 'justifycenter_desc' => __('Align Center (Alt + Shift + C)'),
    292                 'justifyright_desc' => __('Align Right (Alt + Shift + R)'),
    293                 'justifyfull_desc' => __('Align Full (Alt + Shift + J)'),
    294                 'bullist_desc' => __('Unordered list (Alt + Shift + U)'),
    295                 'numlist_desc' => __('Ordered list (Alt + Shift + O)'),
     289                'striketrough_desc' => __('Strikethrough (Alt + D)'),
     290                'justifyleft_desc' => __('Align Left (Alt + L)'),
     291                'justifycenter_desc' => __('Align Center (Alt + C)'),
     292                'justifyright_desc' => __('Align Right (Alt + R)'),
     293                'justifyfull_desc' => __('Align Full (Alt + J)'),
     294                'bullist_desc' => __('Unordered list (Alt + U)'),
     295                'numlist_desc' => __('Ordered list (Alt + O)'),
    296296                'outdent_desc' => __('Outdent'),
    297297                'indent_desc' => __('Indent'),
    298298                'undo_desc' => __('Undo (Ctrl + Z)'),
    299299                'redo_desc' => __('Redo (Ctrl + Y)'),
    300                 'link_desc' => __('Insert/edit link (Alt + Shift + A)'),
    301                 'unlink_desc' => __('Unlink (Alt + Shift + S)'),
    302                 'image_desc' => __('Insert/edit image (Alt + Shift + M)'),
     300                'link_desc' => __('Insert/edit link (Alt + A)'),
     301                'unlink_desc' => __('Unlink (Alt + S)'),
     302                'image_desc' => __('Insert/edit image (Alt + M)'),
    303303                'cleanup_desc' => __('Cleanup messy code'),
    304304                'code_desc' => __('Edit HTML Source'),
    … …  
    318318                'newdocument_desc' => __('New document'),
    319319                'help_desc' => __('Help'),
    320                 'blockquote_desc' => __('Blockquote (Alt + Shift + Q)'),
     320                'blockquote_desc' => __('Blockquote (Alt + Q)'),
    321321                'clipboard_msg' => __('Copy/Cut/Paste is not available in Mozilla and Firefox.'),
    322322                'path' => __('Path'),
    … …  
    496496
    497497        $wordpress = array(
    498                 'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Shift + Z)'),
    499                 'wp_more_desc' => __('Insert More Tag (Alt + Shift + T)'),
    500                 'wp_page_desc' => __('Insert Page break (Alt + Shift + P)'),
    501                 'wp_help_desc' => __('Help (Alt + Shift + H)'),
     498                'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Z)'),
     499                'wp_more_desc' => __('Insert More Tag (Alt + T)'),
     500                'wp_page_desc' => __('Insert Page break (Alt + P)'),
     501                'wp_help_desc' => __('Help (Alt + H)'),
    502502                'wp_more_alt' => __('More...'),
    503503                'wp_page_alt' => __('Next page...'),
    … …  
    507507                'add_audio' => __('Add Audio'),
    508508                'editgallery' => __('Edit Gallery'),
    509                 'delgallery' => __('Delete Gallery')
     509                'delgallery' => __('Delete Gallery'),
     510                'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + W)')
    510511        );
    511512

  • trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

    r20054 r21266  
    1010
    1111                init : function(ed, url) {
    12                         var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick;
     12                        var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key;
    1313                        moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
    1414                        nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
    … …  
    7575
    7676                                tb_show('', link.href);
    77                                 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
    7877                        });
    7978
    … …  
    251250
    252251                        // Add custom shortcuts
    253                         ed.addShortcut('alt+shift+c', ed.getLang('justifycenter_desc'), 'JustifyCenter');
    254                         ed.addShortcut('alt+shift+r', ed.getLang('justifyright_desc'), 'JustifyRight');
    255                         ed.addShortcut('alt+shift+l', ed.getLang('justifyleft_desc'), 'JustifyLeft');
    256                         ed.addShortcut('alt+shift+j', ed.getLang('justifyfull_desc'), 'JustifyFull');
    257                         ed.addShortcut('alt+shift+q', ed.getLang('blockquote_desc'), 'mceBlockQuote');
    258                         ed.addShortcut('alt+shift+u', ed.getLang('bullist_desc'), 'InsertUnorderedList');
    259                         ed.addShortcut('alt+shift+o', ed.getLang('numlist_desc'), 'InsertOrderedList');
    260                         ed.addShortcut('alt+shift+d', ed.getLang('striketrough_desc'), 'Strikethrough');
    261                         ed.addShortcut('alt+shift+n', ed.getLang('spellchecker.desc'), 'mceSpellCheck');
    262                         ed.addShortcut('alt+shift+a', ed.getLang('link_desc'), 'mceLink');
    263                         ed.addShortcut('alt+shift+s', ed.getLang('unlink_desc'), 'unlink');
    264                         ed.addShortcut('alt+shift+m', ed.getLang('image_desc'), 'WP_Medialib');
    265                         ed.addShortcut('alt+shift+g', ed.getLang('fullscreen.desc'), 'mceFullScreen');
    266                         ed.addShortcut('alt+shift+z', ed.getLang('wp_adv_desc'), 'WP_Adv');
    267                         ed.addShortcut('alt+shift+h', ed.getLang('help_desc'), 'WP_Help');
    268                         ed.addShortcut('alt+shift+t', ed.getLang('wp_more_desc'), 'WP_More');
    269                         ed.addShortcut('alt+shift+p', ed.getLang('wp_page_desc'), 'WP_Page');
    270                         ed.addShortcut('ctrl+s', ed.getLang('save_desc'), function(){if('function'==typeof autosave)autosave();});
    271 
    272                         if ( tinymce.isWebKit ) {
    273                                 ed.addShortcut('alt+shift+b', ed.getLang('bold_desc'), 'Bold');
    274                                 ed.addShortcut('alt+shift+i', ed.getLang('italic_desc'), 'Italic');
    275                         }
    276 
     252                        mod_key = 'alt';
     253
     254                        if ( tinymce.isIE || tinymce.isOpera )
     255                                mod_key = 'shift+alt';
     256
     257                        ed.addShortcut(mod_key + '+c', 'justifycenter_desc', 'JustifyCenter');
     258                        ed.addShortcut(mod_key + '+r', 'justifyright_desc', 'JustifyRight');
     259                        ed.addShortcut(mod_key + '+l', 'justifyleft_desc', 'JustifyLeft');
     260                        ed.addShortcut(mod_key + '+j', 'justifyfull_desc', 'JustifyFull');
     261                        ed.addShortcut(mod_key + '+q', 'blockquote_desc', 'mceBlockQuote');
     262                        ed.addShortcut(mod_key + '+u', 'bullist_desc', 'InsertUnorderedList');
     263                        ed.addShortcut(mod_key + '+o', 'numlist_desc', 'InsertOrderedList');
     264                        ed.addShortcut(mod_key + '+n', 'spellchecker.desc', 'mceSpellCheck');
     265                        ed.addShortcut(mod_key + '+a', 'link_desc', 'WP_Link');
     266                        ed.addShortcut(mod_key + '+s', 'unlink_desc', 'unlink');
     267                        ed.addShortcut(mod_key + '+m', 'image_desc', 'WP_Medialib');
     268                        ed.addShortcut(mod_key + '+z', 'wordpress.wp_adv_desc', 'WP_Adv');
     269                        ed.addShortcut(mod_key + '+t', 'wordpress.wp_more_desc', 'WP_More');
     270                        ed.addShortcut(mod_key + '+d', 'striketrough_desc', 'Strikethrough');
     271                        ed.addShortcut(mod_key + '+h', 'help_desc', 'WP_Help');
     272                        ed.addShortcut(mod_key + '+p', 'wordpress.wp_page_desc', 'WP_Page');
     273                        ed.addShortcut(mod_key + '+w', 'wordpress.wp_fullscreen_desc', 'wpFullScreen');
     274                        ed.addShortcut(mod_key + '+g', 'fullscreen.desc', 'mceFullScreen');
     275                        ed.addShortcut('ctrl+s', 'save_desc', function(){if('function'==typeof autosave)autosave();});
     276
     277                        // popup buttons for images and the gallery
    277278                        ed.onInit.add(function(ed) {
    278279                                tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) {

  • trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js

    r20804 r21266  
    9494                        });
    9595
     96                        ed.addCommand('wpFullScreen', function() {
     97                                if ( typeof(fullscreen) == 'undefined' )
     98                                        return;
     99
     100                                if ( 'wp_mce_fullscreen' == ed.id )
     101                                        fullscreen.off();
     102                                else
     103                                        fullscreen.on();
     104                        });
     105
    96106                        // Register buttons
    97                         if ( 'undefined' != fullscreen ) {
    98                                 ed.addButton('wp_fullscreen', {
    99                                         title : 'fullscreen.desc',
    100                                         onclick : function(){ fullscreen.on(); }
    101                                 });
    102                         }
     107                        ed.addButton('wp_fullscreen', {
     108                                title : 'wordpress.wp_fullscreen_desc',
     109                                cmd : 'wpFullScreen'
     110                        });
    103111
    104112                        // END fullscreen

  • trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js

    r19945 r21266  
    2929                        // Register example button
    3030                        ed.addButton('link', {
    31                                 title : ed.getLang('advanced.link_desc'),
     31                                title : 'advanced.link_desc',
    3232                                cmd : 'WP_Link'
    3333                        });
    34 
    35                         ed.addShortcut('alt+shift+a', ed.getLang('advanced.link_desc'), 'WP_Link');
    3634
    3735                        ed.onNodeChange.add(function(ed, cm, n, co) {
    … …  
    5957        tinymce.PluginManager.add('wplink', tinymce.plugins.wpLink);
    6058})();
     59

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

    r21212 r21266  
    112112        .keys {
    113113                margin-bottom: 15px;
     114                width: 100%;
     115                border: 0 none;
    114116        }
    115117        .keys p {
    … …  
    131133                border-bottom: 0px;
    132134        }
    133 
    134         .mac,
    135         .macos .win {
     135        .macos .win,
     136        .windows .mac {
    136137                display: none;
    137138        }
    138 
    139         .macos span.mac {
    140                 display: inline;
    141         }
    142 
    143         .macwebkit tr.mac {
    144                 display: table-row;
    145         }
    146 
    147139</style>
    148140<?php if ( is_rtl() ) : ?>
    … …  
    160152</style>
    161153<?php endif; ?>
     154</head>
     155<body class="windows">
     156<script type="text/javascript">
     157if ( tinymce.isMac )
     158        document.body.className = document.body.className.replace(/windows/, 'macos');
     159</script>
     160
     161<ul id="tabs">
     162        <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing') ?>" accesskey="1" tabindex="1" class="current"><?php _e('Basics') ?></a></li>
     163        <li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor') ?>" accesskey="2" tabindex="2"><?php _e('Advanced') ?></a></li>
     164        <li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys') ?>" accesskey="3" tabindex="3"><?php _e('Hotkeys') ?></a></li>
     165        <li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software') ?>" accesskey="4" tabindex="4"><?php _e('About') ?></a></li>
     166</ul>
     167
     168<div id="flipper" class="wrap">
     169
     170<div id="content1">
     171        <h2><?php _e('Rich Editing Basics') ?></h2>
     172        <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>
     173        <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. 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. WordPress is producing valid XHTML 1.0 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.') ?></p>
     174        <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>
     175    <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>
     176</div>
     177
     178<div id="content2" class="hidden">
     179        <h2><?php _e('Advanced Rich Editing') ?></h2>
     180        <h3><?php _e('Images and Attachments') ?></h3>
     181        <p><?php _e('There is a button in the editor toolbar for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button and enter the URL in the box which appears.') ?></p>
     182        <p><?php _e('If you need to upload an image or another media file from your computer, you can use the Media Library button above the editor. The media library will attempt to create a thumbnail-sized copy from each uploaded image. 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.') ?></p>
     183        <h3><?php _e('HTML in the Rich Editor') ?></h3>
     184        <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>
     185        <h3><?php _e('Pasting in the Rich Editor') ?></h3>
     186        <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 one of the paste buttons that are 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>
     187        <p><?php _e('Pasting content from another application, like Word or Excel, is best done with the Paste from Word button on the second row, or in Text mode.') ?></p>
     188</div>
     189
     190<div id="content3" class="hidden">
     191        <h2><?php _e('Writing at Full Speed') ?></h2>
     192    <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>
     193
     194        <table class="keys">
     195                <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
     196                <tr><th>c</th><td><?php _e('Copy') ?></td><th>v</th><td><?php _e('Paste') ?></td></tr>
     197                <tr><th>a</th><td><?php _e('Select all') ?></td><th>x</th><td><?php _e('Cut') ?></td></tr>
     198                <tr><th>z</th><td><?php _e('Undo') ?></td><th>y</th><td><?php _e('Redo') ?></td></tr>
     199
     200                <tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
     201                <tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>
     202                <tr><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>
     203                <tr><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>
     204                <tr><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>
     205        </table>
     206
     207        <p><?php _e('The following shortcuts use different access keys: Alt + letter in Firefox, Chrome and Safari, Alt + Shift + letter in Internet Explorer and Opera.') ?></p>
     208        <table class="keys">
     209                <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
     210                <tr><th>n</th><td><?php _e('Check Spelling') ?></td><th>l</th><td><?php _e('Align Left') ?></td></tr>
     211                <tr><th>j</th><td><?php _e('Justify Text') ?></td><th>c</th><td><?php _e('Align Center') ?></td></tr>
     212                <tr><th>d</th><td><span style="text-decoration: line-through;"><?php _e('Strikethrough') ?></span></td><th>r</th><td><?php _e('Align Right') ?></td></tr>
     213                <tr><th>u</th><td><strong>&bull;</strong> <?php _e('List') ?></td><th>a</th><td><?php _e('Insert link') ?></td></tr>
     214                <tr><th>o</th><td>1. <?php _e('List') ?></td><th>s</th><td><?php _e('Remove link') ?></td></tr>
     215                <tr><th>q</th><td><?php _e('Quote') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
     216                <tr><th>g</th><td><?php _e('Full Screen') ?></td><th>t</th><td><?php _e('Insert More Tag') ?></td></tr>
     217                <tr><th>p</th><td><?php _e('Insert Page Break tag') ?></td><th>h</th><td><?php _e('Help') ?></td></tr>
     218                <tr><th>w</th><td colspan="3"><?php _e('Distraction Free Writing mode') ?></td></tr>
     219        </table>
     220
     221        <p style="padding: 15px 10px 10px;"><?php _e('Editor width in Distraction Free Writing mode:'); ?></p>
     222        <table class="keys">
     223                <tr><th><span class="win">Alt +</span><span class="mac">Ctrl +</span></th><td><?php _e('Wider') ?></td>
     224                        <th><span class="win">Alt -</span><span class="mac">Ctrl -</span></th><td><?php _e('Narrower') ?></td></tr>
     225                <tr><th><span class="win">Alt 0</span><span class="mac">Ctrl 0</span></th><td><?php _e('Default width') ?></td><th></th><td></td></tr>
     226        </table>
     227</div>
     228
     229<div id="content4" class="hidden">
     230        <h2><?php _e('About TinyMCE'); ?></h2>
     231
     232    <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
     233        <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 Licence').'">') ?></p>
     234        <p><?php _e('Copyright &copy; 2003-2011, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
     235        <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.') ?></p>
     236
     237        <div id="buttoncontainer">
     238                <a href="http://www.moxiecode.com" target="_blank"><img src="themes/advanced/img/gotmoxie.png" alt="<?php esc_attr_e('Got Moxie?') ?>" style="border: 0" /></a>
     239        </div>
     240
     241</div>
     242</div>
     243
     244<div class="mceActionPanel">
     245        <div style="margin: 8px auto; text-align: center;padding-bottom: 10px;">
     246                <input type="button" id="cancel" name="cancel" value="<?php esc_attr_e('Close'); ?>" title="<?php esc_attr_e('Close'); ?>" onclick="tinyMCEPopup.close();" />
     247        </div>
     248</div>
    162249<script type="text/javascript">
    163250        function d(id) { return document.getElementById(id); }
    164251
    165252        function flipTab(n) {
    166                 for (i=1;i<=4;i++) {
     253                var i, c, t;
     254
     255                for ( i = 1; i <= 4; i++ ) {
    167256                        c = d('content'+i.toString());
    168257                        t = d('tab'+i.toString());
    … …  
    180269        var win = tinyMCEPopup.getWin();
    181270
    182                 document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
    183         document.getElementById('date').innerHTML = tinymce.releaseDate;
     271                d('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
     272        d('date').innerHTML = tinymce.releaseDate;
    184273
    185274                if ( win.fullscreen && win.fullscreen.settings.visible ) {
    … …  
    188277                        d('content3').className = 'dfw';
    189278                }
    190 
    191                 if ( tinymce.isMac )
    192                         document.body.className = 'macos';
    193 
    194                 if ( tinymce.isMac && tinymce.isWebKit )
    195                         document.body.className = 'macos macwebkit';
    196 
    197279    });
    198280</script>
    199 </head>
    200 <body>
    201 
    202 <ul id="tabs">
    203         <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing') ?>" accesskey="1" tabindex="1" class="current"><?php _e('Basics') ?></a></li>
    204         <li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor') ?>" accesskey="2" tabindex="2"><?php _e('Advanced') ?></a></li>
    205         <li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys') ?>" accesskey="3" tabindex="3"><?php _e('Hotkeys') ?></a></li>
    206         <li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software') ?>" accesskey="4" tabindex="4"><?php _e('About') ?></a></li>
    207 </ul>
    208 
    209 <div id="flipper" class="wrap">
    210 
    211 <div id="content1">
    212         <h2><?php _e('Rich Editing Basics') ?></h2>
    213         <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>
    214         <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. 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. WordPress is producing valid XHTML 1.0 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.') ?></p>
    215         <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>
    216     <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>
    217 </div>
    218 
    219 <div id="content2" class="hidden">
    220         <h2><?php _e('Advanced Rich Editing') ?></h2>
    221         <h3><?php _e('Images and Attachments') ?></h3>
    222         <p><?php _e('There is a button in the editor toolbar for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button and enter the URL in the box which appears.') ?></p>
    223         <p><?php _e('If you need to upload an image or another media file from your computer, you can use the Media Library button above the editor. The media library will attempt to create a thumbnail-sized copy from each uploaded image. 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.') ?></p>
    224         <h3><?php _e('HTML in the Rich Editor') ?></h3>
    225         <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>
    226         <h3><?php _e('Pasting in the Rich Editor') ?></h3>
    227         <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 one of the paste buttons that are 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>
    228         <p><?php _e('Pasting content from another application, like Word or Excel, is best done with the Paste from Word button on the second row, or in Text mode.') ?></p>
    229 </div>
    230 
    231 <div id="content3" class="hidden">
    232         <h2><?php _e('Writing at Full Speed') ?></h2>
    233     <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>
    234 
    235         <table class="keys" width="100%" style="border: 0 none;">
    236                 <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
    237                 <tr><th>c</th><td><?php _e('Copy') ?></td><th>v</th><td><?php _e('Paste') ?></td></tr>
    238                 <tr><th>a</th><td><?php _e('Select all') ?></td><th>x</th><td><?php _e('Cut') ?></td></tr>
    239                 <tr><th>z</th><td><?php _e('Undo') ?></td><th>y</th><td><?php _e('Redo') ?></td></tr>
    240 
    241                 <tr class="win"><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
    242                 <tr class="win"><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>
    243                 <tr class="win"><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>
    244                 <tr class="win"><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>
    245                 <tr class="win"><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>
    246         </table>
    247 
    248         <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.') ?></p>
    249         <table class="keys" width="100%" style="border: 0 none;">
    250                 <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
    251                 <tr class="mac"><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
    252 
    253                 <tr><th>n</th><td><?php _e('Check Spelling') ?></td><th>l</th><td><?php _e('Align Left') ?></td></tr>
    254                 <tr><th>j</th><td><?php _e('Justify Text') ?></td><th>c</th><td><?php _e('Align Center') ?></td></tr>
    255                 <tr><th>d</th><td><span style="text-decoration: line-through;"><?php _e('Strikethrough') ?></span></td><th>r</th><td><?php _e('Align Right') ?></td></tr>
    256                 <tr><th>u</th><td><strong>&bull;</strong> <?php _e('List') ?></td><th>a</th><td><?php _e('Insert link') ?></td></tr>
    257                 <tr><th>o</th><td>1. <?php _e('List') ?></td><th>s</th><td><?php _e('Remove link') ?></td></tr>
    258                 <tr><th>q</th><td><?php _e('Quote') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
    259                 <tr><th>g</th><td><?php _e('Full Screen') ?></td><th>t</th><td><?php _e('Insert More Tag') ?></td></tr>
    260                 <tr><th>p</th><td><?php _e('Insert Page Break tag') ?></td><th>h</th><td><?php _e('Help') ?></td></tr>
    261                 <tr><th>e</th><td colspan="3"><?php _e('Switch to Text mode') ?></td></tr>
    262 
    263                 <tr><th colspan="4" style="font-weight: normal;padding: 15px 10px 10px;"><?php _e('Editor width in Distraction-free writing mode:'); ?></th></tr>
    264                 <tr><th><span class="win">Alt +</span><span class="mac">Ctrl +</span></th><td><?php _e('Wider') ?></td>
    265                         <th><span class="win">Alt -</span><span class="mac">Ctrl -</span></th><td><?php _e('Narrower') ?></td></tr>
    266                 <tr><th><span class="win">Alt 0</span><span class="mac">Ctrl 0</span></th><td><?php _e('Default width') ?></td><th></th><td></td></tr>
    267         </table>
    268 </div>
    269 
    270 <div id="content4" class="hidden">
    271         <h2><?php _e('About TinyMCE'); ?></h2>
    272 
    273     <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
    274         <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 Licence').'">') ?></p>
    275         <p><?php _e('Copyright &copy; 2003-2011, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
    276         <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
    277 
    278         <div id="buttoncontainer">
    279                 <a href="http://www.moxiecode.com" target="_blank"><img src="themes/advanced/img/gotmoxie.png" alt="<?php esc_attr_e('Got Moxie?') ?>" style="border: 0" /></a>
    280         </div>
    281 
    282 </div>
    283 </div>
    284 
    285 <div class="mceActionPanel">
    286         <div style="margin: 8px auto; text-align: center;padding-bottom: 10px;">
    287                 <input type="button" id="cancel" name="cancel" value="<?php esc_attr_e('Close'); ?>" title="<?php esc_attr_e('Close'); ?>" onclick="tinyMCEPopup.close();" />
    288         </div>
    289 </div>
    290 
    291281</body>
    292282</html>
Note: See TracChangeset for help on using the changeset viewer.