Ticket #18348: 18348.patch

wp-admin/includes/template.php

@@ -344 +344 @@
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
-        <div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
+        <div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div>
 
         <div id="edithead" style="display:none;">
+                <h5><?php _e( 'Quick Edit' ); ?></h5>
                 <div class="inside">
                 <label for="author"><?php _e('Name') ?></label>
                 <input type="text" name="newcomment_author" size="50" value="" tabindex="101" id="author" />
@@ -364 +365 @@
                 <div style="clear:both;"></div>
         </div>
 
-        <div id="replycontainer"><textarea rows="8" cols="40" name="replycontent" tabindex="104" id="replycontent"></textarea></div>
+        <div id="replycontainer">
+        <?php
+        $quicktags_settings = array( 'quicktags_buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+        wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+        ?>
+        </div>
 
         <p id="replysubmit" class="submit">
         <a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a>

wp-admin/js/edit-comments.dev.js

@@ -366 +366 @@
                         $('.error', '#replysubmit').html('').hide();
                         $('.waiting', '#replysubmit').hide();
 
-                        if ( $.browser.msie )
-                                $('#replycontainer, #replycontent').css('height', '120px');
-                        else
-                                $('#replycontainer').resizable('destroy').css('height', '120px');
-
                         this.cid = '';
                 }
         },
@@ -398 +393 @@
                         $('#edithead, #savebtn', editRow).show();
                         $('#replyhead, #replybtn', editRow).hide();
 
-                        h = c.height();
-                        if ( h > 220 )
-                                if ( $.browser.msie )
-                                        $('#replycontainer, #replycontent', editRow).height(h-105);
-                                else
-                                        $('#replycontainer', editRow).height(h-105);
-
                         c.after( editRow ).fadeOut('fast', function(){
                                 $('#replyrow').fadeIn(300, function(){ $(this).show() });
                         });
@@ -548 +536 @@
         commentReply.init();
         $(document).delegate('span.delete a.delete', 'click', function(){return false;});
 
-        if ( typeof QTags != 'undefined' )
-                quicktags({id: 'replycontent', buttons: 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close'});
 
         if ( typeof $.table_hotkeys != 'undefined' ) {
                 make_hotkeys_redirect = function(which) {

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

@@ -60 +60 @@
 #your-profile fieldset,
 #rightnow,
 div.dashboard-widget,
-#dashboard-widgets p.dashboard-widget-links,
-#replyrow #ed_reply_toolbar input {
+#dashboard-widgets p.dashboard-widget-links {
         border-color: #ccc;
 }
 
@@ -1259 +1258 @@
         color: #000;
 }
 
-#replysubmit {
-        background-color: #f1f1f1;
-        border-top-color: #ddd;
-}
-
 #replyerror {
         border-color: #ddd;
         background-color: #f9f9f9;
 }
 
-#edithead,
-#replyhead {
-        background-color: #f1f1f1;
-}
-
-#ed_reply_toolbar {
-        background-color: #e9e9e9;
-}
-
 /* table vim shortcuts */
 .vim-current,
 .vim-current th,
@@ -1325 +1310 @@
 /* inline editor */
 .inline-edit-row fieldset input[type="text"],
 .inline-edit-row fieldset textarea,
-#bulk-titles,
-#replyrow input {
+#bulk-titles {
         border-color: #ddd;
 }
 
@@ -1348 +1332 @@
         background-color: #f1f1f1;
 }
 
-#replyrow #ed_reply_toolbar input:hover {
-        border-color: #aaa;
-        background: #ddd;
-}
-
 fieldset.inline-edit-col-right .inline-edit-col {
         border-color: #dfdfdf;
 }

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

@@ -3590 +3590 @@
 }
 
 /* reply to comments */
-#replyrow {
-        font-size: 11px;
-}
-
 #replyrow input {
         border-width: 1px;
         border-style: solid;
@@ -3603 +3599 @@
         padding: 2px;
 }
 
-#replyrow .wp-editor-container {
-        border: 0 none;
-}
-
 #replysubmit {
         margin: 0;
         padding: 3px 7px;
-        text-align:center;
+        text-align: center;
 }
 
 #replysubmit img.waiting,
@@ -3625 +3617 @@
 }
 
 #replysubmit .error {
-        color:red;
-        line-height:21px;
-        text-align:center;
-        vertical-align:center;
+        color: red;
+        line-height: 21px;
+        text-align: center;
+        vertical-align: center;
 }
 
-#replyrow #editor-toolbar {
-        display: none;
+#replyrow h5 {
+        margin: .2em 0;
+        padding: 0 5px;
+        line-height: 23px;
+        text-transform: uppercase;
+        font-size: 1em;
 }
 
-#replyhead {
-        font-size: 12px;
-        font-weight: bold;
-        padding: 2px 10px 4px;
-}
-
 #edithead .inside {
         float: left;
         padding: 3px 0 2px 5px;
         margin: 0;
         text-align: center;
-        font-size: 11px;
 }
 
 #edithead .inside input {
         width: 180px;
-        font-size: 11px;
 }
 
 #edithead label {
@@ -3660 +3648 @@
 
 #replycontainer {
         padding: 5px;
-        border: 0 none;
-        height: 120px;
-        overflow: hidden;
-        position: relative;
 }
 
 #replycontent {
-        resize: none;
-        margin: 0;
-        width: 100%;
-        height: 100%;
-        padding: 0;
-        line-height: 150%;
-        border: 0 none;
-        outline: none;
-        font-size: 12px;
+        border: none;
+        height: 150px;
 }
 
-#replyrow #ed_reply_toolbar {
-        margin: 0;
-        padding: 2px 3px;
-}
-
 .comment-ays {
         margin-bottom: 0;
         border-style: solid;