Changeset 43217

Timestamp:

05/10/2018 04:03:15 PM (8 years ago)

Author:

azaozz

Message:

Privacy: fix styling on personal data tables.

Props melchoyce, allendav.
Merges [43216] to the 4.9 branch.
Fixes #43909.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/css/forms.css (modified) (2 diffs)
• src/wp-admin/js/xfn.js (modified) (3 diffs)

branches/4.9/src/wp-admin/css/forms.css

@@ -1116 +1116 @@
 }
 
+.privacy_requests tbody .has-request-results th {
+        box-shadow: none;
+}
+
+.privacy_requests tbody .request-results th .notice {
+        margin: 0 0 5px;
+}
+
 .privacy_requests tbody td {
         background: #fff;
         box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
+}
+
+.privacy_requests tbody .has-request-results td {
+        box-shadow: none;
 }
 
@@ -1133 +1145 @@
 }
 
-.privacy_requests .request-results .notice {
-        margin: -2px 0 0;
-}
-
-.privacy_requests .request-results .notice p {
-        margin: 0.5em 0;
-}
-
-.request-results td {
-        padding: 0 0 1px;
+.privacy_requests .export_personal_data_failed a {
+        vertical-align: baseline;
 }
 

branches/4.9/src/wp-admin/js/xfn.js

@@ -27 +27 @@
 
         function clearResultsAfterRow( $requestRow ) {
+                $requestRow.removeClass( 'has-request-results' );
+
                 if ( $requestRow.next().hasClass( 'request-results' ) ) {
                         $requestRow.next().remove();
@@ -33 +35 @@
 
         function appendResultsAfterRow( $requestRow, classes, summaryMessage, additionalMessages ) {
-                var itemList = '';
+                var itemList = '',
+                        resultRowClasses = 'request-results';
 
                 clearResultsAfterRow( $requestRow );
@@ -44 +47 @@
                 }
 
+                $requestRow.addClass( 'has-request-results' );
+
+                if ( $requestRow.hasClass( 'status-request-confirmed' ) ) {
+                        resultRowClasses = resultRowClasses + ' status-request-confirmed';
+                }
+
+                if ( $requestRow.hasClass( 'status-request-failed' ) ) {
+                        resultRowClasses = resultRowClasses + ' status-request-failed';
+                }
+
                 $requestRow.after( function() {
-                        return '<tr class="request-results"><td colspan="5">' +
+                        return '<tr class="' + resultRowClasses + '"><th colspan="5">' +
                                 '<div class="notice inline notice-alt ' + classes + '">' +
                                 '<p>' + summaryMessage + '</p>' +