From ee7f970ffa98d82c1a04e8f8a39b2f67af4c4363 Mon Sep 17 00:00:00 2001 From: Andrea Fercia Date: Wed, 28 Sep 2016 19:53:07 +0000 Subject: [PATCH] Administration: Improve the usage of the button CSS classes. Introduces some consistency in the usage of the button CSS classes, fixes the focus style for accessibility and responsiveness of the buttons. - Adds the `button` class to all primary buttons make them responsive - Removes all `secondary-button` classes and replaces it with button when needed. `button-secondary` shouldn't be used and exists just for backward compatibility reasons - Replaces classes inside `submit_button()` with a shorthand for some buttons, and use an empty string for the default `button` class. Passing `button` is unnecessary - Adjusts `get_submit_button()` to remove empty items Props iseulde, dimchik, chris_d2d, mhowell, afercia. Fixes #27314, #37138, #37448. git-svn-id: https://develop.svn.wordpress.org/trunk@38672 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/customize-controls.css | 2 +- src/wp-admin/css/ie.css | 9 ++++--- src/wp-admin/css/install.css | 2 +- src/wp-admin/css/list-tables.css | 1 + src/wp-admin/css/themes.css | 2 +- src/wp-admin/custom-background.php | 6 ++--- src/wp-admin/custom-header.php | 8 +++---- src/wp-admin/customize.php | 2 +- .../includes/class-wp-comments-list-table.php | 2 +- .../includes/class-wp-links-list-table.php | 2 +- src/wp-admin/includes/class-wp-list-table.php | 2 +- .../includes/class-wp-media-list-table.php | 2 +- .../class-wp-plugin-install-list-table.php | 2 +- .../includes/class-wp-plugins-list-table.php | 4 ++-- .../includes/class-wp-posts-list-table.php | 8 +++---- .../includes/class-wp-terms-list-table.php | 4 ++-- .../class-wp-theme-install-list-table.php | 8 +++---- .../includes/class-wp-users-list-table.php | 2 +- src/wp-admin/includes/dashboard.php | 4 ++-- src/wp-admin/includes/file.php | 2 +- src/wp-admin/includes/media.php | 14 +++++------ src/wp-admin/includes/meta-boxes.php | 6 ++--- src/wp-admin/includes/nav-menu.php | 10 ++++---- src/wp-admin/includes/plugin-install.php | 4 ++-- src/wp-admin/includes/template.php | 13 +++++----- src/wp-admin/includes/theme-install.php | 6 ++--- src/wp-admin/includes/widgets.php | 4 ++-- src/wp-admin/install.php | 2 +- src/wp-admin/js/customize-widgets.js | 2 +- src/wp-admin/js/updates.js | 2 +- src/wp-admin/js/widgets.js | 4 ++-- src/wp-admin/nav-menus.php | 2 +- src/wp-admin/network/themes.php | 6 ++--- src/wp-admin/plugin-editor.php | 2 +- src/wp-admin/plugins.php | 4 ++-- src/wp-admin/theme-editor.php | 2 +- src/wp-admin/theme-install.php | 10 ++++---- src/wp-admin/themes.php | 24 +++++++++---------- src/wp-admin/tools.php | 4 ++-- src/wp-admin/update-core.php | 8 +++---- src/wp-admin/user-edit.php | 12 +++++----- src/wp-admin/user-new.php | 6 ++--- src/wp-admin/widgets.php | 8 +++---- .../class-wp-customize-nav-menus.php | 2 +- .../class-wp-customize-widgets.php | 2 +- .../class-wp-customize-nav-menu-control.php | 2 +- .../class-wp-customize-new-menu-section.php | 2 +- ...class-wp-widget-area-customize-control.php | 2 +- src/wp-includes/general-template.php | 2 +- tests/qunit/fixtures/customize-menus.js | 2 +- tests/qunit/fixtures/customize-widgets.js | 4 ++-- tests/qunit/index.html | 4 ++-- 52 files changed, 126 insertions(+), 125 deletions(-) diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css index 3f2193b286..04e0b54798 100644 --- a/src/wp-admin/css/customize-controls.css +++ b/src/wp-admin/css/customize-controls.css @@ -1204,7 +1204,7 @@ body.cheatin p { * Widgets and Menus common styles */ -/* higher specificity than .wp-core-ui .button-secondary */ +/* higher specificity than .wp-core-ui .button */ #customize-theme-controls .add-new-widget, #customize-theme-controls .add-new-menu-item { cursor: pointer; diff --git a/src/wp-admin/css/ie.css b/src/wp-admin/css/ie.css index 90cf8f341c..d98f31bbcc 100644 --- a/src/wp-admin/css/ie.css +++ b/src/wp-admin/css/ie.css @@ -221,8 +221,7 @@ table.fixed td { } #wpbody-content input.button, -#wpbody-content input.button-primary, -#wpbody-content input.button-secondary { +#wpbody-content input.button-primary { overflow: visible; } @@ -447,8 +446,8 @@ div#dashboard-widgets { display: block; } -.tablenav .button-secondary, -.nav .button-secondary { +.tablenav .button, +.nav .button { padding-top: 2px; padding-bottom: 2px; } @@ -507,7 +506,7 @@ table.ie-fixed { border-collapse: collapse; } -.tablenav a.button-secondary { +.tablenav a.button { display: inline-block; padding: 2px 5px; } diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css index d1db4ec661..9de99ee366 100644 --- a/src/wp-admin/css/install.css +++ b/src/wp-admin/css/install.css @@ -443,7 +443,7 @@ body.language-chooser { margin-right: 15px; } -.button-secondary.hide-if-no-js, +.button.hide-if-no-js, .hide-if-no-js { display: none; } diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css index b66f0c0d84..67ef22e183 100644 --- a/src/wp-admin/css/list-tables.css +++ b/src/wp-admin/css/list-tables.css @@ -656,6 +656,7 @@ th.asc a:focus span.sorting-indicator { margin-left: 2px; } +.tablenav a.button, .tablenav a.button-secondary { display: block; margin: 3px 8px 0 0; diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css index d4a7bcf624..857f14dc1a 100644 --- a/src/wp-admin/css/themes.css +++ b/src/wp-admin/css/themes.css @@ -114,7 +114,7 @@ margin-right: 3px; } -.theme-browser .theme .theme-actions .button-secondary { +.theme-browser .theme .theme-actions .button { float: none; margin-left: 3px; } diff --git a/src/wp-admin/custom-background.php b/src/wp-admin/custom-background.php index a03986f594..9626c291a0 100644 --- a/src/wp-admin/custom-background.php +++ b/src/wp-admin/custom-background.php @@ -242,7 +242,7 @@ class Custom_Background {
-
+
@@ -256,7 +256,7 @@ class Custom_Background {
-
+
@@ -272,7 +272,7 @@ class Custom_Background { - +


diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php index fc5adb670e..c339498c11 100644 --- a/src/wp-admin/custom-header.php +++ b/src/wp-admin/custom-header.php @@ -576,7 +576,7 @@ class Custom_Image_Header { - +

- +

- + @@ -823,7 +823,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>

diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php index 6c0b20d6c2..e45254c74a 100644 --- a/src/wp-admin/customize.php +++ b/src/wp-admin/customize.php @@ -168,7 +168,7 @@ do_action( 'customize_controls_print_scripts' ); - diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php index cb7801870d..37a2e751a9 100644 --- a/src/wp-admin/includes/class-wp-comments-list-table.php +++ b/src/wp-admin/includes/class-wp-comments-list-table.php @@ -351,7 +351,7 @@ class WP_Comments_List_Table extends WP_List_Table { * @since 3.5.0 */ do_action( 'restrict_manage_comments' ); - submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); + submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) { diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php index e4560e480f..222d6dfc2d 100644 --- a/src/wp-admin/includes/class-wp-links-list-table.php +++ b/src/wp-admin/includes/class-wp-links-list-table.php @@ -112,7 +112,7 @@ class WP_Links_List_Table extends WP_List_Table { echo ''; wp_dropdown_categories( $dropdown_options ); - submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); + submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); ?> - 'search-submit' ) ); ?> + 'search-submit' ) ); ?>

