Changeset 27190 for trunk/src/wp-includes/js/tinymce/wp-mce-help.php

Timestamp:

02/18/2014 06:31:30 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE: style the modals to match WordPress admin (first-run). Fix couple of IE problems in tiny_mce_popup.js. Props avryl, see #26952, see #24067

File:

• trunk/src/wp-includes/js/tinymce/wp-mce-help.php (modified) (10 diffs)

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

@@ -16 +16 @@
 <title><?php _e('Rich Editor Help'); ?></title>
 <script type="text/javascript" src="tiny_mce_popup.js?ver=358-20121205"></script>
-<?php
-wp_admin_css( 'wp-admin', true );
-?>
+<?php wp_admin_css( 'wp-admin', true ); ?>
 <style type="text/css">
+
+    html {
+        background: #fcfcfc;
+        overflow: hidden;
+    }
+
     body {
         min-width: 0;
     }
-    #wphead {
-        font-size: 80%;
-        border-top: 0;
-        color: #555;
-        background-color: #f1f1f1;
-    }
-    #wphead h1 {
-        font-size: 24px;
-        color: #555;
+
+    #tabs-wrap {
+        position: absolute;
+        top: 0;
+    }
+
+    #tabs {
+        box-shadow: 0 3px 5px rgba( 255, 255, 255, 0.2 );
         margin: 0;
-        padding: 10px;
-    }
-    #tabs {
-        padding: 15px 15px 3px;
-        background-color: #f1f1f1;
-        border-bottom: 1px solid #dfdfdf;
+        padding: 0;
+        position: relative;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+    }
+
+    #tabs a {
+        -webkit-transition: none;
+        transition: none;
+    }
+    
+    #tabs-wrap #tabs > a {
+        float: left;
+        font-size: 14px;
+        height: 18px;
+        line-height: 18px;
         margin: 0;
-    }
-    #tabs li {
-        display: inline;
-    }
-    #tabs a.current {
+        padding: 7px 10px;
+        position: relative;
+        text-decoration: none;
+        border-right: 1px solid #ddd;
+        background-color: #eee;
+        color: inherit;
+    }
+
+    #tabs > a:active,
+    #tabs > a:focus {
+        outline: none;
+    }
+
+    #tabs-wrap #tabs .active,
+    #tabs-wrap #tabs .active:hover {
+        color: #333;
+        background: #fff;
+        border-bottom: 1px solid #fff;
+    }
+
+    #tabs .active:after {
+        display: none;
+    }
+
+    #flipper {
         background-color: #fff;
-        border-color: #dfdfdf;
-        border-bottom-color: #fff;
-        color: #d54e21;
-    }
-    #tabs a {
-        color: #2583AD;
-        padding: 6px;
-        border-width: 1px 1px 0;
-        border-style: solid solid none;
-        border-color: #f1f1f1;
-        text-decoration: none;
-    }
-    #tabs a:hover {
-        color: #d54e21;
-    }
-    .wrap h2 {
-        border-bottom-color: #dfdfdf;
-        color: #555;
-        margin: 5px 0;
-        padding: 0;
-        font-size: 18px;
-    }
-    #user_info {
-        right: 5%;
-        top: 5px;
-    }
-    h3 {
-        font-size: 1.1em;
-        margin-top: 10px;
-        margin-bottom: 0px;
-    }
-    #flipper {
+        border-top: 1px solid #ddd;
+        height: 360px;
         margin: 0;
-        padding: 5px 20px 10px;
-        background-color: #fff;
-        border-left: 1px solid #dfdfdf;
-        border-bottom: 1px solid #dfdfdf;
-    }
-    * html {
-        overflow-x: hidden;
-        overflow-y: scroll;
-    }
-    #flipper div p {
-        margin-top: 0.4em;
-        margin-bottom: 0.8em;
-        text-align: justify;
-    }
+        margin-top: 32px;
+        overflow-y: scroll;
+        padding: 10px 16px;
+    }
+
     th {
         text-align: center;
     }
