Ticket #29056: 29056.diff

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

@@ -27 +27 @@
 
 .media-frame a {
         border-bottom: none;
+        text-decoration: none;
         color: #21759b;
 }
 
-.media-frame a:hover {
-        color: #d54e21;
-}
-
 .media-frame a.button {
         color: #333;
 }
@@ -140 +137 @@
 
 .media-modal-close {
         position: absolute;
-        text-decoration: none;
         top: 0;
         right: 0;
         width: 50px;
@@ -445 +441 @@
         line-height: 18px;
         font-size: 14px;
         color: #0074a2;
-        text-decoration: none;
 }
 
 .media-menu > a:hover {
@@ -497 +492 @@
         height: 18px;
         line-height: 18px;
         font-size: 14px;
-        text-decoration: none;
 }
 
 .media-router > a:last-child {
@@ -848 +842 @@
         font-size: 20px;
         line-height: 20px;
         text-align: center;
-        text-decoration: none;
         color: #464646;
         background-color: #fff;
         background-position: -96px 4px;
@@ -1120 +1113 @@
         display: block;
 }
 
-.media-uploader-status .upload-dismiss-errors {
-        text-decoration: none;
-}
-
 .media-sidebar .media-uploader-status .upload-dismiss-errors {
         position: absolute;
         top: 0;
@@ -1321 +1310 @@
         padding: 1px 8px;
         margin: 1px 8px 1px -8px;
         line-height: 16px;
-        text-decoration: none;
         border-right: 1px solid #dfdfdf;
         color: #21759B;
 }
@@ -1364 +1352 @@
         padding: 0;
         margin: 0;
         -webkit-box-shadow: none;
-        box-shadow: none; 
+        box-shadow: none;
 }
 
 .media-selection .attachment .thumbnail {
@@ -1574 +1562 @@
 
 .attachment-info .advanced-toggle {
         color: #666;
-        text-decoration: none;
         display: block;
 }
 .attachment-info .advanced-toggle:hover {
@@ -1600 +1587 @@
 .attachment-info .delete-attachment,
 .attachment-info .trash-attachment {
         display: block;
-        text-decoration: none;
         white-space: nowrap;
 }
-
+.edit-attachment-frame .attachment-info .delete-attachment {
+        display: inline;
+}
 .attachment-info .refresh-attachment,
 .attachment-details.needs-refresh .attachment-info .edit-attachment {
         display: none;
@@ -1844 +1832 @@
 
 .image-details .advanced-toggle {
         color: #666;
-        text-decoration: none;
         display: block;
 }
 
@@ -1998 +1985 @@
         left: 440px;
 }
 
-.advanced-section,
-.link-settings {
-        margin-top: 10px;
-}
-
 /* Drag & drop on the editor upload */
 #wp-fullscreen-body .uploader-editor,
 .wp-editor-wrap .uploader-editor {
@@ -2754 +2736 @@
 }
 .edit-attachment-frame .attachment-media-view {
         float: left;
+        position: relative;
         width: 65%;
         height: 100%;
 }
@@ -2774 +2757 @@
         max-height: calc( 100% - 42px ); /* leave space for actions underneath */
 }
 
-.edit-attachment-frame .delete-attachment {
-        float: right;
-        margin-top: 7px;
-}
-
 .edit-attachment-frame .wp-media-wrapper {
         margin-bottom: 12px;
 }
@@ -2799 +2777 @@
         background: #f3f3f3;
 }
 
+.edit-attachment-frame .attachment-media-view .attachment-actions {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        padding: 12px 16px;
+}
+.edit-attachment-frame .attachment-info .attachment-actions {
+        visibility: visible;
+}
+
 .edit-attachment-frame input,
 .edit-attachment-frame textarea {
         padding: 6px 8px;
         line-height: 16px;
 }
 
-.edit-attachment-frame .attachment-info .details,
-.edit-attachment-frame .attachment-info .settings {
+.edit-attachment-frame .attachment-info-section {
         overflow: hidden;
         float: none;
         position: relative;
@@ -2815 +2803 @@
         border-bottom: 1px solid #ddd;
 }
 
+.edit-attachment-frame .attachment-info-section:last-child {
+        margin-bottom: 0;
+        border-bottom: none;
+}
+
 .edit-attachment-frame .attachment-info .setting {
         display: block;
         float: left;

src/wp-includes/js/media-grid.js

@@ -349 +349 @@
          */
         media.view.MediaFrame.EditAttachments = media.view.MediaFrame.extend({
 
-                className: 'edit-attachment-frame',
+                className: 'edit-attachment-frame media-frame',
                 template: media.template( 'edit-attachment-frame' ),
                 regions:   [ 'title', 'content' ],
 

src/wp-includes/media-template.php

@@ -289 +289 @@
                                         </video>
                                 </div>
                                 <# } #>
-
                                 <div class="attachment-actions">
                                         <# if ( 'image' === data.type && ! data.uploading ) { #>
                                                 <a class="button edit-attachment" href="#"><?php _e( 'Edit Image' ); ?></a>
                                         <# } #>
-
-                                        <# if ( ! data.uploading && data.can.remove ) { #>
-                                                <?php if ( MEDIA_TRASH ): ?>
-                                                        <a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
-                                                <?php else: ?>
-                                                        <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
-                                                <?php endif; ?>
-                                        <# } #>
                                 </div>
                         </div>
                 </div>
@@ -310 +301 @@
                                 <span class="spinner"></span>
                                 <span class="saved"><?php esc_html_e('Saved.'); ?></span>
                         </span>
-                        <div class="details">
+                        <div class="attachment-info-section details">
                                 <h3><?php _e('Attachment Details'); ?></h3>
                                 <div class="filename setting">
                                         <span class="name"><?php _e( 'File name' ); ?></span> <span class="value">{{ data.filename }}</span>
@@ -355 +346 @@
                                 </div>
                         </div>
 
-                        <div class="settings advanced-section">
+                        <div class="attachment-info-section advanced-section">
                                 <h3><a class="advanced-toggle" href="#"><?php _e( 'Attachment Meta' ); ?></a></h3>
                                 <div class="advanced-settings hidden">
                                         <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
@@ -405 +396 @@
                                         <div class="attachment-compat"></div>
                                 </div>
                         </div>
-
-                        <a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a> |
-                        <a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a>
-
+                        <div class="attachment-info-section attachment-actions row-actions">
+                                <a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a> |
+                                <# if ( ! data.uploading && data.can.remove ) { #>
+                                        <?php if ( MEDIA_TRASH ): ?>
+                                                <a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a> |
+                                        <?php else: ?>
+                                                <a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a> |
+                                        <?php endif; ?>
+                                <# } #>
+                                <a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a>
+                        </div>
                 </div>
         </script>