Ticket #4529: 4529-tweaks-alt.diff

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

@@ -114 +114 @@
                                 jQuery('.filename .trashnotice', item).remove();
                                 jQuery('a.undo', item).addClass('hidden');
                                 jQuery('a.describe-toggle-on, .menu_order_input', item).show();
-                                item.animate( {backgroundColor: '#fff'}, { queue: false, duration: 200, complete: function(){ jQuery(this).css({backgroundColor:''}); } });
+                                item.animate( {backgroundColor: '#fff'}, { queue: false, duration: 200, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('trash-undo');
                         }
                 });
                 return false;
@@ -153 +153 @@
         // Vanish it.
         jQuery('.toggle', item).toggle();
         jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
-        item.css( {backgroundColor:'#fff'} ).animate( {backgroundColor:'#ffc0c0'}, {queue:false, duration:500} );
+        item.css( {backgroundColor:'#fff'} ).animate( {backgroundColor:'#ffc0c0'}, {queue:false, duration:500} ).addClass('trash-undo');
 
         jQuery('.filename:empty', item).remove();
         jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
         jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
         jQuery('.menu_order_input', item).hide();
-
+        
         return;
 }
 

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

@@ -49 +49 @@
 
                         if ( el.is('tr') ) {
                                 n = el.children(':visible').length;
-                                author = $('.author strong', el).html();
-                                h = $('<tr id="trashundo-' + id + '" style="display:none;"><td class="trash-undo" colspan="' + n + '">' + note + '</td></tr>');
+                                author = $('.author strong', el).text();
+                                h = $('<tr id="trashundo-' + id + '" class="trash-undo" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
                         } else {
-                                author = $('.comment-author', el).html();
+                                author = $('.comment-author', el).text();
                                 h = $('<div id="trashundo-' + id + '" style="display:none;" class="trash-undo">' + note + '</div>');
                         }
 
                         el.before(h);
 
-                        $('strong', '#trashundo-' + id).html(author + ' ');
+                        $('strong', '#trashundo-' + id).text(author + ' ');
                         a = $('a.undo-trash', '#trashundo-' + id);
                         a.attr('href', 'comment.php?action=untrashcomment&c=' + id + '&_ajax_nonce=' + settings.data._ajax_nonce);
                         a.attr('className', 'delete:the-comment-list:comment-' + id + '::untrash=1 vim-z vim-destructive');
+                        $('.avatar', el).clone().prependTo('#trashundo-' + id + ' .trash-undo-inside');
 
                         a.click(function(){
                                 list.wpList.del(this);
@@ -71 +72 @@
                                 });
                                 return false;
                         });
-
-                        if ( to )
-                                window.clearTimeout(to);
-
-                        to = window.setTimeout( function(){
-                                $('#trashundo-' + id).fadeOut('slow', function(){ $(this).remove(); });
-                        }, 7000 );
                 }
 
                 return settings;

wp-admin/wp-admin.dev.css

@@ -3520 +3520 @@
         border-top-style: solid;
         border-top-width: 1px;
         margin: 0 -10px;
-        padding: 3px;
+        padding: 3px 8px;
+        font-size: 11px;
 }
 
 .trash-undo-inside {
-        margin: 3px 8px;
+        margin: 3px 8px 3px 0;
+        line-height: 16px;
 }
+.trash-undo-inside .avatar {
+        height: 16px;
+        width: 16px;
+        margin-right: 8px;
+        vertical-align: middle;
+}
 
 /* tag hints */
 .taghint {

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

@@ -1686 +1686 @@
 }
 
 .trash-undo {
-        background-color: #ebffe0;
+        background-color: #ffc0c0;
 }
 
 #dashboard_recent_comments .trash-undo {

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

@@ -1675 +1675 @@
 }
 
 .trash-undo {
-        background-color: #ebffe0;
+        background-color: #ffc0c0;
 }
 
 #dashboard_recent_comments .trash-undo {