Changeset 49113

Timestamp:

10/09/2020 03:51:34 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Accessibility: Widgets: Add a "Cancel" link when editing a widget in accessibility mode.

This allows the user to go back without saving any changes to the widget.

Props garrett-eclipse, audrasjb, afercia.
Fixes #49354.

Location:

trunk/src/wp-admin

Files:

• includes/widgets.php (modified) (1 diff)
• widgets.php (modified) (1 diff)

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

@@ -295 +295 @@
             <button type="button" class="button-link button-link-delete widget-control-remove"><?php _e( 'Delete' ); ?></button>
             <span class="widget-control-close-wrapper">
-                |
-                <button type="button" class="button-link widget-control-close"><?php _e( 'Done' ); ?></button>
+                | <button type="button" class="button-link widget-control-close"><?php _e( 'Done' ); ?></button>
             </span>
         </div>

trunk/src/wp-admin/widgets.php

@@ -347 +347 @@
 
     <div class="widget-control-actions">
-    <?php
-    if ( isset( $_GET['addnew'] ) ) {
-        ?>
-    <a href="widgets.php" class="button alignleft"><?php _e( 'Cancel' ); ?></a>
-        <?php
-    } else {
-        submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
-    }
-    submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false );
-    ?>
-    <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr( $widget_id ); ?>" />
-    <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
-    <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
-    <?php   wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
-    <br class="clear" />
-    </div>
+        <div class="alignleft">
+            <?php if ( ! isset( $_GET['addnew'] ) ) : ?>
+                <input type="submit" name="removewidget" id="removewidget" class="button-link button-link-delete widget-control-remove" value="<?php _e( 'Delete' ); ?>" />
+                <span class="widget-control-close-wrapper">
+                    | <a href="widgets.php" class="button-link widget-control-close"><?php _e( 'Cancel' ); ?></a>
+                </span>
+            <?php else : ?>
+                <a href="widgets.php" class="button-link widget-control-close"><?php _e( 'Cancel' ); ?></a>
+            <?php endif; ?>
+        </div>
+        <div class="alignright">
+            <?php submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false ); ?>
+            <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr( $widget_id ); ?>" />
+            <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
+            <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
+            <?php wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
+        </div>
+        <br class="clear" />
+    </div>
+
     </form>
     </div>