Ticket #11862: 11862-patch-rough-draft.diff

wp-admin/css/colors-classic.dev.css

@@ -484 +484 @@
 
 a,
 #adminmenu a,
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML,
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
 #media-items a.delete,
@@ -675 +675 @@
         background-image: url(../images/date-button.gif);
 }
 
-#quicktags #ed_link {
+.quicktags #ed_link {
         color: #00f;
 }
 
@@ -778 +778 @@
 }
 
 /* editors */
-#quicktags {
+.quicktags {
         border-color: #dfdfdf;
         background-color: #dfdfdf;
 }
@@ -796 +796 @@
         border-color: #ededed;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
         background-color: #f2f1eb;
         border-color: #dfdfdf;
         color: #999;
 }
 
-#poststuff #editor-toolbar .active {
+#poststuff .editor-toolbar .active {
         border-bottom-color: #e3eef7;
         background-color: #e3eef7;
         color: #333;
 }
 
 /* TinyMCE */
-#post-status-info {
+.post-status-info {
         background-color: #ededed;
 }
 
@@ -947 +947 @@
         color: #888;
 }
 
-#quicktags,
+.quicktags,
 .wp_themeSkin tr.mceFirst td.mceToolbar {
         background: #e3eef7 url("../images/ed-bg-vs.gif") repeat-x scroll left top;
 }
@@ -1016 +1016 @@
 }
 /* end TinyMCE */
 
-#editorcontainer,
-#post-status-info,
+.editorcontainer,
+.post-status-info,
 #titlediv #title,
 .editwidget .widget-inside {
         border-color: #dfdfdf;

wp-admin/css/colors-fresh.dev.css

@@ -480 +480 @@
 
 a,
 #adminmenu a,
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML,
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
 #media-items a.delete,
@@ -670 +670 @@
         background-image: url(../images/date-button.gif);
 }
 
-#quicktags #ed_link {
+.quicktags #ed_link {
         color: #00f;
 }
 
@@ -776 +776 @@
 }
 
 /* editors */
-#quicktags {
+.quicktags {
         border-color: #dfdfdf;
         background-color: #dfdfdf;
 }
@@ -794 +794 @@
         border-color: #EDEDED;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
         background-color: #f1f1f1;
         border-color: #dfdfdf;
         color: #999;
 }
 
-#poststuff #editor-toolbar .active {
+#poststuff .editor-toolbar .active {
         border-bottom-color: #e9e9e9;
         background-color: #e9e9e9;
         color: #333;
 }
 
 /* TinyMCE */
-#post-status-info {
+.post-status-info {
         background-color: #EDEDED;
 }
 
@@ -1011 +1011 @@
 }
 /* end TinyMCE */
 
-#editorcontainer,
-#post-status-info,
+.editorcontainer,
+.post-status-info,
 #titlediv #title,
 .editwidget .widget-inside {
         border-color: #dfdfdf;

wp-admin/css/dashboard-rtl.css

@@ -68 +68 @@
 #dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
         margin: 0 5em 1em 0;
 }
-#dashboard_quick_press #media-buttons {
+#dashboard_quick_press .media-buttons {
         margin: 0 5em .5em 0;
         padding: 0 10px 0 0;
 }

wp-admin/css/dashboard.dev.css

@@ -276 +276 @@
         margin: 0 0 1em 5em;
 }
 
-#dashboard_quick_press #media-buttons {
+#dashboard_quick_press .media-buttons {
         margin: 0 0 .5em 5em;
         padding: 0 0 0 10px;
         font-size: 11px;
 }
 
-#dashboard_quick_press #media-buttons a {
+#dashboard_quick_press .media-buttons a {
         vertical-align: bottom;
 }
 

wp-admin/css/ie-rtl.css

@@ -74 +74 @@
         position: absolute;
         right:0;
 }
-#post-status-info {
+.post-status-info {
         height: 25px;
 }
 #screen-meta {

wp-admin/css/ie.css

@@ -231 +231 @@
 }
 
 #the-comment-list .comment-item,
-#post-status-info,
+.post-status-info,
 #wpwrap,
 #wpcontent,
 #wrap,
@@ -241 +241 @@
 .metabox-holder,
 #titlediv,
 #post-body,
