Changeset 8767

Timestamp:

08/29/2008 05:07:40 AM (18 years ago)

Author:

azaozz

Message:

Reply to comments from admin, small improvements and fixes, see #7435

Location:

trunk

Files:

• wp-admin/css/colors-classic.css (modified) (1 diff)
• wp-admin/css/colors-fresh.css (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/edit-comments.js (modified) (6 diffs)
• wp-admin/upload.php (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -781 +781 @@
         border-bottom-color: #14568A;
 }
+
+#replydiv {
+        border-color: #EBEBEB #CCC #CCC #EBEBEB;
+        background-color: #fff;
+}
+
+#replysubmit {
+        background-color: #EAF3FA;
+        border-top-color: #ddd;
+}
+
+#replyerror {
+        border-color: #ddd;
+        background-color: #f8f8f8;
+}

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

@@ -764 +764 @@
         border-bottom-color: #E4F2FD;
 }
+
+#replydiv {
+        border-color: #EBEBEB #CCC #CCC #EBEBEB;
+        background-color: #fff;
+}
+
+#replysubmit {
+        background-color: #EAF3FA;
+        border-top-color: #ddd;
+}
+
+#replyerror {
+        border-color: #ddd;
+        background-color: #f8f8f8;
+}

trunk/wp-admin/edit-comments.php

@@ -13 +13 @@
 wp_enqueue_script( 'admin-comments' );
 wp_enqueue_script( 'admin-forms' );