screen->post_type ); - submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); + submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) { diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php index 73df40f8f1..475c95e8af 100644 --- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -488,7 +488,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { } $action_links[] = sprintf( - '%3$s', + '%3$s', esc_url( $activate_url ), esc_attr( sprintf( $button_label, $plugin['name'] ) ), $button_text diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php index a8783f552d..7e2a3d339b 100644 --- a/src/wp-admin/includes/class-wp-plugins-list-table.php +++ b/src/wp-admin/includes/class-wp-plugins-list-table.php @@ -367,7 +367,7 @@ class WP_Plugins_List_Table extends WP_List_Table {

- 'search-submit' ) ); ?> + 'search-submit' ) ); ?>

'; if ( 'recently_activated' == $status ) { - submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false ); + submit_button( __( 'Clear List' ), '', 'clear-recent-list', false ); } elseif ( 'top' === $which && 'mustuse' === $status ) { /* translators: %s: mu-plugins directory name */ echo '

' . sprintf( __( 'Files in the %s directory are executed automatically.' ), diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php index 7ef790e31a..506dded3fd 100644 --- a/src/wp-admin/includes/class-wp-posts-list-table.php +++ b/src/wp-admin/includes/class-wp-posts-list-table.php @@ -479,7 +479,7 @@ class WP_Posts_List_Table extends WP_List_Table { */ do_action( 'restrict_manage_posts', $this->screen->post_type, $which ); - submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); + submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) { @@ -1713,14 +1713,14 @@ class WP_Posts_List_Table extends WP_List_Table { } ?>

- + - + diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php index 6e9f9c65ae..257c44a64c 100644 --- a/src/wp-admin/includes/class-wp-terms-list-table.php +++ b/src/wp-admin/includes/class-wp-terms-list-table.php @@ -619,8 +619,8 @@ class WP_Terms_List_Table extends WP_List_Table { ?>

- - + + diff --git a/src/wp-admin/includes/class-wp-theme-install-list-table.php b/src/wp-admin/includes/class-wp-theme-install-list-table.php index 3388732a0f..feb5b9976c 100644 --- a/src/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/src/wp-admin/includes/class-wp-theme-install-list-table.php @@ -329,14 +329,14 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {

- +
- @@ -398,7 +398,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . ''; + echo '' . __( 'Update' ) . ''; break; case 'newer_installed': case 'latest_installed': @@ -406,7 +406,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { break; case 'install': default: - echo '' . __( 'Install' ) . ''; + echo '' . __( 'Install' ) . ''; break; } ?>

diff --git a/src/wp-admin/includes/class-wp-users-list-table.php b/src/wp-admin/includes/class-wp-users-list-table.php index 80720b6c0f..3b7795dfab 100644 --- a/src/wp-admin/includes/class-wp-users-list-table.php +++ b/src/wp-admin/includes/class-wp-users-list-table.php @@ -267,7 +267,7 @@ class WP_Users_List_Table extends WP_List_Table { - 'submit_users' ) ); ?> + 'submit_users' ) ); ?>

@@ -435,7 +435,7 @@ function wp_network_dashboard_right_now() {

- 'submit_sites' ) ); ?> + 'submit_sites' ) ); ?>