+
     .top th {
         text-decoration: underline;
     }
+
     .top .key {
         text-align: center;
         width: 5em;
     }
-    .top .action {
-        text-align: left;
-    }
-    .align {
-        border-left: 3px double #333;
-        border-right: 3px double #333;
-    }
+
     .keys {
+        border: 0 none;
         margin-bottom: 15px;
         width: 100%;
-        border: 0 none;
-    }
+    }
+
     .keys p {
         display: inline-block;
@@ -120 +113 @@
         padding: 0px;
     }
-    .keys .left { text-align: left; }
-    .keys .center { text-align: center; }
-    .keys .right { text-align: right; }
-    td b {
-        font-family: "Times New Roman" Times serif;
-    }
-    #buttoncontainer {
+
+    .keys .left {
+        text-align: left;
+    }
+
+    .keys .center {
         text-align: center;
-        margin-bottom: 20px;
-    }
-    #buttoncontainer a, #buttoncontainer a:hover {
-        border-bottom: 0px;
-    }
+    }
+
+    .keys .right {
+        text-align: right;
+    }
+
     .macos .win,
     .windows .mac {
         display: none;
     }
+
 </style>
 <?php if ( is_rtl() ) : ?>
 <style type="text/css">
-    #wphead, #tabs {
-        padding-left: auto;
-        padding-right: 15px;
-    }
-    #flipper {
-        margin: 5px 0 3px 10px;
-    }
-    .keys .left, .top, .action { text-align: right; }
-    .keys .right { text-align: left; }
-    td b { font-family: Tahoma, "Times New Roman", Times, serif }
+
+    .keys .left {
+        text-align: right;
+    }
+
+    .keys .right {
+        text-align: left;
+    }
+
 </style>
 <?php endif; ?>
@@ -159 +152 @@
 </script>
 
-<ul id="tabs">
-    <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="current"><?php _e('Basics'); ?></a></li>
-    <li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a></li>
-    <li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a></li>
-    <li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a></li>
-</ul>
+<div id="tabs-wrap">
+    <div id="tabs">
+        <a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="active"><?php _e('Basics'); ?></a>
+        <a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a>
+        <a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a>
+        <a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a>
+    </div>
+</div>
 
 <div id="flipper" class="wrap">
@@ -173 +168 @@
     <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>
     <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>
-    <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>
+    <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>
 </div>
 
@@ -190 +185 @@
 <div id="content3" class="hidden">
     <h2><?php _e('Writing at Full Speed'); ?></h2>
-    <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>
+    <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>
 
     <table class="keys">
@@ -229 +224 @@
     <h2><?php _e('About TinyMCE'); ?></h2>
 
-    <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
+    <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
     <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>
     <p><?php _e('Copyright &copy; 2003-2014, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p>
@@ -235 +230 @@
 </div>
 
-</div>
-
-<div class="mceActionPanel">
-    <div style="margin: 8px auto; text-align: center;padding-bottom: 10px;">
-        <input type="button" id="cancel" name="cancel" value="<?php esc_attr_e('Close'); ?>" title="<?php esc_attr_e('Close'); ?>" onclick="tinyMCEPopup.close();" />
-    </div>
 </div>
 <script type="text/javascript">
@@ -253 +242 @@
             if ( n == i ) {
                 c.className = '';
-                t.className = 'current';
+                t.className = 'active';
             } else {
                 c.className = 'hidden';
@@ -261 +250 @@
     }
 
-    tinyMCEPopup.onInit.add(function() {
-        var win = tinyMCEPopup.getWin();
+    tinyMCEPopup.onInit.add(function() {
+        var win = tinyMCEPopup.getWin();
 
         d('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
-        d('date').innerHTML = tinymce.releaseDate;
+        d('date').innerHTML = tinymce.releaseDate;
 
         if ( win.fullscreen && win.fullscreen.settings.visible ) {
@@ -272 +261 @@
             d('content3').className = 'dfw';
         }
-    });
+    });
 </script>
 </body>