Ticket #31233: 31233.14.diff

src/wp-admin/css/common.css

@@ -1288 +1288 @@
         padding: 2px;
 }
 
+.notice-dismissible {
+        padding-right: 38px;
+        position: relative;
+}
+
+.notice-dismissible button.close {
+        position: absolute;
+        right: 0;
+        top: 0;
+        border: none;
+        margin: 2px;
+        padding: 7px;
+        background: none;
+        color: #bbb;
+        cursor: pointer;
+}
+
+@-moz-document url-prefix() {
+        .notice-dismissible button.close {
+                right: 1px;
+                top: 1px;
+        }
+}
+
+.notice-dismissible button.close:hover {
+        color: #c00;
+}
+
+.notice-dismissible button.close:focus {
+        color: #c00;
+        outline: 1px solid #5b9dd9; /* IE 8 and modern browsers */
+        box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8); /* modern browsers */
+}
+
+.ie8 .dashicons-dismiss:before {
+        display: block;
+}
+
 .notice-success,
 div.updated {
-     border-color: #7ad03a;
+        border-color: #7ad03a;
 }
 
 .notice-warning {
-    border-color: #ffba00;
+        border-color: #ffba00;
 }
 
 .notice-error,
 div.error {
-    border-color: #dd3d36;
+        border-color: #dd3d36;
 }
 
 .notice-info {
-    border-color: #00a0d2;
+        border-color: #00a0d2;
 }
 
 .wrap .notice,
@@ -3129 +3167 @@
                 line-height: 175%;
         }
 
+        .notice-dismissible {
+                padding-right: 46px;
+        }
+
+        .notice-dismissible button.close {
+                margin: 6px;
+        }
+
         .wrap .icon32 + h2 {
                 margin-top: -2px;
         }

src/wp-admin/edit-form-advanced.php

@@ -410 +410 @@
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
 <?php endif; ?>
 <?php if ( $message ) : ?>
-<div id="message" class="updated"><p><?php echo $message; ?></p></div>
+<div id="message" class="updated notice-dismissible">
+        <p><?php echo $message; ?></p>
+        <button type="button" class="close hide-if-no-js">
+                <span class="dashicons dashicons-dismiss">
+                        <span class="screen-reader-text"></span>
+                </span>
+        </button>
+</div>
 <?php endif; ?>
 <div id="lost-connection-notice" class="error hidden">
         <p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.' ); ?>

src/wp-admin/js/common.js

@@ -373 +373 @@
         $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' );
         $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading );
 
+        // Make notices dismissible
+        $( '.notice-dismissible' ).each( function() {
+                var $this   = $( this ),
+                        $button = $( 'button.close', $this ),
+                        btnText = commonL10n.dismiss || '',
+                        append  = false;
+
+                // Create the button markup if it has not been added
+                if ( $button.length === 0 ) {
+                        $button = $( '<button type="button" class="close hide-if-no-js"><span class="dashicons dashicons-dismiss"><span class="screen-reader-text"></span></span></button>' );
+                        append = true;
+                }
+
+                // Ensure plain text
+                $button.find( '.screen-reader-text' ).text( btnText );
+
+                // Only append if we need to
+                if ( append ) {
+                        $this.append( $button );
+                }
+
+                $button.on( 'click.wp-dismiss-notice', function( event ) {
+                        event.preventDefault();
+                        $this.slideUp( 'fast' );
+                });
+        });
+
         // Init screen meta
         screenMeta.init();
 

src/wp-includes/script-loader.php

@@ -79 +79 @@
 
         $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
-                'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
+                'warnDelete' => __( "You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete." ),
+                'dismiss'    => __( 'Dismiss this notice.' ),
         ) );
 
         $scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );