diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss index 20ac8f09c9..d044ce1bf1 100644 --- a/src/wp-admin/css/colors/_admin.scss +++ b/src/wp-admin/css/colors/_admin.scss @@ -83,7 +83,8 @@ input[type=radio]:checked:before { /* List tables */ -.wrap .add-new-h2:hover, +.wrap .add-new-h2:hover, /* deprecated */ +.wrap .page-title-action:hover, #add-new-comment a:hover, .tablenav .tablenav-pages a:hover, .tablenav .tablenav-pages a:focus { diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index 420555e0aa..6bb2027aba 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -595,8 +595,10 @@ code { padding-left: 25px; } -.wrap .add-new-h2, -.wrap .add-new-h2:active { +.wrap .add-new-h2, /* deprecated */ +.wrap .add-new-h2:active, /* deprecated */ +.wrap .page-title-action, +.wrap .page-title-action:active { margin-left: 4px; padding: 4px 8px; position: relative; @@ -611,7 +613,8 @@ code { font-size: 13px; } -.wrap .add-new-h2:hover { +.wrap .add-new-h2:hover, /* deprecated */ +.wrap .page-title-action:hover { background: #00a0d2; color: #fff; } @@ -3166,7 +3169,10 @@ img { display: none !important; } - .wrap .add-new-h2, .wrap .add-new-h2:active { + .wrap .add-new-h2, /* deprecated */ + .wrap .add-new-h2:active, /* deprecated */ + .wrap .page-title-action, + .wrap .page-title-action:active { padding: 10px 15px; font-size: 14px; white-space: nowrap; diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php index 38b2cc70f5..793ef8c253 100644 --- a/src/wp-admin/edit-form-advanced.php +++ b/src/wp-admin/edit-form-advanced.php @@ -417,7 +417,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; ?>

diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php index fe0b94d22d..943874a8e2 100644 --- a/src/wp-admin/edit-link-form.php +++ b/src/wp-admin/edit-link-form.php @@ -70,7 +70,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

+

diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index e1dda8418c..6c285d78ec 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -286,7 +286,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

labels->name ); if ( current_user_can( $post_type_object->cap->create_posts ) ) - echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; + echo ' ' . esc_html( $post_type_object->labels->add_new ) . ''; if ( ! empty( $_REQUEST['s'] ) ) printf( ' ' . __('Search results for “%s”') . '', get_search_query() ); ?>

diff --git a/src/wp-admin/link-manager.php b/src/wp-admin/link-manager.php index 7c26d5357d..8666f202c4 100644 --- a/src/wp-admin/link-manager.php +++ b/src/wp-admin/link-manager.php @@ -69,7 +69,7 @@ if ( ! current_user_can('manage_links') ) ?>
-

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>

diff --git a/src/wp-admin/media.php b/src/wp-admin/media.php index 76587cafdb..d6c509621f 100644 --- a/src/wp-admin/media.php +++ b/src/wp-admin/media.php @@ -107,7 +107,7 @@ case 'edit' : - + diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 9575af233e..b22ac4ba91 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -566,7 +566,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); %2$s', + ' %2$s', esc_url( add_query_arg( array( array( 'autofocus' => array( 'panel' => 'nav_menus' ) ), diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php index 1e05c16466..4e057207b6 100644 --- a/src/wp-admin/network/sites.php +++ b/src/wp-admin/network/sites.php @@ -251,7 +251,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

- +
-

' . __('Search results for “%s”') . '', esc_html( $s ) ); ?>

diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php index edc1eba39d..4a06e40173 100644 --- a/src/wp-admin/network/users.php +++ b/src/wp-admin/network/users.php @@ -311,7 +311,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(

- " class="page-title-action">' . $text . ''; + echo ' ' . $text . ''; } ?>

diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php index b9615b3c33..0aea9995b0 100644 --- a/src/wp-admin/plugins.php +++ b/src/wp-admin/plugins.php @@ -448,7 +448,7 @@ if ( !empty($invalid) )

- + ' . __('Search results for “%s”') . '', esc_html( $s ) ); ?> diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php index 133820bc63..02be636fa3 100644 --- a/src/wp-admin/theme-install.php +++ b/src/wp-admin/theme-install.php @@ -117,8 +117,8 @@ include(ABSPATH . 'wp-admin/admin-header.php'); */ $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) ); if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) { - echo ' ' . __( 'Upload Theme' ) . ''; - echo ' ' . _x( 'Browse', 'themes' ) . ''; + echo ' ' . __( 'Upload Theme' ) . ''; + echo ' ' . _x( 'Browse', 'themes' ) . ''; } ?>

diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php index 56711232da..38b0f6c873 100644 --- a/src/wp-admin/themes.php +++ b/src/wp-admin/themes.php @@ -127,7 +127,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

- +

-

@@ -210,7 +210,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); - ' . __('Search results for “%s”') . '', get_search_query() ); ?> diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php index bbf431d211..6dae940136 100644 --- a/src/wp-admin/user-edit.php +++ b/src/wp-admin/user-edit.php @@ -207,9 +207,9 @@ include(ABSPATH . 'wp-admin/admin-header.php'); echo esc_html( $title ); if ( ! IS_PROFILE_PAGE ) { if ( current_user_can( 'create_users' ) ) { ?> - + - + diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php index 5bc5d10c07..90e4a950f0 100644 --- a/src/wp-admin/users.php +++ b/src/wp-admin/users.php @@ -447,9 +447,9 @@ if ( ! empty($messages) ) { - + - + echo esc_html( $title ); if ( current_user_can( 'customize' ) ) { printf( - ' %2$s', + ' %2$s', esc_url( add_query_arg( array( array( 'autofocus' => array( 'panel' => 'widgets' ) ), diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js index 691b1f090b..023fd33398 100644 --- a/src/wp-includes/js/media-grid.js +++ b/src/wp-includes/js/media-grid.js @@ -663,7 +663,7 @@ Manage = MediaFrame.extend({ this.$window = $( window ); this.$adminBar = $( '#wpadminbar' ); this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) ); - $( document ).on( 'click', '.add-new-h2', _.bind( this.addNewClickHandler, this ) ); + $( document ).on( 'click', '.page-title-action', _.bind( this.addNewClickHandler, this ) ); // Ensure core and media grid view UI is enabled. this.$el.addClass('wp-core-ui'); diff --git a/src/wp-includes/js/media/views/frame/manage.js b/src/wp-includes/js/media/views/frame/manage.js index 9a9dd18fae..467281ee85 100644 --- a/src/wp-includes/js/media/views/frame/manage.js +++ b/src/wp-includes/js/media/views/frame/manage.js @@ -41,7 +41,7 @@ Manage = MediaFrame.extend({ this.$window = $( window ); this.$adminBar = $( '#wpadminbar' ); this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) ); - $( document ).on( 'click', '.add-new-h2', _.bind( this.addNewClickHandler, this ) ); + $( document ).on( 'click', '.page-title-action', _.bind( this.addNewClickHandler, this ) ); // Ensure core and media grid view UI is enabled. this.$el.addClass('wp-core-ui');