WordPress 4.3-scripts

[autoinstalls/wordpress.git] / wp-admin / nav-menus.php

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 5f99e720c05e616120417ae3b103f7ffd2e7139b..ed9d0523337016517b56df405c1939a56493665f 100644 (file)
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -231,7 +231,7 @@ switch ( $action ) {
                check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
                if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
                check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
                if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )

-                       $messages[] = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';

                break;
 
        case 'delete':
                break;
 
        case 'delete':


@@ -248,9 +248,9 @@ switch ( $action ) {
                        break;
 
                if ( is_wp_error( $deletion ) )
                        break;
 
                if ( is_wp_error( $deletion ) )

-                       $messages[] = '<div id="message" class="error"><p>' . $deletion->get_error_message() . '</p></div>';
+                       $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';

                else
                else

-                       $messages[] = '<div id="message" class="updated"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';

                break;
 
        case 'delete_menus':
                break;
 
        case 'delete_menus':


@@ -261,13 +261,13 @@ switch ( $action ) {
 
                        $deletion = wp_delete_nav_menu( $menu_id_to_delete );
                        if ( is_wp_error( $deletion ) ) {
 
                        $deletion = wp_delete_nav_menu( $menu_id_to_delete );
                        if ( is_wp_error( $deletion ) ) {

-                               $messages[] = '<div id="message" class="error"><p>' . $deletion->get_error_message() . '</p></div>';
+                               $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';

                                $deletion_error = true;
                        }
                }
 
                if ( empty( $deletion_error ) )
                                $deletion_error = true;
                        }
                }
 
                if ( empty( $deletion_error ) )

-                       $messages[] = '<div id="message" class="updated"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';

                break;
 
        case 'update':
                break;
 
        case 'update':


@@ -296,7 +296,7 @@ switch ( $action ) {
                                $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
 
                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
                                $_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
 
                                if ( is_wp_error( $_nav_menu_selected_id ) ) {

-                                       $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+                                       $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';

                                } else {
                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                        $nav_menu_selected_id = $_nav_menu_selected_id;
                                } else {
                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                        $nav_menu_selected_id = $_nav_menu_selected_id;


@@ -327,7 +327,7 @@ switch ( $action ) {
                                        exit();
                                }
                        } else {
                                        exit();
                                }
                        } else {

-                               $messages[] = '<div id="message" class="error"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+                               $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';

                        }
 
                // Update existing menu.
                        }
 
                // Update existing menu.


@@ -337,7 +337,7 @@ switch ( $action ) {
 
                        $menu_title = trim( esc_html( $_POST['menu-name'] ) );
                        if ( ! $menu_title ) {
 
                        $menu_title = trim( esc_html( $_POST['menu-name'] ) );
                        if ( ! $menu_title ) {

-                               $messages[] = '<div id="message" class="error"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+                               $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';

                                $menu_title = $_menu_object->name;
                        }
 
                                $menu_title = $_menu_object->name;
                        }
 


@@ -345,7 +345,7 @@ switch ( $action ) {
                                $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
                                        $_menu_object = $_nav_menu_selected_id;
                                $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
                                if ( is_wp_error( $_nav_menu_selected_id ) ) {
                                        $_menu_object = $_nav_menu_selected_id;

-                                       $messages[] = '<div id="message" class="error"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+                                       $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';

                                } else {
                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                        $nav_menu_selected_title = $_menu_object->name;
                                } else {
                                        $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
                                        $nav_menu_selected_title = $_menu_object->name;


@@ -354,7 +354,13 @@ switch ( $action ) {
 
                        // Update menu items.
                        if ( ! is_wp_error( $_menu_object ) ) {
 
                        // Update menu items.
                        if ( ! is_wp_error( $_menu_object ) ) {

-                               $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) );
+                               $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
+
+                               // If the menu ID changed, redirect to the new URL.
+                               if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
+                                       wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
+                                       exit();
+                               }

                        }
                }
                break;
                        }
                }
                break;