-wp_enqueue_script( 'quicktags' );
 
 if ( !empty( $_REQUEST['delete_comments'] ) && isset($_REQUEST['action']) ) {

trunk/wp-admin/edit-form-advanced.php

@@ -334 +334 @@
 ?>
 <p>
-        <input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label>
+        <label for="post_status_private2" class="selectit"><input id="post_status_private2" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label>
 </p>
 <h4><?php _e( 'Post Password' ); ?></h4>

trunk/wp-admin/edit-page-form.php

@@ -300 +300 @@
 </p>
 <?php if ( current_user_can( 'publish_posts' ) ) : ?> 
-<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
+<p><label for="post_status_private2" class="selectit"><input id="post_status_private2" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
 <?php endif; ?>
 

trunk/wp-admin/edit.php

@@ -54 +54 @@
 list($post_stati, $avail_post_stati) = wp_edit_posts_query();
 
-if ( 1 == count($posts) && is_singular() ) {
+if ( 1 == count($posts) && is_singular() )
         wp_enqueue_script( 'admin-comments' );
-        wp_enqueue_script( 'quicktags' );
-}
 
 require_once('admin-header.php');

trunk/wp-admin/includes/template.php

@@ -1082 +1082 @@
         <h3 class="info-box-title"><?php _e('Comment Reply Error'); ?></h3>
         <p id="replyerrtext"></p>
-        <p class="submit"><button id="close-button" onclick="commentReply.close();" class="button"><?php _e('Close'); ?></button></p>
+        <p class="submit"><button id="close-button" onclick="commentReply.close();" class="button"><?php _e('Close'); ?></button>
+        <button id="back-button" onclick="commentReply.back();" class="button"><?php _e('Go back'); ?></button></p>
         </div>
         
@@ -1098 +1099 @@
         <?php wp_comment_form_unfiltered_html_nonce(); ?>
 
-        <div id="replycontainer"><textarea rows="5" cols="50" name="replycontent" tabindex="10" id="replycontent"></textarea></div>
+        <?php echo apply_filters( 'wp_comment_reply_content', '
+        <div id="replycontainer"><textarea rows="5" cols="40" name="replycontent" tabindex="10" id="replycontent"></textarea></div>
+        '); ?>
 
         <p id="replysubmit"><input type="button" onclick="commentReply.close();" class="button" value="<?php _e('Cancel'); ?>" />

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

@@ -1 +1 @@
 var theList; var theExtraList;
-jQuery(function($) {
-
-var dimAfter = function( r, settings ) {
-        $('li span.comment-count').each( function() {
-                var a = $(this);
-                var n = parseInt(a.html(),10);
-                n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
-                if ( n < 0 ) { n = 0; }
-                a.html( n.toString() );
-                $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-        });
-        $('.post-com-count span.comment-count').each( function() {
-                var a = $(this);
-                var n = parseInt(a.html(),10);
-                var t = parseInt(a.parent().attr('title'), 10);
-                if ( $('#' + settings.element).is('.unapproved') ) { // we unapproved a formerly approved comment
-                        n = n - 1;
-                        t = t + 1;
-                } else { // we approved a formerly unapproved comment
-                        n = n + 1;
-                        t = t - 1;
-                }
-                if ( n < 0 ) { n = 0; }
-                if ( t < 0 ) { t = 0; }
-                if ( t >= 0 ) { a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) ); }
-                if ( 0 === t ) { a.parents('strong:first').replaceWith( a.parents('strong:first').html() ); }
-                a.html( n.toString() );
-        });
-}
-
-var delAfter = function( r, settings ) {
-        $('li span.comment-count').each( function() {
-                var a = $(this);
-                var n = parseInt(a.html(),10);
-                if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
-                        n = n - 1;
-                } else if ( $(settings.target).parents( 'span.unapprove' ).size() ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
-                        n = n + 1;
-                }
-                if ( n < 0 ) { n = 0; }
-                a.html( n.toString() );
-                $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-        });
-        $('.post-com-count span.comment-count').each( function() {
-                var a = $(this);
-                if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
+(function($) {
+
+setCommentsList = function() {
+        var dimAfter = function( r, settings ) {
+                $('li span.comment-count').each( function() {
+                        var a = $(this);
+                        var n = parseInt(a.html(),10);
+                        n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
+                        if ( n < 0 ) { n = 0; }
+                        a.html( n.toString() );
+                        $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+                });
+                $('.post-com-count span.comment-count').each( function() {
+                        var a = $(this);
+                        var n = parseInt(a.html(),10);
                         var t = parseInt(a.parent().attr('title'), 10);
-                        if ( t < 1 ) { return; }
-                        t = t - 1;
-                        a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) );
+                        if ( $('#' + settings.element).is('.unapproved') ) { // we unapproved a formerly approved comment
+                                n = n - 1;
+                                t = t + 1;
+                        } else { // we approved a formerly unapproved comment
+                                n = n + 1;
+                                t = t - 1;
+                        }
+                        if ( n < 0 ) { n = 0; }
+                        if ( t < 0 ) { t = 0; }
+                        if ( t >= 0 ) { a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) ); }
                         if ( 0 === t ) { a.parents('strong:first').replaceWith( a.parents('strong:first').html() ); }
+                        a.html( n.toString() );
+                });
+        };
+        
+        var delAfter = function( r, settings ) {
+                $('li span.comment-count').each( function() {
+                        var a = $(this);
+                        var n = parseInt(a.html(),10);
+                        if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
+                                n = n - 1;
+                        } else if ( $(settings.target).parents( 'span.unapprove' ).size() ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
+                                n = n + 1;
+                        }
+                        if ( n < 0 ) { n = 0; }
+                        a.html( n.toString() );
+                        $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+                });
+                $('.post-com-count span.comment-count').each( function() {
+                        var a = $(this);
+                        if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
+                                var t = parseInt(a.parent().attr('title'), 10);
+                                if ( t < 1 ) { return; }
+                                t = t - 1;
+                                a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) );
+                                if ( 0 === t ) { a.parents('strong:first').replaceWith( a.parents('strong:first').html() ); }
+                                return;
+                        }
+                        var n = parseInt(a.html(),10) - 1;
+                        a.html( n.toString() );
+                });
+                $('li span.spam-comment-count' ).each( function() {
+                        var a = $(this);
+                        var n = parseInt(a.html(),10);
+                        if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
+                                n = n + 1;
+                        } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
+                                n = n - 1;
+                        }
+                        if ( n < 0 ) { n = 0; }
+                        a.html( n.toString() );
+                });
+        
+                if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
                         return;
                 }
