![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 41868
- Timestamp:
- 10/15/2017 10:22:59 PM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 6 edited
-
wp-admin/js/customize-nav-menus.js (modified) (4 diffs)
-
wp-admin/nav-menus.php (modified) (2 diffs)
-
wp-includes/class-wp-customize-nav-menus.php (modified) (3 diffs)
-
wp-includes/class-wp-customize-widgets.php (modified) (1 diff)
-
wp-includes/js/customize-selective-refresh.js (modified) (1 diff)
-
wp-includes/widgets/class-wp-nav-menu-widget.php (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/js/customize-nav-menus.js
r41860 r41868 2460 2460 this._setupTitle(); 2461 2461 2462 // Add menu to CustomMenu widgets.2462 // Add menu to Navigation Menu widgets. 2463 2463 if ( menu ) { 2464 2464 name = displayNavMenuName( menu.name ); … … 2510 2510 control._handleDeletion(); 2511 2511 } else { 2512 // Update names in the CustomMenu widgets.2512 // Update names in the Navigation Menu widgets. 2513 2513 name = displayNavMenuName( to.name ); 2514 2514 api.control.each( function( widgetControl ) { … … 2652 2652 }); 2653 2653 2654 // Remove the menu from any CustomMenu widgets.2654 // Remove the menu from any Navigation Menu widgets. 2655 2655 api.control.each(function( widgetControl ) { 2656 2656 if ( ! widgetControl.extended( api.controlConstructor.widget_form ) || 'nav_menu' !== widgetControl.params.widget_id_base ) { … … 3064 3064 api.section.add( newSection ); 3065 3065 3066 // Update the values for nav menus in CustomMenu controls.3066 // Update the values for nav menus in Navigation Menu controls. 3067 3067 api.control.each( function( setting ) { 3068 3068 if ( ! setting.extended( api.controlConstructor.widget_form ) || 'nav_menu' !== setting.params.widget_id_base ) { -
trunk/src/wp-admin/nav-menus.php
r40313 r41868 515 515 516 516 if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) 517 $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a “ CustomMenu” widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';517 $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a “Navigation Menu” widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>'; 518 518 519 519 if ( ! $locations_screen ) : // Main tab 520 $overview = '<p>' . __( 'This screen is used for managing your customnavigation menus.' ) . '</p>';520 $overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>'; 521 521 /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */ 522 $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “ Custom Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custommenus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';522 $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>'; 523 523 $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>'; 524 524 $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>'; … … 542 542 ) ); 543 543 544 $editing_menus = '<p>' . __( 'Each custommenu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';544 $editing_menus = '<p>' . __( 'Each navigation menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>'; 545 545 $editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>'; 546 546 $editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>'; -
trunk/src/wp-includes/class-wp-customize-nav-menus.php
r41823 r41868 557 557 if ( current_theme_supports( 'widgets' ) ) { 558 558 /* translators: URL to the widgets panel of the customizer */ 559 $description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a “ CustomMenu” widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';559 $description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a “Navigation Menu” widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>'; 560 560 } else { 561 561 $description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>'; … … 581 581 if ( current_theme_supports( 'widgets' ) ) { 582 582 /* translators: URL to the widgets panel of the customizer */ 583 $description .= '<p>' . sprintf( __( 'If your theme has widget areas, you can also add menus there. Visit the <a href="%s">Widgets panel</a> and add a “ CustomMenu widget” to display a menu in a sidebar or footer.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';583 $description .= '<p>' . sprintf( __( 'If your theme has widget areas, you can also add menus there. Visit the <a href="%s">Widgets panel</a> and add a “Navigation Menu widget” to display a menu in a sidebar or footer.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>'; 584 584 } 585 585 … … 762 762 * @since 4.7.0 Each array item now includes a `$type_label` in addition to `$title`, `$type`, and `$object`. 763 763 * 764 * @param array $item_types Custommenu item types.764 * @param array $item_types Navigation menu item types. 765 765 */ 766 766 $item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types ); -
trunk/src/wp-includes/class-wp-customize-widgets.php
r41640 r41868 1366 1366 /* 1367 1367 * Make sure that other setting changes have previewed since this widget 1368 * may depend on them (e.g. Menus being present for CustomMenu widget).1368 * may depend on them (e.g. Menus being present for Navigation Menu widget). 1369 1369 */ 1370 1370 if ( ! did_action( 'customize_preview_init' ) ) { -
trunk/src/wp-includes/js/customize-selective-refresh.js
r41726 r41868 884 884 * Only trigger renders on (nested) partials that have been not been 885 885 * handled yet. An example where this would apply is a nav menu 886 * embedded inside of a custommenu widget. When the widget's title886 * embedded inside of a navigation menu widget. When the widget's title 887 887 * is updated, the entire widget will re-render and then the event 888 888 * will be triggered for the nested nav menu to do any initialization. -
trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php
r41867 r41868 9 9 10 10 /** 11 * Core class used to implement the CustomMenu widget.11 * Core class used to implement the Navigation Menu widget. 12 12 * 13 13 * @since 3.0.0 … … 18 18 19 19 /** 20 * Sets up a new CustomMenu widget instance.20 * Sets up a new Navigation Menu widget instance. 21 21 * 22 22 * @since 3.0.0 … … 24 24 public function __construct() { 25 25 $widget_ops = array( 26 'description' => __( 'Add a custommenu to your sidebar.' ),26 'description' => __( 'Add a navigation menu to your sidebar.' ), 27 27 'customize_selective_refresh' => true, 28 28 ); 29 parent::__construct( 'nav_menu', __(' CustomMenu'), $widget_ops );29 parent::__construct( 'nav_menu', __('Navigation Menu'), $widget_ops ); 30 30 } 31 31 32 32 /** 33 * Outputs the content for the current CustomMenu widget instance.33 * Outputs the content for the current Navigation Menu widget instance. 34 34 * 35 35 * @since 3.0.0 … … 37 37 * @param array $args Display arguments including 'before_title', 'after_title', 38 38 * 'before_widget', and 'after_widget'. 39 * @param array $instance Settings for the current CustomMenu widget instance.39 * @param array $instance Settings for the current Navigation Menu widget instance. 40 40 */ 41 41 public function widget( $args, $instance ) { … … 64 64 65 65 /** 66 * Filters the arguments for the CustomMenu widget.66 * Filters the arguments for the Navigation Menu widget. 67 67 * 68 68 * @since 4.2.0 … … 70 70 * 71 71 * @param array $nav_menu_args { 72 * An array of arguments passed to wp_nav_menu() to retrieve a custommenu.72 * An array of arguments passed to wp_nav_menu() to retrieve a navigation menu. 73 73 * 74 74 * @type callable|bool $fallback_cb Callback to fire if the menu doesn't exist. Default empty. … … 85 85 86 86 /** 87 * Handles updating settings for the current CustomMenu widget instance.87 * Handles updating settings for the current Navigation Menu widget instance. 88 88 * 89 89 * @since 3.0.0 … … 106 106 107 107 /** 108 * Outputs the settings form for the CustomMenu widget.108 * Outputs the settings form for the Navigation Menu widget. 109 109 * 110 110 * @since 3.0.0
Note:
See TracChangeset
for help on using the changeset viewer.