-#editorcontainer,
+.editorcontainer,
 .tablenav,
 .widget-liquid-left,
 .widget-liquid-right,
@@ -266 +266 @@
         margin: -3px 0 4px;
 }
 
-* html #editorcontainer {
+* html .editorcontainer {
         padding: 0;
 }
 
-#editorcontainer #content {
+.editorcontainer .the-editor-html-content {
         overflow: auto;
         margin: auto;
         width: 98%;

wp-admin/css/press-this-rtl.css

@@ -2 +2 @@
         font-family: Tahoma, Arial;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
         margin: 0 0 0 5px;
         float: right;
 }

wp-admin/css/press-this.dev.css

@@ -23 +23 @@
         background: transparent url(../images/xit.gif) no-repeat 0 0;
 }
 
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
         -moz-border-radius: 3px 3px 0 0;
         -webkit-border-top-right-radius: 3px;
         -webkit-border-top-left-radius: 3px;
@@ -80 +80 @@
         width: 0;
 }
 
-#poststuff #edButtonPreview.active,
-#poststuff #edButtonHTML.active {
+#poststuff .edButtonPreview.active,
+#poststuff .edButtonHTML.active {
         display: none;
 }
 

wp-admin/css/wp-admin-rtl.dev.css

@@ -56 +56 @@
 #wpcontent select {
         font-family: Tahoma, Arial, sans-serif;
 }
