Skip to content

Commit a0ea0aa

Browse files
azaozzazaozz
committed
Tweak colors for trash, spam and undo of comments, fix IE6/7 background for unapproved comments, fix JS error in IE6/7, props caesarsgrunt, see WordPress#4529
git-svn-id: https://develop.svn.wordpress.org/trunk@12291 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 365fea4 commit a0ea0aa

12 files changed

Lines changed: 42 additions & 29 deletions

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,9 +621,12 @@ tr.inactive + tr.plugin-update-tr .plugin-update {
621621
color: #557799;
622622
}
623623

624-
#the-comment-list .unapproved,
625-
#the-comment-list .unapproved th,
626-
#the-comment-list .unapproved td {
624+
#the-comment-list tr.undo,
625+
#the-comment-list div.undo {
626+
background-color: #f4f4f4;
627+
}
628+
629+
#the-comment-list .unapproved {
627630
background-color: #ffffe0;
628631
}
629632

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,9 +616,12 @@ tr.inactive + tr.plugin-update-tr .plugin-update {
616616
color: #557799;
617617
}
618618

619-
#the-comment-list .unapproved,
620-
#the-comment-list .unapproved th,
621-
#the-comment-list .unapproved td {
619+
#the-comment-list tr.undo,
620+
#the-comment-list div.undo {
621+
background-color: #f4f4f4;
622+
}
623+
624+
#the-comment-list .unapproved {
622625
background-color: #ffffe0;
623626
}
624627

‎wp-admin/css/ie.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,3 +425,9 @@ table.ie-fixed {
425425
* html .describe .field textarea {
426426
width: 440px;
427427
}
428+
429+
#the-comment-list .unapproved tr,
430+
#the-comment-list .unapproved td {
431+
background-color: #ffffe0;
432+
}
433+

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ setCommentsList = function() {
7171

7272
a.click(function(){
7373
list.wpList.del(this);
74-
$('#undo-' + id).css( {backgroundColor:'#6c6'} ).fadeOut(300, function(){
74+
$('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
7575
$(this).remove();
7676
$('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show() });
7777
});
@@ -189,21 +189,22 @@ setCommentsList = function() {
189189
else if ( N < 0 )
190190
dashboardTotals(1);
191191
} else {
192-
// XML response
192+
total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
193+
total = total - spam - trash;
194+
if ( total < 0 )
195+
total = 0;
196+
193197
if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
194198
pageLinks = settings.parsed.responses[0].supplemental.pageLinks || '';
195199
if ( $.trim( pageLinks ) )
196200
$('.tablenav-pages').find( '.page-numbers' ).remove().end().append( $( pageLinks ) );
197201
else
198202
$('.tablenav-pages').find( '.page-numbers' ).remove();
199-
}
200203

201-
total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
202-
total = total - spam - trash;
203-
if ( total < 0 )
204-
total = 0;
205-
206-
updateTotalCount( total, r, false );
204+
updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
205+
} else {
206+
updateTotalCount( total, r, false );
207+
}
207208
}
208209

209210
if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash ) {

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-includes/js/swfupload/handlers.dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function prepareMediaItemInit(fileObj) {
115115
jQuery('.filename .title', item).css('font-weight','normal');
116116
jQuery('a.undo', item).addClass('hidden');
117117
jQuery('a.describe-toggle-on, .menu_order_input', item).show();
118-
item.css( {backgroundColor:'#3c3'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 300, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('trash-undo');
118+
item.css( {backgroundColor:'#ceb'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 500, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('undo');
119119
}
120120
});
121121
return false;
@@ -154,7 +154,7 @@ function deleteSuccess(data, textStatus) {
154154
// Vanish it.
155155
jQuery('.toggle', item).toggle();
156156
jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
157-
item.css( {backgroundColor:'#f33'} ).animate( {backgroundColor:'#fff'}, {queue:false, duration:500} ).addClass('trash-undo');
157+
item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass('undo');
158158

159159
jQuery('.filename:empty', item).remove();
160160
jQuery('.filename .title', item).css('font-weight','bold');

‎wp-includes/js/swfupload/handlers.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-includes/js/wp-lists.dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ wpList = {
122122

123123
s.element = cls[2] || s.element || null;
124124
if ( cls[3] ) { s.delColor = '#' + cls[3]; }
125-
else { s.delColor = s.delColor || '#FF3333'; }
125+
else { s.delColor = s.delColor || '#faa'; }
126126

127127
if ( !s || !s.element ) { return false; }
128128

@@ -156,7 +156,7 @@ wpList = {
156156
s.success = function(r) {
157157
var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o;
158158
if ( !res || res.errors ) {
159-
element.stop().stop().css( 'backgroundColor', '#FF3333' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
159+
element.stop().stop().css( 'backgroundColor', '#faa' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
160160
return false;
161161
}
162162
if ( $.isFunction(s.delAfter) ) {

0 commit comments

Comments
 (0)