From d65a038ca38b809cf8f811219f4fe4919ca3c437 Mon Sep 17 00:00:00 2001 From: Andrea Fercia Date: Tue, 4 Oct 2016 07:08:29 +0000 Subject: [PATCH] Accessibility: Remove target=_blank from the Plugins, Themes, Media, Update, and Tools screens help tabs links. Stop taking control of users' browsers. Props rianrietveld. Fixes #38215. See #23432. Built from https://develop.svn.wordpress.org/trunk@38722 git-svn-id: http://core.svn.wordpress.org/trunk@38665 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/plugin-editor.php | 6 +++--- wp-admin/plugin-install.php | 6 +++--- wp-admin/plugins.php | 6 +++--- wp-admin/revision.php | 4 ++-- wp-admin/theme-editor.php | 12 ++++++------ wp-admin/theme-install.php | 6 +++--- wp-admin/themes.php | 6 +++--- wp-admin/tools.php | 4 ++-- wp-admin/update-core.php | 4 ++-- wp-admin/upload.php | 8 ++++---- wp-includes/version.php | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index f9bdc80f8f..444f92a0f0 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -140,9 +140,9 @@ default: get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Editing Plugins') . '

' . - '

' . __('Documentation on Writing Plugins') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Editing Plugins') . '

' . + '

' . __('Documentation on Writing Plugins') . '

' . + '

' . __('Support Forums') . '

' ); require_once(ABSPATH . 'wp-admin/admin-header.php'); diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index 47ab6812e8..69df6f844f 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -79,7 +79,7 @@ get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => - '

' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress Plugin Directory are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '

' . + '

' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress Plugin Directory are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '

' . '

' . __( 'You can find new plugins to install by searching or browsing the directory right here in your own Plugins section.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '

' ) ); @@ -95,8 +95,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Installing Plugins') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Installing Plugins') . '

' . + '

' . __('Support Forums') . '

' ); get_current_screen()->set_screen_reader_content( array( diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 2ea6b372b3..c302af54a7 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -400,7 +400,7 @@ get_current_screen()->add_help_tab( array( '

' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '

' . '

' . sprintf( /* translators: %s: WordPress Plugin Directory URL */ - __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the WordPress Plugin Directory. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), + __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the WordPress Plugin Directory. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), __( 'https://wordpress.org/plugins/' ) ) . '

' ) ); @@ -418,8 +418,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Plugins') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Managing Plugins') . '

' . + '

' . __('Support Forums') . '

' ); get_current_screen()->set_screen_reader_content( array( diff --git a/wp-admin/revision.php b/wp-admin/revision.php index 547b3546fe..210a336007 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -116,8 +116,8 @@ get_current_screen()->add_help_tab( array( ) ); $revisions_sidebar = '

' . __( 'For more information:' ) . '

'; -$revisions_sidebar .= '

' . __( 'Revisions Management' ) . '

'; -$revisions_sidebar .= '

' . __( 'Support Forums' ) . '

'; +$revisions_sidebar .= '

' . __( 'Revisions Management' ) . '

'; +$revisions_sidebar .= '

' . __( 'Support Forums' ) . '

'; get_current_screen()->set_help_sidebar( $revisions_sidebar ); diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 145ff5a94d..03b91944ea 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -30,17 +30,17 @@ get_current_screen()->add_help_tab( array(

' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '

' . __('After typing in your edits, click Update File.') . '

' . __('Advice: think very carefully about your site crashing if you are live-editing the theme currently in use.') . '

-

' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '

' . +

' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a child theme instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '

' . ( is_network_admin() ? '

' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '

' : '' ) ) ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Theme Development') . '

' . - '

' . __('Documentation on Using Themes') . '

' . - '

' . __('Documentation on Editing Files') . '

' . - '

' . __('Documentation on Template Tags') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Theme Development') . '

' . + '

' . __('Documentation on Using Themes') . '

' . + '

' . __('Documentation on Editing Files') . '

' . + '

' . __('Documentation on Template Tags') . '

' . + '

' . __('Support Forums') . '

' ); wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) ); diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php index 87163b925f..2347248d9c 100644 --- a/wp-admin/theme-install.php +++ b/wp-admin/theme-install.php @@ -78,7 +78,7 @@ if ( $tab ) { $help_overview = '

' . sprintf( /* translators: %s: Theme Directory URL */ - __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ), + __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/themes/' ) ) . '

' . '

' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '

' . @@ -107,8 +107,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Adding New Themes') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Adding New Themes') . '

' . + '

' . __('Support Forums') . '

' ); include(ABSPATH . 'wp-admin/admin-header.php'); diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 6c455c079c..fa1b25af5a 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -89,7 +89,7 @@ if ( current_user_can( 'install_themes' ) ) { if ( is_multisite() ) { $help_install = '

' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '

'; } else { - $help_install = '

' . sprintf( __('If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress Theme Directory. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), __( 'https://wordpress.org/themes/' ) ) . '

'; + $help_install = '

' . sprintf( __('If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress Theme Directory. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), __( 'https://wordpress.org/themes/' ) ) . '

'; } get_current_screen()->add_help_tab( array( @@ -115,8 +115,8 @@ if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Using Themes' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Using Themes' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); if ( current_user_can( 'switch_themes' ) ) { diff --git a/wp-admin/tools.php b/wp-admin/tools.php index 3ca351be35..2110fb5e4a 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -25,8 +25,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Tools') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Tools') . '

' . + '

' . __('Support Forums') . '

' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index d203a8b20b..f2328eb7bb 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -569,8 +569,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __( 'Documentation on Updating WordPress' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Updating WordPress' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); if ( 'upgrade-core' == $action ) { diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 654902353e..90a13c9a92 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -63,8 +63,8 @@ if ( 'grid' === $mode ) { get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Media Library' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Media Library' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); $title = __('Media Library'); @@ -218,8 +218,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Media Library' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Media Library' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); get_current_screen()->set_screen_reader_content( array( diff --git a/wp-includes/version.php b/wp-includes/version.php index f27ff449d0..811af3342a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38721'; +$wp_version = '4.7-alpha-38722'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.