Changeset 41774

Timestamp:

10/05/2017 04:24:52 AM (7 years ago)

Author:

helen

Message:

File Editors: Introduce an interstitial warning upon first visit.

This is an effort to provide a speed bump before heading into something potentially destructive and some education for users on better alternatives, even as we make the file editors safer to use. Each user, including existing users, will be shown a one-time dismissible modal warning on their first visit to each of the theme and plugin file editors.

Copy tweaks to come.

props michelleweber, Ipstenu, melchoyce, adamsilverstein, westonruter, toddnestor, aryamaaru, ZaneMatthew, cliffseal, helen.
fixes #31779.

Location:

trunk/src/wp-admin

Files:

• css/common.css (modified) (1 diff)
• js/theme-plugin-editor.js (modified) (2 diffs)
• plugin-editor.php (modified) (2 diffs)
• theme-editor.php (modified) (2 diffs)

trunk/src/wp-admin/css/common.css

@@ -3148 +3148 @@
 }
 
+#file-editor-warning .file-editor-warning-content {
+    margin: 25px;
+}
+
 /* @todo: can we use a common class for these? */
 .nav-menus-php .item-edit:before,

trunk/src/wp-admin/js/theme-plugin-editor.js

@@ -47 +47 @@
         component.textarea = component.form.find( '#newcontent' );
         component.textarea.on( 'change', component.onChange );
+        component.warning = $( '.file-editor-warning' );
+
+        if ( component.warning.length > 0 ) {
+            $( 'body' ).addClass( 'modal-open' );
+            component.warning.find( '.file-editor-warning-dismiss' ).focus();
+            component.warning.on( 'click', '.file-editor-warning-dismiss', component.dismissWarning );
+        };
+
 
         if ( false !== component.codeEditor ) {
@@ -65 +73 @@
             return undefined;
         } );
+    };
+
+    /**
+     * Dismiss the warning modal.
+     *
+     * @since 4.9.0
+     * @returns {void}
+     */
+    component.dismissWarning = function() {
+
+        wp.ajax.post( 'dismiss-wp-pointer', {
+            pointer: component.themeOrPlugin + '_editor_notice'
+        });
+
+        // hide modal
+        component.warning.remove();
+        $( 'body' ).removeClass( 'modal-open' );
+
+        // return focus - is this a trap?
+        component.instance.codemirror.focus();
     };
 

trunk/src/wp-admin/plugin-editor.php

@@ -143 +143 @@
     wp_enqueue_script( 'wp-theme-plugin-editor' );
     wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );
+    wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'wp.themePluginEditor.themeOrPlugin = "plugin";' ) );
 
     require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -281 +282 @@
 </div>
 <?php
+$dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :
+?>
+<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js">
+    <div class="notification-dialog-background"></div>
+    <div class="notification-dialog" role="dialog" aria-labelledby="file-editor-warning-title" tabindex="0">
+        <div class="file-editor-warning-content">
+            <h1 id="file-editor-warning-title"><?php _e( 'Heads up!' ); ?></h1>
+            <p><?php _e( 'You appear to be making direct edits to your plugin in the WordPress dashboard. We recommend that you don&#8217;t! Editing plugins directly may introduce incompatibilities that break your theme or other plugins, and can leave you unable to log back in to WordPress and undo changes.' ); ?></p>
+            <p><?php _e( 'If you absolutely have to edit this plugin, create a copy with a new name and hang on to the original version, so you can re-enable a functional version if something goes wrong.' ); ?></p>
+            <p><button type="button" class="file-editor-warning-dismiss button-primary"><?php _e( 'I understand' ); ?></button></p>
+        </div>
+    </div>
+</div>
+<?php
+endif; // editor warning notice
 
 include(ABSPATH . "wp-admin/admin-footer.php");

trunk/src/wp-admin/theme-editor.php

@@ -128 +128 @@
     wp_enqueue_script( 'wp-theme-plugin-editor' );
     wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );
+    wp_add_inline_script( 'wp-theme-plugin-editor', 'wp.themePluginEditor.themeOrPlugin = "theme";' );
 
     require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -310 +311 @@
 </div>
 <?php
+$dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
+?>
+<div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js">
+    <div class="notification-dialog-background"></div>
+    <div class="notification-dialog" role="dialog" aria-labelledby="file-editor-warning-title" tabindex="0">
+        <div class="file-editor-warning-content">
+            <h1 id="file-editor-warning-title"><?php _e( 'Heads up!' ); ?></h1>
+            <p>
+                <?php
+                echo sprintf(
+                    /* translators: %s is a link to Custom CSS section in the Customizer. */
+                    __( 'You appear to be making direct edits to your theme in the WordPress Dashboard. We recommend that you don&#8217;t! Editing this code directly is dangerous, and can leave you unable to log back in to WordPress and undo changes. There&#8217;s no need to change your CSS here &mdash; you can edit and live preview CSS changes in WordPress&#8217;s <a href="%s">built in CSS editor</a>.' ),
+                    esc_url( add_query_arg( 'autofocus[section]', 'custom_css', admin_url( 'customize.php' ) ) )
+                );
+                ?>
+            </p>
+            <p><?php _e( 'If you decide to go ahead with direct edits anyway, make sure to back up all your site&#8217;s files before making changes so you can restore a functional version if something goes wrong.' ); ?></p>
+            <p><button type="button" class="file-editor-warning-dismiss button-primary"><?php _e( 'I understand' ); ?></button></p>
+        </div>
+    </div>
+</div>
+<?php
+endif; // editor warning notice
 
 include(ABSPATH . 'wp-admin/admin-footer.php' );