Skip to content

feat: rename "Screen Options" to "Display Options" #9823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coderGtm wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

feat: rename "Screen Options" to "Display Options" #9823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/js/_enqueues/admin/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ window.adminMenu = {
window.columns = {

/**
* Initializes the column toggles in the screen options.
* Initializes the column toggles in the display options.
*
* Binds an onClick event to the checkboxes to show or hide the table columns
* based on their toggled state. And persists the toggled state.
Expand Down Expand Up @@ -428,7 +428,7 @@ window.columns = {
page: pagenow
},
function() {
wp.a11y.speak( __( 'Screen Options updated.' ) );
wp.a11y.speak( __( 'Display Options updated.' ) );
}
);
},
Expand Down Expand Up @@ -473,7 +473,7 @@ window.columns = {
},

/**
* Gets the checked column toggles from the screen options.
* Gets the checked column toggles from the display options.
*
* @since 3.0.0
*
Expand Down Expand Up @@ -565,7 +565,7 @@ window.showNotice = {
};

/**
* Represents the functions for the meta screen options panel.
* Represents the functions for the meta display options panel.
*
* @since 3.2.0
*
Expand Down
6 changes: 3 additions & 3 deletions src/js/_enqueues/admin/postbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
/**
* Hides the postbox element
*
* Event handler for the screen options checkboxes. When a checkbox is
* Event handler for the display options checkboxes. When a checkbox is
* clicked this function will hide or show the relevant postboxes.
*
* @since 2.7.0
Expand Down Expand Up @@ -471,7 +471,7 @@
page: page
},
function() {
wp.a11y.speak( __( 'Screen Options updated.' ) );
wp.a11y.speak( __( 'Display Options updated.' ) );
}
);
},
Expand Down Expand Up @@ -559,7 +559,7 @@
*/
updateEmptySortablesText: function( visibleSortables, areAllVisibleSortablesEmpty ) {
var isDashboard = $( '#dashboard-widgets' ).length,
emptySortableText = areAllVisibleSortablesEmpty ? __( 'Add boxes from the Screen Options menu' ) : __( 'Drag boxes here' );
emptySortableText = areAllVisibleSortablesEmpty ? __( 'Add boxes from the Display Options menu' ) : __( 'Drag boxes here' );

if ( ! isDashboard ) {
return;
Expand Down
8 changes: 4 additions & 4 deletions src/js/_enqueues/wp/customize/nav-menus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@
/**
* wp.customize.Menus.MenusPanel
*
* Customizer panel for menus. This is used only for screen options management.
* Customizer panel for menus. This is used only for display options management.
* Note that 'menus' must match the WP_Customize_Menu_Panel::$type.
*
* @class wp.customize.Menus.MenusPanel
Expand Down Expand Up @@ -1637,7 +1637,7 @@
* Shows or hides buttons based on the location of the menu item.
*
* @param {Object} itemToRefresh The menu item that might need its advanced accessibility buttons refreshed
*
*
* @since 6.6.0
*/
refreshAdvancedAccessibilityOfItem: function( itemToRefresh ) {
Expand Down Expand Up @@ -1717,7 +1717,7 @@
}
control.renderContent();
control.deferred.embedded.resolve(); // This triggers control.ready().

// Mark all menu items as unprocessed.
$( 'button.item-edit' ).data( 'needs_accessibility_refresh', true );
},
Expand Down Expand Up @@ -1796,7 +1796,7 @@
control.moveRight();
control.params.depth += 1;
}

moveBtn.focus(); // Re-focus after the container was moved.

// Mark all menu items as unprocessed.
Expand Down
2 changes: 1 addition & 1 deletion src/js/_enqueues/wp/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jQuery( function($) {
welcomepanelnonce: $( '#welcomepanelnonce' ).val()
},
function() {
wp.a11y.speak( wp.i18n.__( 'Screen Options updated.' ) );
wp.a11y.speak( wp.i18n.__( 'Display Options updated.' ) );
}
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/_index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
);

$help = '<p>' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '</p>';
$help .= '<p>' . __( '<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '</p>';
$help .= '<p>' . __( '<strong>Display Options</strong> &mdash; Use the Display Options tab to choose which Dashboard boxes to show.' ) . '</p>';
$help .= '<p>' . __( '<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '</p>';
$help .= '<p>' . __( '<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.' ) . '</p>';

Expand Down
6 changes: 3 additions & 3 deletions src/wp-admin/css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@ p.auto-update-status {
}

/*------------------------------------------------------------------------------
6.1 - Screen Options Tabs
6.1 - Display Options Tabs
------------------------------------------------------------------------------*/

#screen-options-wrap,
Expand All @@ -1793,7 +1793,7 @@ p.auto-update-status {
margin: 0 20px 0 0;
}

/* screen options and help tabs revert */
/* display options and help tabs revert */
#screen-meta {
display: none;
margin: 0 20px -1px 0;
Expand Down Expand Up @@ -1865,7 +1865,7 @@ p.auto-update-status {
content: "\f142";
}

/* end screen options and help tabs */
/* end display options and help tabs */

.toggle-arrow {
background-repeat: no-repeat;
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/css/customize-nav-menus.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
color: #50575e;
}

/* Screen Options */
/* Display Options */
.customize-screen-options-toggle {
background: none;
border: none;
Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/css/list-tables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@ div.action-links,
display: block;
}

/* Comment author hidden via Screen Options */
/* Comment author hidden via Display Options */
.fixed .column-author.hidden ~ .column-comment .comment-author {
display: none;
}
Expand Down Expand Up @@ -2239,7 +2239,7 @@ div.action-links,
display: table-cell;
}

/* Plugin description hidden via Screen Options */
/* Plugin description hidden via Display Options */
#wpbody-content .wp-list-table.plugins .desc.hidden {
display: none;
}
Expand Down
6 changes: 3 additions & 3 deletions src/wp-admin/edit-form-advanced.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
);