- +

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index 1405e85334..9d63694031 100644 --- a/src/wp-admin/includes/media.php +++ b/src/wp-admin/includes/media.php @@ -1480,7 +1480,7 @@ function get_media_item( $attachment_id, $args = null ) { ); if ( $r['send'] ) { - $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + $r['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false ); } $delete = empty( $r['delete'] ) ? '' : $r['delete']; @@ -2031,7 +2031,7 @@ if ( $id ) { ?>

- +

- 'save-all', 'style' => 'display: none;' ) ); ?> + 'save-all', 'style' => 'display: none;' ) ); ?> @@ -2382,7 +2382,7 @@ function media_upload_library_form($errors) {

    @@ -2479,7 +2479,7 @@ foreach ($arc_result as $arc_row) { - +
@@ -2509,7 +2509,7 @@ jQuery(function($){

- +

@@ -2612,7 +2612,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) { - ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . ' + ' . get_submit_button( __( 'Insert into Post' ), '', 'insertonlybutton', false ) . ' diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php index 2d12faf46a..af1ee22136 100644 --- a/src/wp-admin/includes/meta-boxes.php +++ b/src/wp-admin/includes/meta-boxes.php @@ -32,7 +32,7 @@ function post_submit_meta_box( $post, $args = array() ) {
- +
@@ -290,7 +290,7 @@ function attachment_submit_meta_box( $post ) {
- +
@@ -875,7 +875,7 @@ function link_submit_meta_box($link) {
- +
diff --git a/src/wp-admin/includes/nav-menu.php b/src/wp-admin/includes/nav-menu.php index 30f38e9f56..b1c6f647f2 100644 --- a/src/wp-admin/includes/nav-menu.php +++ b/src/wp-admin/includes/nav-menu.php @@ -284,7 +284,7 @@ function wp_nav_menu_item_link_meta_box() {

- class="button-secondary submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> + class="button submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" />

@@ -450,7 +450,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) { - 'submit-quick-search-posttype-' . $post_type_name ) ); ?> + 'submit-quick-search-posttype-' . $post_type_name ) ); ?>

    @@ -572,7 +572,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) { - class="button-secondary submit-add-to-menu right" value="" name="add-post-type-menu-item" id="" /> + class="button submit-add-to-menu right" value="" name="add-post-type-menu-item" id="" />

    @@ -739,7 +739,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) { - 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?> + 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>

      @@ -770,7 +770,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) { - class="button-secondary submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="" /> + class="button submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="" />

      diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php index a33797e540..10568b0158 100644 --- a/src/wp-admin/includes/plugin-install.php +++ b/src/wp-admin/includes/plugin-install.php @@ -265,7 +265,7 @@ function install_search_form( $deprecated = true ) { - 'search-submit' ) ); ?> + 'search-submit' ) ); ?> - +

- + - +

