' . __('Select menu items (pages, categories, links) from the boxes at left to begin building your custom menu.') . '
'; + $result .= '' . __( 'Add menu items from the column on the left.' ) . '
'; $result .= 'X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-admin/includes/nav-menu.php diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 7c338027..43a807c8 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -7,39 +7,51 @@ * @since 3.0.0 * @uses Walker_Nav_Menu */ -class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { +class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { /** + * Starts the list before the elements are added. + * * @see Walker_Nav_Menu::start_lvl() + * * @since 3.0.0 * * @param string $output Passed by reference. + * @param int $depth Depth of menu item. Used for padding. + * @param array $args Not used. */ - function start_lvl(&$output) {} + public function start_lvl( &$output, $depth = 0, $args = array() ) {} /** + * Ends the list of after the elements are added. + * * @see Walker_Nav_Menu::end_lvl() + * * @since 3.0.0 * * @param string $output Passed by reference. + * @param int $depth Depth of menu item. Used for padding. + * @param array $args Not used. */ - function end_lvl(&$output) { - } + public function end_lvl( &$output, $depth = 0, $args = array() ) {} /** - * @see Walker::start_el() + * Start the element output. + * + * @see Walker_Nav_Menu::start_el() * @since 3.0.0 * + * @global int $_wp_nav_menu_max_depth + * * @param string $output Passed by reference. Used to append additional content. - * @param object $item Menu item data object. - * @param int $depth Depth of menu item. Used for padding. - * @param object $args + * @param object $item Menu item data object. + * @param int $depth Depth of menu item. Used for padding. + * @param array $args Not used. + * @param int $id Not used. */ - function start_el(&$output, $item, $depth, $args) { + public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { global $_wp_nav_menu_max_depth; $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; - $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; - ob_start(); $item_id = esc_attr( $item->ID ); $removed_args = array( @@ -58,7 +70,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { $original_title = false; } elseif ( 'post_type' == $item->type ) { $original_object = get_post( $item->object_id ); - $original_title = $original_object->post_title; + $original_title = get_the_title( $original_object->ID ); } $classes = array( @@ -79,13 +91,17 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { $title = sprintf( __('%s (Pending)'), $item->title ); } - $title = empty( $item->label ) ? $title : $item->label; + $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label; + + $submenu_text = ''; + if ( 0 == $depth ) + $submenu_text = 'style="display: none;"'; ?>
-
+
-
+
+
+ +
+url ) . '">' . esc_html( $original_title ) . '' ); ?>
@@ -182,10 +209,10 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { 'action' => 'delete-menu-item', 'menu-item' => $item_id, ), - remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) + admin_url( 'nav-menus.php' ) ), 'delete-menu_item_' . $item_id - ); ?>"> | |' . __('The current theme does not natively support menus, but you can use the “Custom Menu” widget to add any menus you create here to the theme’s sidebar.') . '
'; - return; - } - - $locations = get_registered_nav_menus(); - $menus = wp_get_nav_menus(); - $menu_locations = get_nav_menu_locations(); - $num_locations = count( array_keys($locations) ); + * @since 3.6.0 + * + * @global bool $one_theme_location_no_menus to determine if no menus exist + * + * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu + * @return string Disabled attribute if at least one menu exists, false if not +*/ +function wp_nav_menu_disabled_check( $nav_menu_selected_id ) { + global $one_theme_location_no_menus; - echo '' . 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) ) . '
'; + if ( $one_theme_location_no_menus ) + return false; - foreach ( $locations as $location => $description ) { - ?> -- -
- -- - -
- $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1; - $current_tab = 'create'; - if ( isset( $_REQUEST['customlink-tab'] ) && in_array( $_REQUEST['customlink-tab'], array('create', 'all') ) ) { - $current_tab = $_REQUEST['customlink-tab']; - } - - $removed_args = array( - 'action', - 'customlink-tab', - 'edit-menu-item', - 'menu-item', - 'page-tab', - '_wpnonce', - ); + $_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1; ?>+ +
- -- -
- -- -
++ +
- - class="button-secondary submit-add-to-menu" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> + class="button-secondary submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> +
@@ -575,6 +619,9 @@ function wp_nav_menu_item_link_meta_box() { * * @since 3.0.0 * + * @global int $_nav_menu_placeholder + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. * @param string $post_type The post type object. */ @@ -583,7 +630,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { $post_type_name = $post_type['args']->name; - // paginate browsing for large numbers of post objects + // Paginate browsing for large numbers of post objects. $per_page = 50; $pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1; $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0; @@ -610,8 +657,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { return; } - $post_type_object = get_post_type_object($post_type_name); - $num_pages = $get_posts->max_num_pages; $page_links = paginate_links( array( @@ -630,9 +675,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { 'current' => $pagenum )); - if ( !$posts ) - $error = '- - - 'submit-quick-search-posttype-' . $post_type_name ) ); ?> + + + 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
-- - class="button-secondary submit-add-to-menu" value="" name="add-post-type-menu-item" id="submit-posttype-" /> + class="button-secondary submit-add-to-menu right" value="" name="add-post-type-menu-item" id="" /> +
@@ -796,6 +880,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { * * @since 3.0.0 * + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. * @param string $taxonomy The taxonomy object. */ @@ -803,7 +889,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { global $nav_menu_selected_id; $taxonomy_name = $taxonomy['args']->name; - // paginate browsing for large numbers of objects + // Paginate browsing for large numbers of objects. $per_page = 50; $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1; $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0; @@ -814,7 +900,6 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { 'hide_empty' => false, 'hierarchical' => 1, 'include' => '', - 'include_last_update_time' => false, 'number' => $per_page, 'offset' => $offset, 'order' => 'ASC', @@ -875,10 +960,22 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { ?>- - - 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?> + + + 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
-' . __('Select menu items (pages, categories, links) from the boxes at left to begin building your custom menu.') . '
'; + $result .= '' . __( 'Add menu items from the column on the left.' ) . '
'; $result .= '' . $menu_item_db_id->get_error_message() . '
' . sprintf( __( '%1$s has been updated.' ), $nav_menu_selected_title ) . '