-#quicktags {
+.quicktags {
         background-position: right top;
 }
 /* 500 - 700
@@ -221 +221 @@
         margin-right: 0;
         margin-left: 5px;
 }
-#post-status-info {
+.post-status-info {
         padding: 0 7px 0 15px;
 }
 #comment-status-radio input {
@@ -270 +270 @@
 .wp_themeSkin tr.mceFirst td.mceToolbar {
         background-position: right top;
 }
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
+#poststuff .edButtonPreview,
+#poststuff .edButtonHTML {
         margin: 5px 0 0 5px;
         float: left;
 }
-#poststuff #edButtonHTML {
+#poststuff .edButtonHTML {
         margin-right: 0;
         margin-left: 15px;
 }
-#media-buttons a {
+.media-buttons a {
         padding: 0 10px 5px 0;
 }
 .submitbox .submit {

wp-admin/css/wp-admin.dev.css

@@ -32 +32 @@
 #pass-strength-result.short,
 .button-highlighted,
 input.button-highlighted,
-#quicktags #ed_strong,
+.quicktags #ed_strong,
 #ed_reply_toolbar #ed_reply_strong {
         font-weight: bold;
 }
@@ -494 +494 @@
         padding-top: 10px;
 }
 
-#content {
+.the-editor-html-content {
         margin: 0;
         width: 100%;
 }
 
-#editorcontainer #content {
+.editorcontainer .the-editor-html-content {
         padding: 6px;
         line-height: 150%;
         border: 0 none;
@@ -510 +510 @@
         box-sizing: border-box;
 }
 
-#editorcontainer,
-#quicktags {
+.editorcontainer,
+.quicktags {
         border-style: solid;
         border-width: 1px;
         border-collapse: separate;
@@ -524 +524 @@
         border-top-left-radius: 6px;
 }
 
-#quicktags {
+.quicktags {
         padding: 0;
         margin-bottom: -3px;
         border-bottom-width: 3px;
@@ -533 +533 @@
         background-repeat: repeat-x;
 }
 
-#quicktags #ed_toolbar {
+.quicktags #ed_toolbar {
         padding: 2px 4px 0;
 }
 
@@ -551 +551 @@
         margin: 1px 2px 1px 1px;
 }
 
-#quicktags #ed_link,
+.quicktags #ed_link,
 #ed_reply_toolbar #ed_reply_link {
         text-decoration: underline;
 }
 
-#quicktags #ed_del,
+.quicktags #ed_del,
 #ed_reply_toolbar #ed_reply_del {
         text-decoration: line-through;
 }
 
-#quicktags #ed_em,
+.quicktags #ed_em,
 #ed_reply_toolbar #ed_reply_em {
         font-style: italic;
 }
@@ -1524 +1524 @@
         width: 68%;
 }
 
-#post-status-info {
+.post-status-info {
+        line-height: 1.4em;
         border-width: 0 1px 1px;
         border-style: none solid solid;
         width: 100%;
@@ -1537 +1538 @@
         border-bottom-right-radius: 6px;
 }
 
-#post-status-info td {
+.post-status-info td {
         font-size: 11px;
 }
 
@@ -1546 +1547 @@
         text-align: right;
 }
 
-#editorcontent #post-status-info {
+#editorcontent .post-status-info {
         border: none;
 }
 
@@ -1842 +1843 @@
         right: 10px;
 }
 
-#poststuff #editor-toolbar {
+#poststuff .editor-toolbar {
         height: 30px;
 }
 
@@ -1851 +1852 @@
         border-style: none none solid;
 }
 
-#edButtonPreview,
-#edButtonHTML {
+.edButtonPreview,
+.edButtonHTML {
         height: 18px;
         margin: 5px 5px 0 0;
         padding: 4px 5px 2px;
@@ -1873 +1874 @@
         color: white;
 }
 
-#poststuff #edButtonHTML {
+#poststuff .edButtonHTML {
         margin-right: 15px;
 }
 
-#media-buttons {
+.media-buttons {
         cursor: default;
         padding: 8px 8px 0;
 }
 
-#media-buttons a {
+.media-buttons a {
         cursor: pointer;
         padding: 0 0 5px 10px;
 }
 
-#media-buttons img,
+.media-buttons img,
 #submitpost #ajax-loading {
         vertical-align: middle;
 }
@@ -2399 +2400 @@
         padding: 2px;
 }
 
-#replyrow #editorcontainer {
+#replyrow .editorcontainer {
         border: 0 none;
 }
 

wp-admin/edit-form-advanced.php

@@ -211 +211 @@
 
 <?php the_editor($post->post_content); ?>
 
-<table id="post-status-info" cellspacing="0"><tbody><tr>
+<table class="post-status-info" cellspacing="0"><tbody><tr>
         <td id="wp-word-count"></td>
         <td class="autosave-info">
         <span id="autosave">&nbsp;</span>

wp-admin/includes/dashboard.php

@@ -398 +398 @@
                 </div>
 
                 <?php if ( current_user_can( 'upload_files' ) ) : ?>
-                <div id="media-buttons" class="hide-if-no-js">
+                <div class="media-buttons hide-if-no-js">
                         <?php do_action( 'media_buttons' ); ?>
                 </div>
                 <?php endif; ?>

wp-admin/js/editor.dev.js

@@ -9 +9 @@
                 if ( typeof tinyMCE != 'object' ) {
                         $('#content').css('color', '#000');
                 } else {
-                        $('#quicktags').hide();
+                        $('.quicktags').hide();
                 }
         }
 });
@@ -83 +83 @@
                 id = id || 'content';
                 mode = mode || this.mode || '';
 
-                var ed, qt = this.I('quicktags'), H = this.I('edButtonHTML'), P = this.I('edButtonPreview'), ta = this.I(id);
+                var ed, qt = this.I('quicktags-' + id), H = this.I('edButtonHTML-' + id), P = this.I('edButtonPreview-' + id), ta = this.I(id);
 
                 try { ed = tinyMCE.get(id); }
                 catch(e) { ed = false; }
@@ -95 +95 @@
                         setUserSetting( 'editor', 'tinymce' );
                         this.mode = 'html';
 
-                        P.className = 'active';
-                        H.className = '';
+                        jQuery(P).addClass('active');
+                        jQuery(H).removeClass('active');
                         edCloseAllTags(); // :-(
                         qt.style.display = 'none';
 
@@ -115 +115 @@
                         setUserSetting( 'editor', 'html' );
                         ta.style.color = '#000';
                         this.mode = 'tinymce';
-                        H.className = 'active';
-                        P.className = '';
+                        jQuery(H).addClass('active');
+                        jQuery(P).removeClass('active');
 
                         if ( ed && !ed.isHidden() ) {
                                 ta.style.height = ed.getContentAreaContainer().offsetHeight + 24 + 'px';

wp-admin/press-this.php

@@ -557 +557 @@
                                 <li id="switcher">
                                         <?php wp_print_scripts( 'quicktags' ); ?>
                                         <?php add_filter('the_editor_content', 'wp_richedit_pre'); ?>
-                                        <a id="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
-                                        <a id="edButtonPreview" class="active" onclick="switchEditors.go('content', 'tinymce');"><?php _e('Visual'); ?></a>
+                                        <a id="edButtonHTML-content" class="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
+                                        <a id="edButtonPreview-content" class="edButtonPreview active" onclick="switchEditors.go('content', 'tinymce');"><?php _e('Visual'); ?></a>
                                         <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('content')" /></div>
                                 </li>
                                 <?php } ?>
                         </ul>
-                        <div id="quicktags"></div>
+                        <div class="quicktags"></div>
                         <div class="editor-container">
                                 <textarea name="content" id="content" style="width:100%;" class="theEditor" rows="15"><?php
                                         if ( $selection )

wp-includes/general-template.php

@@ -1797 +1797 @@
         $class = '';
 
         if ( $richedit || $media_buttons ) { ?>
-        <div id="editor-toolbar">
+        <div class="editor-toolbar">
 <?php
         if ( $richedit ) {
                 $wp_default_editor = wp_default_editor(); ?>
                 <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
 <?php   if ( 'html' == $wp_default_editor ) {
                         add_filter('the_editor_content', 'wp_htmledit_pre'); ?>
-                        <a id="edButtonHTML" class="active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
-                        <a id="edButtonPreview" class="hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
+                        <a id="edButtonHTML-<?php echo $id; ?>" class="edButtonHTML active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
+                        <a id="edButtonPreview-<?php echo $id; ?>" class="edButtonPreview hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
 <?php   } else {
                         $class = " class='theEditor'";
                         add_filter('the_editor_content', 'wp_richedit_pre'); ?>
-                        <a id="edButtonHTML" class="hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
-                        <a id="edButtonPreview" class="active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
+                        <a id="edButtonHTML-<?php echo $id; ?>" class="edButtonHTML hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
+                        <a id="edButtonPreview-<?php echo $id; ?>" class="edButtonPreview active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
 <?php   }
         }
 
         if ( $media_buttons ) { ?>
-                <div id="media-buttons" class="hide-if-no-js">
+                <div class="media-buttons hide-if-no-js">
 <?php   do_action( 'media_buttons' ); ?>
                 </div>
 <?php
@@ -1824 +1824 @@
 <?php
         }
 ?>
-        <div id="quicktags"><?php
+        <div id="quicktags-<?php echo $id; ?>" class="quicktags"><?php
         wp_print_scripts( 'quicktags' ); ?>
         <script type="text/javascript">edToolbar()</script>
         </div>
 
 <?php
-        $the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea rows='$rows'$class cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
+        $the_editor = apply_filters('the_editor', "<div class='editorcontainer'><textarea rows='$rows'$class cols='40' name='$id' tabindex='$tab_index' id='$id' class='the-editor-html-content'>%s</textarea></div>\n");
         $the_editor_content = apply_filters('the_editor_content', $content);
 
         printf($the_editor, $the_editor_content);

wp-includes/js/quicktags.dev.js

@@ -154 +154 @@
 
 function edShowButton(button, i) {
         if (button.id == 'ed_img') {
-                document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />');
+                document.write('<input type="button" accesskey="' + button.access + '" class="ed_button ' + button.id + '" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />');
         }
         else if (button.id == 'ed_link') {
-                document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />');
+                document.write('<input type="button" accesskey="' + button.access + '" class="ed_button ' + button.id + '" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />');
         }
         else {
-                document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />');
+                document.write('<input type="button" accesskey="' + button.access + '" class="ed_button ' + button.id + '" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />');
         }
 }
 
@@ -253 +253 @@
 }
 
 function edToolbar() {
-        document.write('<div id="ed_toolbar">');
+        document.write('<div class="ed_toolbar">');
         for (var i = 0; i < edButtons.length; i++) {
                 edShowButton(edButtons[i], i);
         }
-        document.write('<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
-        document.write('<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
+        document.write('<input type="button" class="ed_button ed_spell" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
+        document.write('<input type="button" class="ed_button ed_close" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
 //      edShowLinks(); // disabled by default
         document.write('</div>');
 }