Make WordPress Core

Changeset 9720


Ignore:
Timestamp:
11/15/2008 06:57:53 PM (15 years ago)
Author:
azaozz
Message:

Update comments count for Pending and Spam on edit-comments.php and the dashboard, fixes #8227

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-comments.php

    r9656 r9720  
    121121//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
    122122$stati = array(
    123         'moderated' => __ngettext_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>'),
     123        'moderated' => __ngettext_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'),
    124124        'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used
    125         'spam' => __ngettext_noop('Spam <span class="count">(%s)</span>', 'Spam <span class="count">(%s)</span>')
     125        'spam' => __ngettext_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)')
    126126    );
    127127$class = ( '' === $comment_status ) ? ' class="current"' : '';
  • trunk/wp-admin/includes/dashboard.php

    r9717 r9720  
    237237    $num = number_format_i18n($num_comm['spam']);
    238238    if ( current_user_can( 'moderate_comments' ) )
    239         $num = "<a href='edit-comments.php?comment_status=spam'>$num</a>";
     239        $num = "<a href='edit-comments.php?comment_status=spam'><span class='spam-count'>$num</span></a>";
    240240    echo '<td class="b b-spam">'.$num.'</td>';
    241241    echo '<td class="last t spam">' . __ngettext( 'Spam', 'Spam', $num_comm['spam'] ) . '</td>';
     
    253253    $num = number_format_i18n($num_comm['awaiting_moderation']);
    254254    if ( current_user_can( 'moderate_comments' ) )
    255         $num = "<a href='edit-comments.php?comment_status=moderated'>$num</a>";
     255        $num = "<a href='edit-comments.php?comment_status=moderated'><span class='pending-count'>$num</span></a>";
    256256    echo '<td class="b b-waiting">'.$num.'</td>';
    257257    echo '<td class="last t waiting">' . __ngettext( 'Pending', 'Pending', $num_comm['awaiting_moderation'] ) . '</td>';
  • trunk/wp-admin/js/edit-comments.js

    r9695 r9720  
    1111            c.find('div.comment_status').html('1')
    1212
    13         $('li span.comment-count').each( function() {
     13        $('span.pending-count').each( function() {
    1414            var a = $(this);
    1515            var n = parseInt(a.html(),10);
     16            if ( isNaN(n) ) return;
    1617            n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
    1718            if ( n < 0 ) { n = 0; }
     
    1920            $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
    2021        });
    21         $('.post-com-count span.comment-count').each( function() {
     22    };
     23
     24    var delAfter = function( r, settings ) {
     25        $('span.pending-count').each( function() {
    2226            var a = $(this);
    2327            var n = parseInt(a.html(),10);
    24             var t = parseInt(a.parent().attr('title'), 10);
    25             if ( $('#' + settings.element).is('.unapproved') ) { // we unapproved a formerly approved comment
    26                 n = n - 1;
    27                 t = t + 1;
    28             } else { // we approved a formerly unapproved comment
    29                 n = n + 1;
    30                 t = t - 1;
    31             }
    32             if ( n < 0 ) { n = 0; }
    33             if ( t < 0 ) { t = 0; }
    34             if ( t >= 0 ) { a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) ); }
    35             if ( 0 === t ) { a.parents('strong:first').replaceWith( a.parents('strong:first').html() ); }
    36             a.html( n.toString() );
    37         });
    38     };
    39 
    40     var delAfter = function( r, settings ) {
    41         $('li span.comment-count').each( function() {
    42             var a = $(this);
    43             var n = parseInt(a.html(),10);
     28            if ( isNaN(n) ) return;
    4429            if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
    4530                n = n - 1;
     
    5136            $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
    5237        });
    53         $('.post-com-count span.comment-count').each( function() {
    54             var a = $(this);
    55             if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
    56                 var t = parseInt(a.parent().attr('title'), 10);
    57                 if ( t < 1 ) { return; }
    58                 t = t - 1;
    59                 a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) );
    60                 if ( 0 === t ) { a.parents('strong:first').replaceWith( a.parents('strong:first').html() ); }
    61                 return;
    62             }
    63             var n = parseInt(a.html(),10) - 1;
    64             a.html( n.toString() );
    65         });
    66         $('li span.spam-comment-count' ).each( function() {
     38
     39        $('span.spam-count' ).each( function() {
    6740            var a = $(this);
    6841            var n = parseInt(a.html(),10);
     42            if ( isNaN(n) ) return;
    6943            if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
    7044                n = n + 1;
  • trunk/wp-admin/menu.php

    r9614 r9720  
    5151    $submenu['page-new.php'][15] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
    5252
    53 $menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' );
     53$menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' );
    5454
    5555$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
  • trunk/wp-includes/script-loader.php

    r9712 r9720  
    157157            'strong' => __('Strong')
    158158        ) );
    159         $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081114' );
     159        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081115' );
    160160        $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
    161161            'pending' => __('%i% pending'), // must look like: "# blah blah"
Note: See TracChangeset for help on using the changeset viewer.