Ticket #40529: 40529.2.diff

src/wp-admin/css/dashboard.css

@@ -308 +308 @@
         padding: 0;
 }
 
-#dashboard_primary .widget-loading,
-#dashboard_primary .dashboard-widget-control-form {
+#dashboard_primary .widget-loading {
         padding: 12px 12px 0;
+        margin-bottom: 1em !important; /* Needs to override `.postbox .inside > p:last-child` in common.css */
 }
 
-body #dashboard-widgets .postbox form .submit {
+/* Notice when JS is off. */
+#dashboard_primary .inside .notice {
         margin: 0;
 }
 
-.dashboard-widget-control-form {
-        overflow: hidden;
+body #dashboard-widgets .postbox form .submit {
+        margin: 0;
 }
 
+/* Used only for configurable widgets. */
 .dashboard-widget-control-form p {
         margin-top: 0;
 }

src/wp-admin/includes/dashboard.php

@@ -191 +191 @@
  * @param array $meta_box
  */
 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
-        echo '<form method="post" class="dashboard-widget-control-form">';
+        echo '<form method="post" class="dashboard-widget-control-form wp-clearfix">';
         wp_dashboard_trigger_widget_control( $meta_box['id'] );
         wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
         echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
@@ -968 +968 @@
  * @return bool False on failure. True on success.
  */
 function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
-        $loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
+        $loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
         $doing_ajax = wp_doing_ajax();
 
         if ( empty($check_urls) ) {