Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-24 21:32:51 +02:00
Code Issues Projects Releases Wiki Activity

Menus: Use a label of "Display location" for individual nav menu settings.

Browse Source 
While "Menu/Theme locations" was descriptive of what the choices listed were, in the context of editing an individual nav menu it is more descriptive to use a setting label that tells you what it is you are affecting for that nav menu, which is where it will be displayed. Technically multiple locations can be chosen, but in practice that appears to be rare enough that we can avoid an awkward "location(s)" type string.

props Fencer04 for the initial patch.
fixes #38525.

Built from https://develop.svn.wordpress.org/trunk@39098


git-svn-id: http://core.svn.wordpress.org/trunk@39040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2016-11-02 22:11:31 +00:00
parent 5666292dda
commit 6485e5e3cf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/nav-menus.php
View File

@ -808,7 +808,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
<?php if ( current_theme_supports( 'menus' ) ) : ?> <?php if ( current_theme_supports( 'menus' ) ) : ?>
<fieldset class="menu-settings-group menu-theme-locations"> <fieldset class="menu-settings-group menu-theme-locations">
<legend class="menu-settings-group-name howto"><?php _e( 'Theme locations' ); ?></legend> <legend class="menu-settings-group-name howto"><?php _e( 'Display location' ); ?></legend>
<?php foreach ( $locations as $location => $description ) : ?> <?php foreach ( $locations as $location => $description ) : ?>
<div class="menu-settings-input checkbox-input"> <div class="menu-settings-input checkbox-input">
<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" /> <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />

2
wp-includes/customize/class-wp-customize-nav-menu-control.php
View File

@ -64,7 +64,7 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
<?php if ( current_theme_supports( 'menus' ) ) : ?> <?php if ( current_theme_supports( 'menus' ) ) : ?>
<ul class="menu-settings"> <ul class="menu-settings">
<li class="customize-control"> <li class="customize-control">
<span class="customize-control-title"><?php _e( 'Menu Locations' ); ?></span> <span class="customize-control-title"><?php _e( 'Display Location' ); ?></span>
</li> </li>
<?php foreach ( get_registered_nav_menus() as $location => $description ) : ?> <?php foreach ( get_registered_nav_menus() as $location => $description ) : ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-beta1-39097'; $wp_version = '4.7-beta1-39098';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.