-                var n = parseInt(a.html(),10) - 1;
-                a.html( n.toString() );
-        });
-        $('li span.spam-comment-count' ).each( function() {
-                var a = $(this);
-                var n = parseInt(a.html(),10);
-                if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
-                        n = n + 1;
-                } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
-                        n = n - 1;
-                }
-                if ( n < 0 ) { n = 0; }
-                a.html( n.toString() );
-        });
-
-        if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
-                return;
-        }
-
-        theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
-        $('#get-extra-comments').submit();
-}
-
-theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
-theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
-
+        
+                theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
+                $('#get-extra-comments').submit();
+        };
+
+        theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
+        theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
+};
+
+$(document).ready(function(){
+        setCommentsList();
 });
+
+})(jQuery);
 
 (function($){
@@ -93 +99 @@
                 }
 
-                $('#replydiv').show();
                 $('#replydiv #comment_post_ID').val(p);
                 $('#replydiv #comment_ID').val(c);
@@ -100 +105 @@
                         handle : '#replyhandle',
                         containment : '#wpwrap'
-                });
-
-                $('#replydiv').resizable({
+                }).resizable({
                         handles : 'se',
                         minHeight : 200,
@@ -128 +131 @@
                         'top' : top,
                         'left' : left
-                });
+                }).show();
 
                 $('#replycontent').focus().keyup(function(e){
@@ -196 +199 @@
                         .animate( { backgroundColor:"#CFEBF7" }, 600 )
                         .animate( { backgroundColor:"transparent" }, 600 );
+                
+                setCommentsList();
         },
 
@@ -218 +223 @@
                         });
                 }
+        },
+        
+        back : function() {
+                if ( $('#replydiv').is(':hidden') && $('#replyerror').is(':visible') ) {
+                        $('#replyerror').hide();
+                        $('#replydiv').show();
+                }
         }
-}
+};
 
 $(document).ready(function(){

trunk/wp-admin/upload.php

@@ -11 +11 @@
 add_thickbox();
 wp_enqueue_script( 'media-upload' );
-wp_enqueue_script( 'quicktags' );
 
 if (!current_user_can('upload_files'))

trunk/wp-admin/wp-admin.css

@@ -1918 +1918 @@
 #replydiv {
         width: 700px;
-        border-color: #EBEBEB #CCC #CCC #EBEBEB;
         border-width: 1px;
         border-style: solid;
         padding: 2px;
-        background-color: #fff;
         left: 20px;
-        top: 300px;
+        top: 200px;
+        z-index: 100;
 }
 
@@ -1934 +1933 @@
         margin: 0;
         padding: 3px 5px;
-        background-color: #EAF3FA;
-        border-top: 1px solid #ddd;
+        border-top-width: 1px;
+        border-top-style: solid;
+}
+
+#replysubmit .button,
+#replyerror .button {
+        margin-right: 5px;
 }
 
@@ -1974 +1978 @@
 
 #replyerror {
-        border: 5px solid #ddd;
-        background-color: #f8f8f8;
+        border-width: 5px;
+        border-style: solid;
         position: absolute;
         padding: 15px 15px 10px;
@@ -2029 +2033 @@
 
 #edit-settings {
-        padding: 28px 0 0;
+        padding: 29px 0 0;
         margin: 0 0 20px;
 }
@@ -2042 +2046 @@
         -moz-border-radius: 4px 0 4px 4px;
         -khtml-border-radius: 4px;
+        -khtml-border-top-right-radius: 0;
         -webkit-border-radius: 4px;
-        border-radius: 4px 0 4px 4px;
+        -webkit-border-top-right-radius: 0;
+        border-radius: 4px;
+        border-top-right-radius: 0;
         border-width: 1px;
         border-style: solid;
 }
 
-.show-settings-opened {
+#show-settings.show-settings-opened {
         -moz-border-radius: 4px 4px 0 0;
-        -khtml-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px 4px 0 0;
+        -webkit-border-bottom-left-radius: 0;
+        -webkit-border-bottom-right-radius: 0;
+        -khtml-border-bottom-left-radius: 0;
+        -khtml-border-bottom-right-radius: 0;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
 }
 

trunk/wp-includes/script-loader.php

@@ -125 +125 @@
                         'strong' => __('Strong')
                 ) );
-                $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-draggable', 'jquery-ui-resizable'), '20080821' );
+                $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-draggable', 'jquery-ui-resizable', 'quicktags'), '20080828' );
                 $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
                         'pending' => __('%i% pending') // must look like: "# blah blah"