Changeset 45117

Timestamp:

04/05/2019 04:59:34 PM (6 years ago)

Author:

flixos90

Message:

Administration: Improve user experience and clarify when in recovery mode.

This changeset introduces several changes around usability when recovery mode is active:

• Display a notice in the admin clarifying that the user is in recovery mode.
• Use a highlight color for the admin bar link to exit recovery mode.
• Exit recovery mode automatically when logging out.
• Include a recovery mode indicator in the title tag.

Props aandrewdixon, azaozz, dhanukanuwan, flixos90, henrywright, karmatosed, mapk, melchoyce, spacedmonkey, TimothyBlynJacobs, tinkerbelly.
See #46608.

Location:

trunk/src

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/css/colors/_admin.scss (modified) (1 diff)
• wp-admin/css/colors/_variables.scss (modified) (1 diff)
• wp-admin/includes/admin-filters.php (modified) (1 diff)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-includes/class-wp-recovery-mode.php (modified) (1 diff)
• wp-includes/css/admin-bar.css (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/src/wp-admin/admin-header.php

@@ -51 +51 @@
     /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
     $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
+}
+
+if ( wp_is_recovery_mode() ) {
+    /* translators: %s: Admin screen title. */
+    $admin_title = sprintf( __( '%s — Recovery Mode' ), $admin_title );
 }
 

trunk/src/wp-admin/css/colors/_admin.scss

@@ -349 +349 @@
 }
 
+/* Admin Bar: recovery mode */
+
+#wpadminbar #wp-admin-bar-recovery-mode {
+    color: $adminbar-recovery-exit-text;
+    background-color: $adminbar-recovery-exit-background;
+}
+
+#wpadminbar #wp-admin-bar-recovery-mode .ab-item,
+#wpadminbar #wp-admin-bar-recovery-mode a.ab-item {
+    color: $adminbar-recovery-exit-text;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover >.ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+    color: $adminbar-recovery-exit-text;
+    background-color: $adminbar-recovery-exit-background-alt;
+}
+
 /* Admin Bar: my account */
 

trunk/src/wp-admin/css/colors/_variables.scss

@@ -56 +56 @@
 $adminbar-input-background: lighten( $menu-background, 7% ) !default;
 
+$adminbar-recovery-exit-text: $menu-bubble-text !default;
+$adminbar-recovery-exit-background: $menu-bubble-background !default;
+$adminbar-recovery-exit-background-alt: mix(black, $adminbar-recovery-exit-background, 10%) !default;
+
 $menu-customizer-text: mix( $base-color, $text-color, 40% ) !default;

trunk/src/wp-admin/includes/admin-filters.php

@@ -121 +121 @@
 add_action( 'admin_notices', 'paused_themes_notice', 5 );
 add_action( 'admin_notices', 'maintenance_nag', 10 );
+add_action( 'admin_notices', 'wp_recovery_mode_nag', 1 );
 
 add_filter( 'update_footer', 'core_update_footer' );

trunk/src/wp-admin/includes/update.php

@@ -830 +830 @@
     <?php
 }
+
+/**
+ * Displays a notice when the user is in recovery mode.
+ *
+ * @since 5.2.0
+ */
+function wp_recovery_mode_nag() {
+    if ( ! wp_is_recovery_mode() ) {
+        return;
+    }
+
+    ?>
+    <div class="notice notice-info">
+        <p>
+            <?php esc_html_e( 'You are in recovery mode. This means there may be an error with a theme or plugin. To exit recovery mode, log out or use the Exit button.' ); ?>
+        </p>
+    </div>
+    <?php
+}

trunk/src/wp-includes/class-wp-recovery-mode.php

@@ -83 +83 @@
         $this->is_initialized = true;
 
+        add_action( 'wp_logout', array( $this, 'exit_recovery_mode' ) );
         add_action( 'login_form_' . self::EXIT_ACTION, array( $this, 'handle_exit_recovery_mode' ) );
 

trunk/src/wp-includes/css/admin-bar.css

@@ -383 +383 @@
 #wpadminbar ul li:last-child .ab-item {
     box-shadow: none;
+}
+
+/**
+ * Recovery Mode
+ */
+#wpadminbar #wp-admin-bar-recovery-mode {
+    color: #fff;
+    background-color: #ca4a1f;
+}
+
+#wpadminbar .ab-top-menu > #wp-admin-bar-recovery-mode.hover >.ab-item,
+#wpadminbar.nojq .quicklinks .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode:hover > .ab-item,
+#wpadminbar:not(.mobile) .ab-top-menu > #wp-admin-bar-recovery-mode > .ab-item:focus {
+    color: #fff;
+    background-color: #c0461e;
 }
 

trunk/src/wp-login.php

@@ -64 +64 @@
     /* translators: Login screen title. 1: Login screen name, 2: Network or site name */
     $login_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $login_title );
+
+    if ( wp_is_recovery_mode() ) {
+        /* translators: %s: Login screen title. */
+        $login_title = sprintf( __( '%s — Recovery Mode' ), $login_title );
+    }
 
     /**