WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 #4529 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-11-29 10:29:12 +00:00
parent f296da8169
commit f33e161d18
12 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/colors-classic.css
View File

File diff suppressed because one or more lines are too long

9
wp-admin/css/colors-classic.dev.css
View File

@ -621,9 +621,12 @@ tr.inactive + tr.plugin-update-tr .plugin-update {
color: #557799; color: #557799;
} }
#the-comment-list .unapproved, #the-comment-list tr.undo,
#the-comment-list .unapproved th, #the-comment-list div.undo {
#the-comment-list .unapproved td { background-color: #f4f4f4;
}
#the-comment-list .unapproved {
background-color: #ffffe0; background-color: #ffffe0;
} }

2
wp-admin/css/colors-fresh.css
View File

File diff suppressed because one or more lines are too long

9
wp-admin/css/colors-fresh.dev.css
View File

@ -616,9 +616,12 @@ tr.inactive + tr.plugin-update-tr .plugin-update {
color: #557799; color: #557799;
} }
#the-comment-list .unapproved, #the-comment-list tr.undo,
#the-comment-list .unapproved th, #the-comment-list div.undo {
#the-comment-list .unapproved td { background-color: #f4f4f4;
}
#the-comment-list .unapproved {
background-color: #ffffe0; background-color: #ffffe0;
} }

6
wp-admin/css/ie.css
View File

@ -425,3 +425,9 @@ table.ie-fixed {
* html .describe .field textarea { * html .describe .field textarea {
width: 440px; width: 440px;
} }
#the-comment-list .unapproved tr,
#the-comment-list .unapproved td {
background-color: #ffffe0;
}

19
wp-admin/js/edit-comments.dev.js
View File

@ -71,7 +71,7 @@ setCommentsList = function() {
a.click(function(){ a.click(function(){
list.wpList.del(this); list.wpList.del(this);
$('#undo-' + id).css( {backgroundColor:'#6c6'} ).fadeOut(300, function(){ $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
$(this).remove(); $(this).remove();
$('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show() }); $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show() });
}); });
@ -189,21 +189,22 @@ setCommentsList = function() {
else if ( N < 0 ) else if ( N < 0 )
dashboardTotals(1); dashboardTotals(1);
} else { } else {
// XML response total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
total = total - spam - trash;
if ( total < 0 )
total = 0;
if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) { if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
pageLinks = settings.parsed.responses[0].supplemental.pageLinks || ''; pageLinks = settings.parsed.responses[0].supplemental.pageLinks || '';
if ( $.trim( pageLinks ) ) if ( $.trim( pageLinks ) )
$('.tablenav-pages').find( '.page-numbers' ).remove().end().append( $( pageLinks ) ); $('.tablenav-pages').find( '.page-numbers' ).remove().end().append( $( pageLinks ) );
else else
$('.tablenav-pages').find( '.page-numbers' ).remove(); $('.tablenav-pages').find( '.page-numbers' ).remove();
updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
} else {
updateTotalCount( total, r, false );
} }
total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
total = total - spam - trash;
if ( total < 0 )
total = 0;
updateTotalCount( total, r, false );
} }
if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash ) { if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash ) {

2
wp-admin/js/edit-comments.js
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/swfupload/handlers.dev.js
View File

@ -115,7 +115,7 @@ function prepareMediaItemInit(fileObj) {
jQuery('.filename .title', item).css('font-weight','normal'); jQuery('.filename .title', item).css('font-weight','normal');
jQuery('a.undo', item).addClass('hidden'); jQuery('a.undo', item).addClass('hidden');
jQuery('a.describe-toggle-on, .menu_order_input', item).show(); jQuery('a.describe-toggle-on, .menu_order_input', item).show();
item.css( {backgroundColor:'#3c3'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 300, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('trash-undo'); item.css( {backgroundColor:'#ceb'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 500, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('undo');
} }
}); });
return false; return false;
@ -154,7 +154,7 @@ function deleteSuccess(data, textStatus) {
// Vanish it. // Vanish it.
jQuery('.toggle', item).toggle(); jQuery('.toggle', item).toggle();
jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden'); jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
item.css( {backgroundColor:'#f33'} ).animate( {backgroundColor:'#fff'}, {queue:false, duration:500} ).addClass('trash-undo'); item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass('undo');
jQuery('.filename:empty', item).remove(); jQuery('.filename:empty', item).remove();
jQuery('.filename .title', item).css('font-weight','bold'); jQuery('.filename .title', item).css('font-weight','bold');

2
wp-includes/js/swfupload/handlers.js
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/wp-lists.dev.js
View File

@ -122,7 +122,7 @@ wpList = {
s.element = cls[2] || s.element || null; s.element = cls[2] || s.element || null;
if ( cls[3] ) { s.delColor = '#' + cls[3]; } if ( cls[3] ) { s.delColor = '#' + cls[3]; }
else { s.delColor = s.delColor || '#FF3333'; } else { s.delColor = s.delColor || '#faa'; }
if ( !s || !s.element ) { return false; } if ( !s || !s.element ) { return false; }
@ -156,7 +156,7 @@ wpList = {
s.success = function(r) { s.success = function(r) {
var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o; var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o;
if ( !res || res.errors ) { if ( !res || res.errors ) {
element.stop().stop().css( 'backgroundColor', '#FF3333' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } ); element.stop().stop().css( 'backgroundColor', '#faa' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
return false; return false;
} }
if ( $.isFunction(s.delAfter) ) { if ( $.isFunction(s.delAfter) ) {

2
wp-includes/js/wp-lists.js
View File

File diff suppressed because one or more lines are too long

10
wp-includes/script-loader.php
View File

@ -102,7 +102,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20091012' ); $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20091012' );
$scripts->add_data( 'autosave', 'group', 1 ); $scripts->add_data( 'autosave', 'group', 1 );
$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20091017' ); $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20091128' );
$scripts->add_data( 'wp-lists', 'group', 1 ); $scripts->add_data( 'wp-lists', 'group', 1 );
$scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.0'); $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.0');
@ -193,7 +193,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201'); $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201');
} }
$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20091127'); $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20091128');
$max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post; $max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post;
if ( empty($max_upload_size) ) if ( empty($max_upload_size) )
$max_upload_size = __('not configured'); $max_upload_size = __('not configured');
@ -263,7 +263,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20090514' ); $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20090514' );
$scripts->add_data( 'user-profile', 'group', 1 ); $scripts->add_data( 'user-profile', 'group', 1 );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20091127' ); $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20091128' );
$scripts->add_data( 'admin-comments', 'group', 1 ); $scripts->add_data( 'admin-comments', 'group', 1 );
$scripts->localize( 'admin-comments', 'adminCommentsL10n', array( $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
@ -425,12 +425,12 @@ function wp_default_styles( &$styles ) {
$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
// all colors stylesheets need to have the same query strings (cache manifest compat) // all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20091127'; $colors_version = '20091128';
$styles->add( 'wp-admin', "/wp-admin/wp-admin$suffix.css", array(), '20091126' ); $styles->add( 'wp-admin', "/wp-admin/wp-admin$suffix.css", array(), '20091126' );
$styles->add_data( 'wp-admin', 'rtl', "/wp-admin/rtl$suffix.css" ); $styles->add_data( 'wp-admin', 'rtl', "/wp-admin/rtl$suffix.css" );
$styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090922' ); $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20091128' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.