@@ -657,7 +657,7 @@ function meta_form( $post = null ) {
- 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?> + 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
@@ -1513,7 +1513,7 @@ function find_posts_div($found_action = '') {
- +
@@ -1914,10 +1914,11 @@ function get_submit_button( $text = '', $type = 'primary large', $name = 'submit continue; $classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t; } - $class = implode( ' ', array_unique( $classes ) ); + // Remove empty items, remove duplicate items, and finally build a string. + $class = implode( ' ', array_unique( array_filter( $classes ) ) ); if ( 'delete' === $type ) - $class = 'button-secondary delete'; + $class = 'button delete'; $text = $text ? $text : __( 'Save Changes' ); diff --git a/src/wp-admin/includes/theme-install.php b/src/wp-admin/includes/theme-install.php index 9333beac9b..31ce5f7971 100644 --- a/src/wp-admin/includes/theme-install.php +++ b/src/wp-admin/includes/theme-install.php @@ -85,7 +85,7 @@ function install_theme_search_form( $type_selector = true ) { - +
- + - +
- 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?> + 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>

@@ -278,4 +278,4 @@ function wp_widget_control( $sidebar_args ) { */ function wp_widgets_access_body_class($classes) { return "$classes widgets_access "; -} \ No newline at end of file +} diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php index 80b7fbf1f5..d22ff6ca86 100644 --- a/src/wp-admin/install.php +++ b/src/wp-admin/install.php @@ -141,7 +141,7 @@ function display_setup_form( $error = null ) {
- diff --git a/src/wp-admin/js/customize-widgets.js b/src/wp-admin/js/customize-widgets.js index dc1ef823b3..5c956d7e78 100644 --- a/src/wp-admin/js/customize-widgets.js +++ b/src/wp-admin/js/customize-widgets.js @@ -835,7 +835,7 @@ $saveBtn = this.container.find( '.widget-control-save' ); $saveBtn.val( l10n.saveBtnLabel ); $saveBtn.attr( 'title', l10n.saveBtnTooltip ); - $saveBtn.removeClass( 'button-primary' ).addClass( 'button-secondary' ); + $saveBtn.removeClass( 'button-primary' ); $saveBtn.on( 'click', function( e ) { e.preventDefault(); self.updateWidget( { disable_form: true } ); // @todo disable_form is unused? diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js index 239829fe32..6c5907dfac 100644 --- a/src/wp-admin/js/updates.js +++ b/src/wp-admin/js/updates.js @@ -1105,7 +1105,7 @@ $message.siblings( '.preview' ).replaceWith( function () { return $( '' ) .attr( 'href', response.customizeUrl ) - .addClass( 'button button-secondary load-customize' ) + .addClass( 'button load-customize' ) .text( wp.updates.l10n.livePreview ); } ); } diff --git a/src/wp-admin/js/widgets.js b/src/wp-admin/js/widgets.js index de64533bdf..aa439ea552 100644 --- a/src/wp-admin/js/widgets.js +++ b/src/wp-admin/js/widgets.js @@ -354,12 +354,12 @@ wpWidgets = { if ( $target.hasClass('button-primary') ) { self.addWidget( chooser ); self.closeChooser(); - } else if ( $target.hasClass('button-secondary') ) { + } else if ( $target.hasClass( 'widgets-chooser-cancel' ) ) { self.closeChooser(); } }).on( 'keyup.widgets-chooser', function( event ) { if ( event.which === $.ui.keyCode.ENTER ) { - if ( $( event.target ).hasClass('button-secondary') ) { + if ( $( event.target ).hasClass( 'widgets-chooser-cancel' ) ) { // Close instead of adding when pressing Enter on the Cancel button self.closeChooser(); } else { diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 4c383e8dc4..319566c424 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -713,7 +713,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); - + create a new menu.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?> diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php index 68b7c77ed3..d6e4e95290 100644 --- a/src/wp-admin/network/themes.php +++ b/src/wp-admin/network/themes.php @@ -158,9 +158,9 @@ if ( $action ) { wp_nonce_field( 'bulk-themes' ); if ( 1 == $themes_to_delete ) { - submit_button( __( 'Yes, delete this theme' ), 'button', 'submit', false ); + submit_button( __( 'Yes, delete this theme' ), '', 'submit', false ); } else { - submit_button( __( 'Yes, delete these themes' ), 'button', 'submit', false ); + submit_button( __( 'Yes, delete these themes' ), '', 'submit', false ); } ?> @@ -168,7 +168,7 @@ if ( $action ) { $referer = wp_get_referer(); ?>
- +
- +
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php index 6474e4691f..2ea6b372b3 100644 --- a/src/wp-admin/plugins.php +++ b/src/wp-admin/plugins.php @@ -327,13 +327,13 @@ if ( $action ) { } ?> - +
- +
null ) ) as $a_stylesheet => $a_them } ?> - +
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php index fc0904c6d2..87163b925f 100644 --- a/src/wp-admin/theme-install.php +++ b/src/wp-admin/theme-install.php @@ -174,7 +174,7 @@ include(ABSPATH . 'wp-admin/admin-header.php'); - +

@@ -262,9 +262,9 @@ if ( $tab ) { <# } #> <# if ( data.customize_url ) { #> - + <# } else { #> - + <# } #> <# } else { #> - + <# } #> @@ -325,7 +325,7 @@ if ( $tab ) {
- diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php index d480ce672b..6c455c079c 100644 --- a/src/wp-admin/themes.php +++ b/src/wp-admin/themes.php @@ -200,17 +200,17 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; else - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { $menu_file = $item[2]; if ( current_user_can( 'customize' ) ) { if ( 'custom-header' === $menu_file ) { - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } elseif ( 'custom-background' === $menu_file ) { - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } } @@ -219,9 +219,9 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() ) } if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) { - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } else { - $current_theme_actions[] = "{$item[0]}"; + $current_theme_actions[] = "{$item[0]}"; } } } @@ -281,7 +281,7 @@ foreach ( $themes as $theme ) : /* translators: %s: Theme name */ $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); ?> - + @@ -333,7 +333,7 @@ $can_install = current_user_can( 'install_themes' ); ), admin_url( 'themes.php' ) ); $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet ); ?> - + - + - + <# } #>
@@ -469,13 +469,13 @@ $can_install = current_user_can( 'install_themes' ); $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); ?> <# if ( data.actions.activate ) { #> - + <# } #> <# if ( ! data.active && data.actions['delete'] ) { #> - + <# } #> diff --git a/src/wp-admin/tools.php b/src/wp-admin/tools.php index b6de3c8183..3ca351be35 100644 --- a/src/wp-admin/tools.php +++ b/src/wp-admin/tools.php @@ -49,7 +49,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

- @@ -68,7 +68,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

- +