@@ -374,7 +380,7 @@ switch ( $action ) {
                        // Set menu locations
                        set_theme_mod( 'nav_menu_locations', $menu_locations );
 
                        // Set menu locations
                        set_theme_mod( 'nav_menu_locations', $menu_locations );
 

-                       $messages[] = '<div id="message" class="updated"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
+                       $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';

                }
                break;
 }
                }
                break;
 }


@@ -467,6 +473,8 @@ if ( current_theme_supports( 'menus' ) ) {
 /*
  * Ensure the user will be able to scroll horizontally
  * by adding a class for the max menu depth.
 /*
  * Ensure the user will be able to scroll horizontally
  * by adding a class for the max menu depth.

+ *
+ * @global int $_wp_nav_menu_max_depth

  */
 global $_wp_nav_menu_max_depth;
 $_wp_nav_menu_max_depth = 0;
  */
 global $_wp_nav_menu_max_depth;
 $_wp_nav_menu_max_depth = 0;


@@ -477,7 +485,14 @@ if ( is_nav_menu( $nav_menu_selected_id ) ) {
        $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
 }
 
        $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
 }
 

-function wp_nav_menu_max_depth($classes) {
+/**
+ *
+ * @global int $_wp_nav_menu_max_depth
+ *
+ * @param string $classes
+ * @return string
+ */
+function wp_nav_menu_max_depth( $classes ) {

        global $_wp_nav_menu_max_depth;
        return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }
        global $_wp_nav_menu_max_depth;
        return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }


