Ticket #38026: 38026.patch

src/wp-includes/css/media-views.css

@@ -1685 +1685 @@
         display: block;
 }
 
-.media-modal .delete-attachment,
-.media-modal .trash-attachment,
 .media-modal .untrash-attachment {
         display: inline;
         padding: 0;
+        color: #0073aa;
+}
+
+.media-modal .untrash-attachment:focus {
+        color: #124964;
+}
+
+.media-modal .untrash-attachment:hover,
+.media-modal .untrash-attachment:active {
+        color: #00a0d2;
+}
+
+.media-modal .delete-attachment,
+.media-modal .trash-attachment {
+        display: inline;
+        padding: 0;
         color: #bc0b0b;
 }
 
@@ -1696 +1710 @@
 .media-modal .delete-attachment:hover,
 .media-modal .delete-attachment:focus,
 .media-modal .trash-attachment:hover,
-.media-modal .trash-attachment:focus,
-.media-modal .untrash-attachment:hover,
-.media-modal .untrash-attachment:focus {
+.media-modal .trash-attachment:focus {
         color: red;
 }
 

src/wp-includes/media-template.php

@@ -428 +428 @@
                                 <# if ( ! data.uploading && data.can.remove ) { #> |
                                         <?php if ( MEDIA_TRASH ): ?>
                                                 <# if ( 'trash' === data.status ) { #>
-                                                        <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
+                                                        <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button> |
+                                                        <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
                                                 <# } else { #>
                                                         <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
                                                 <# } #>
@@ -529 +530 @@
                                 <# if ( ! data.uploading && data.can.remove ) { #>
                                         <?php if ( MEDIA_TRASH ): ?>
                                         <# if ( 'trash' === data.status ) { #>
-                                                <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
+                                                <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button> |
+                                                <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
                                         <# } else { #>
                                                 <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
                                         <# } #>