if ( 'post' === $post_type ) {
$customize_display = '<p>' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '</p>';
$customize_display = '<p>' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Display Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '</p>';

get_current_screen()->add_help_tab(
array(
Expand All @@ -287,7 +287,7 @@
$title_and_editor .= '<p>' . __( 'Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'The Code mode allows you to enter HTML along with your post text. Note that &lt;p&gt; and &lt;br&gt; tags are converted to line breaks when switching to the Code editor to make it less cluttered. When you type, a single line break can be used instead of typing &lt;br&gt;, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'You can insert media files by clicking the button above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Display Options.' ) . '</p>';
$title_and_editor .= '<p>' . sprintf(
/* translators: %s: Alt + F10 */
__( 'Keyboard users: When you are working in the visual editor, you can use %s to access the toolbar.' ),
Expand All @@ -314,7 +314,7 @@
);
} elseif ( 'page' === $post_type ) {
$about_pages = '<p>' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.' ) . '</p>' .
'<p>' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Code modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '</p>';
'<p>' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Display Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Code modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '</p>';

get_current_screen()->add_help_tab(
array(
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/edit-link-form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
'title' => __( 'Overview' ),
'content' =>
'<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you do not use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you do not use in the Display Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
'<p>' . __( 'XFN stands for <a href="https://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>',
)
);
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/edit-tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@

$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
'</ul>' .
'<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
'<p>' . __( 'You can change the display of this screen using the Display Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';

get_current_screen()->add_help_tab(
array(
Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@
'content' =>
'<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:' ) . '</p>' .
'<ul>' .
'<li>' . __( 'You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.' ) . '</li>' .
'<li>' . __( 'You can hide/display columns based on your needs and decide how many posts to list per screen using the Display Options tab.' ) . '</li>' .
'<li>' . __( 'You can filter the list of posts by post status using the text links above the posts list to only show posts with that status. The default view is to show all posts.' ) . '</li>' .
'<li>' . __( 'You can view posts in a simple title list or with an excerpt using the Screen Options tab.' ) . '</li>' .
'<li>' . __( 'You can view posts in a simple title list or with an excerpt using the Display Options tab.' ) . '</li>' .
'<li>' . __( 'You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.' ) . '</li>' .
'</ul>',
)
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/class-wp-privacy-policy-content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ public static function get_default_content( $description = false, $blocks = true
/* translators: Default privacy policy text. */
$strings[] = '<p>' . __( 'If you visit our login page, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>';
/* translators: Default privacy policy text. */
$strings[] = '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>';
$strings[] = '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and display options cookies last for a year. If you select &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>';
/* translators: Default privacy policy text. */
$strings[] = '<p>' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '</p>';
}
Expand Down
26 changes: 13 additions & 13 deletions src/wp-admin/includes/class-wp-screen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ final class WP_Screen {
private static $_old_compat_help = array();

/**
* The screen options associated with screen, if any.
* The display options associated with screen, if any.
*
* @since 3.3.0
* @var array
Expand All @@ -181,7 +181,7 @@ final class WP_Screen {
private $_show_screen_options;

/**
* Stores the 'screen_settings' section of screen options.
* Stores the 'screen_settings' section of display options.
*
* @since 3.3.0
* @var string
Expand Down Expand Up @@ -495,7 +495,7 @@ public function set_parentage( $parent_file ) {
* Adds an option for the screen.
*
* Call this in template files after admin.php is loaded and before admin-header.php is loaded
* to add screen options.
* to add display options.
*
* @since 3.3.0
*
Expand Down Expand Up @@ -702,7 +702,7 @@ public function set_help_sidebar( $content ) {
*
* The layout_columns option controls the max number and default number of
* columns. This method returns the number of columns within that range selected
* by the user via Screen Options. If no selection has been made, the default
* by the user via Display Options. If no selection has been made, the default
* provisioned in layout_columns is returned. If the screen does not support
* selecting the number of layout columns, 0 is returned.
*
Expand Down Expand Up @@ -955,7 +955,7 @@ public function render_screen_meta() {
}
$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.

// Add screen options.
// Add display options.
if ( $this->show_screen_options() ) {
$this->render_screen_options();
}
Expand All @@ -969,7 +969,7 @@ public function render_screen_meta() {
<div id="screen-meta-links">
<?php if ( $this->show_screen_options() ) : ?>
<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Display Options' ); ?></button>
</div>
<?php
endif;
Expand Down Expand Up @@ -1011,7 +1011,7 @@ public function show_screen_options() {
}

/**
* Filters the screen settings text displayed in the Screen Options tab.
* Filters the screen settings text displayed in the Display Options tab.
*
* @since 3.0.0
*
Expand All @@ -1025,11 +1025,11 @@ public function show_screen_options() {
}

/**
* Filters whether to show the Screen Options tab.
* Filters whether to show the Display Options tab.
*
* @since 3.2.0
*
* @param bool $show_screen Whether to show Screen Options tab.
* @param bool $show_screen Whether to show Display Options tab.
* Default true.
* @param WP_Screen $screen Current WP_Screen instance.
*/
Expand All @@ -1038,7 +1038,7 @@ public function show_screen_options() {
}

/**
* Renders the screen options tab.
* Renders the display options tab.
*
* @since 3.3.0
*
Expand All @@ -1063,7 +1063,7 @@ public function render_screen_options( $options = array() ) {

// Output optional wrapper.
if ( $options['wrap'] ) {
$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="' . esc_attr__( 'Screen Options Tab' ) . '">';
$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="' . esc_attr__( 'Display Options Tab' ) . '">';
$wrapper_end = '</div>';
}

Expand All @@ -1083,11 +1083,11 @@ public function render_screen_options( $options = array() ) {
echo $this->_screen_settings;

/**
* Filters whether to show the Screen Options submit button.
* Filters whether to show the Display Options submit button.
*
* @since 4.4.0
*
* @param bool $show_button Whether to show Screen Options submit button.
* @param bool $show_button Whether to show Display Options submit button.
* Default false.
* @param WP_Screen $screen Current WP_Screen instance.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/upgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ function upgrade_300() {
add_site_option( 'siteurl', '' );
}

// 3.0 screen options key name changes.
// 3.0 display options key name changes.
if ( wp_should_upgrade_global_tables() ) {
$sql = "DELETE FROM $wpdb->usermeta
WHERE meta_key LIKE %s
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/link-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
'widgets.php'
) . '</p>' .
'<p>' . __( 'Links may be separated into Link Categories; these are different than the categories used on your posts.' ) . '</p>' .
'<p>' . __( 'You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.' ) . '</p>',
'<p>' . __( 'You can customize the display of this screen using the Display Options tab and/or the dropdown filters above the links table.' ) . '</p>',
)
);
get_current_screen()->add_help_tab(
Expand Down
Loading
Loading