@@ -517,7 +532,7 @@ if ( ! $locations_screen ) : // Main tab
        $editing_menus  = '<p>' . __( 'Each custom 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>';
        $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>';
        $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>';
        $editing_menus  = '<p>' . __( 'Each custom 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>';
        $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>';
        $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>';

-       $editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
+       $editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';

        $editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
        $editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
 
        $editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
        $editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
 


@@ -541,7 +556,7 @@ endif;
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>' .

        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 


@@ -549,11 +564,28 @@ get_current_screen()->set_help_sidebar(
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">

+       <h1><?php echo esc_html( __( 'Menus' ) ); ?>
+               <?php
+               if ( current_user_can( 'customize' ) ) :
+                       $focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+                       printf(
+                               ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
+                               esc_url( add_query_arg( array(
+                                       array( 'autofocus' => $focus ),
+                                       'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+                               ), admin_url( 'customize.php' ) ) ),
+                               __( 'Manage in Customizer' )
+                       );
+               endif;
+               ?>
+       </h1>

        <h2 class="nav-tab-wrapper">
                <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
                <?php if ( $num_locations && $menu_count ) : ?>
                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
        <h2 class="nav-tab-wrapper">
                <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
                <?php if ( $num_locations && $menu_count ) : ?>
                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>

-               <?php endif; ?>
+               <?php
+                       endif;
+               ?>

        </h2>
        <?php
        foreach( $messages as $message ) :
        </h2>
        <?php
        foreach( $messages as $message ) :


@@ -562,7 +594,11 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
        ?>
        <?php
        if ( $locations_screen ) :
        ?>
        <?php
        if ( $locations_screen ) :

-               echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+               if ( 1 == $num_locations ) {
+                       echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+               } else {
+                       echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+               }

        ?>
        <div id="menu-locations-wrap">
                <form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
        ?>
        <div id="menu-locations-wrap">
                <form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">


@@ -573,16 +609,10 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
                                        <th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
                                </tr>
                                </thead>
                                        <th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
                                </tr>
                                </thead>

-                               <!--<tfoot>
-                               <tr>
-                                       <th scope="col" class="manage-column column-locations"><?php _e( 'Theme Location' ); ?></th>
-                                       <th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
-                               </tr>
-                               </tfoot>-->

                                <tbody class="menu-locations">
                                <?php foreach ( $locations as $_location => $_name ) { ?>
                                <tbody class="menu-locations">
                                <?php foreach ( $locations as $_location => $_name ) { ?>

-                                       <tr id="menu-locations-row">
-                                               <td class="menu-location-title"><strong><?php echo $_name; ?></strong></td>
+                                       <tr class="menu-locations-row">
+                                               <td class="menu-location-title"><label for="locations-<?php echo $_location; ?>"><?php echo $_name; ?></label></td>

                                                <td class="menu-location-menus">
                                                        <select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
                                                                <option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
                                                <td class="menu-location-menus">
                                                        <select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
                                                                <option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>


@@ -597,7 +627,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
                                                                <?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
                                                                <span class="locations-edit-menu-link">
                                                                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">
                                                                <?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
                                                                <span class="locations-edit-menu-link">
                                                                        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">

-                                                                               <?php _ex( 'Edit', 'menu' ); ?>
+                                                                               <span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>

                                                                        </a>
                                                                </span>
                                                                <?php endif; ?>
                                                                        </a>
                                                                </span>
                                                                <?php endif; ?>


@@ -606,9 +636,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
                                                                                <?php _ex( 'Use new menu', 'menu' ); ?>
                                                                        </a>
                                                                </span>
                                                                                <?php _ex( 'Use new menu', 'menu' ); ?>
                                                                        </a>
                                                                </span>

-                                                       </div><!-- #locations-row-links -->
+                                                       </div><!-- .locations-row-links -->

                                                </td><!-- .menu-location-menus -->
                                                </td><!-- .menu-location-menus -->

-                                       </tr><!-- #menu-locations-row -->
+                                       </tr><!-- .menu-locations-row -->

                                <?php } // foreach ?>
                                </tbody>
                        </table>
                                <?php } // foreach ?>
                                </tbody>
                        </table>


@@ -633,8 +663,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
                <?php else : ?>
                        <form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
                        <input type="hidden" name="action" value="edit" />
                <?php else : ?>
                        <form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
                        <input type="hidden" name="action" value="edit" />

-                       <label for="menu" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
-                       <select name="menu" id="menu">
+                       <label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
+                       <select name="menu" id="select-menu-to-edit">

                                <?php if ( $add_new_screen ) : ?>
                                        <option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
                                <?php endif; ?>
                                <?php if ( $add_new_screen ) : ?>
                                        <option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
                                <?php endif; ?>


@@ -684,7 +714,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
                <div class="clear"></div>
 
 
                <div class="clear"></div>
 

-               <form id="nav-menu-meta" action="" class="nav-menu-meta" method="post" enctype="multipart/form-data">
+               <form id="nav-menu-meta" class="nav-menu-meta" method="post" enctype="multipart/form-data">

                        <input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                        <input type="hidden" name="action" value="add-menu-item" />
                        <?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>
                        <input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                        <input type="hidden" name="action" value="add-menu-item" />
                        <?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>


@@ -694,7 +724,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
        </div><!-- /#menu-settings-column -->
        <div id="menu-management-liquid">
                <div id="menu-management">
        </div><!-- /#menu-settings-column -->
        <div id="menu-management-liquid">
                <div id="menu-management">

-                       <form id="update-nav-menu" action="" method="post" enctype="multipart/form-data">
+                       <form id="update-nav-menu" method="post" enctype="multipart/form-data">

                                <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
                                        <?php
                                        wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
                                <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
                                        <?php
                                        wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );


@@ -784,7 +814,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
                                                        </span><!-- END .delete-action -->
                                                        <?php endif; ?>
                                                        <div class="publishing-action">
                                                        </span><!-- END .delete-action -->
                                                        <?php endif; ?>
                                                        <div class="publishing-action">

-                                                               <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
+                                                               <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>

                                                        </div><!-- END .publishing-action -->
                                                </div><!-- END .major-publishing-actions -->
                                        </div><!-- /#nav-menu-footer -->
                                                        </div><!-- END .publishing-action -->
                                                </div><!-- END .major-publishing-actions -->
                                        </div><!-- /#nav-menu-footer -->