Ticket #14325: 14325-patch1.diff

wp-admin/includes/nav-menu.php

@@ -722 +722 @@
                                 <?php
                                 $args['walker'] = $walker;
 
-                                // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
-                                if ( 'page' == $post_type_name ) {
-                                        $front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
-                                        if ( ! empty( $front_page ) ) {
-                                                $front_page_obj = get_post( $front_page );
-                                                $front_page_obj->_add_to_top = true;
-                                                $front_page_obj->label = sprintf( _x('Home: %s', 'nav menu front page title'), $front_page_obj->post_title );
-                                                array_unshift( $posts, $front_page_obj );
-                                        } else {
-                                                $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-                                                array_unshift( $posts, (object) array(
-                                                        '_add_to_top' => true,
-                                                        'ID' => 0,
-                                                        'object_id' => $_nav_menu_placeholder,
-                                                        'post_content' => '',
-                                                        'post_excerpt' => '',
-                                                        'post_parent' => '',
-                                                        'post_title' => _x('Home', 'nav menu home label'),
-                                                        'post_type' => 'nav_menu_item',
-                                                        'type' => 'custom',
-                                                        'url' => home_url('/'),
-                                                ) );
-                                        }
-                                }
-
                                 $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type );
                                 $checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
 

wp-admin/js/nav-menu.dev.js

@@ -39 +39 @@
                         this.attachThemeLocationsListeners();
 
                         this.attachTabsPanelListeners();
+                        this.attachHomeLinkListener();
 
                         this.attachUnsavedChangesListener();
 
@@ -554 +555 @@
                                 }
                         }, processMethod, callback);
                 },
+                
+                addHomeLink : function() {
+                        var url = $( '#home-link-url' ).val();
+                        var label = $( '#home-link-label' ).val();
+                        api.addLinkToMenu( url, label );
+                },
 
                 addItemToMenu : function(menuItem, processMethod, callback) {
                         var menu = $('#menu').val(),
@@ -611 +618 @@
                 registerChange : function() {
                         api.menusChanged = true;
                 },
+                
+                attachHomeLinkListener : function() {
+                        $( '#add-home-link' ).bind( 'click', function( e ) {
+                                api.registerChange();
+                                api.addHomeLink();
+                                return false;
+                        } );
+                },
 
                 attachTabsPanelListeners : function() {
                         $('#menu-settings-column').bind('click', function(e) {

wp-admin/nav-menus.php

@@ -561 +561 @@
                                                                 <?php endif; ?>
                                                                 <br class="clear" />
                                                                 <div class="publishing-action">
+                                                                        <?php
+                                                                        
+                                                                        // Add Home Link
+                                                                        if ( ! empty( $nav_menu_selected_id ) ) {
+                                                                                $front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
+                                                                                if ( ! empty( $front_page ) ) {
+                                                                                        $front_page_obj = get_post( $front_page );
+                                                                                        $home_link_label = sprintf( _x('Home: %s', 'nav menu front page title'), $front_page_obj->post_title );
+                                                                                        $home_link_url = get_permalink( $front_page );
+                                                                                } else {
+                                                                                        $home_link_label = _x('Home', 'nav menu home label');
+                                                                                        $home_link_url = home_url('/');
+                                                                                }
+                                                                                
+                                                                                ?>
+                                                                                <input type="hidden" id="home-link-label" name="home_link_label" value="<?php echo $home_link_label; ?>" />
+                                                                                <input type="hidden" id="home-link-url" name="home_link_url" value="<?php echo $home_link_url; ?>" />
+                                                                                <?php
+                                                                                
+                                                                                submit_button( __( 'Add Home Link' ), 'button-secondary', 'add_home_link', false, array( 'id' => 'add-home-link' ) );
+                                                                        }
+                                                                        
+                                                                        ?>
                                                                         <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
                                                                 </div><!-- END .publishing-action -->