<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13342] trunk/wp-admin/custom-navigation.php: Cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13342">13342</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-23 20:48:50 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanups. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-navigation.php (13341 => 13342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php        2010-02-23 20:38:41 UTC (rev 13341)
+++ trunk/wp-admin/custom-navigation.php        2010-02-23 20:48:50 UTC (rev 13342)
</span><span class="lines">@@ -12,6 +12,9 @@
</span><span class="cx">
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><ins>+if ( ! current_user_can('switch_themes') )
+        wp_die( __( 'Cheatin&#8217; uh?' ));
+
</ins><span class="cx"> wp_admin_css( 'custom-navigation' );
</span><span class="cx"> wp_enqueue_script( 'jquery' );
</span><span class="cx"> wp_enqueue_script( 'jquery-ui-draggable' );
</span><span class="lines">@@ -26,528 +29,490 @@
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx"> require_once (ABSPATH . WPINC . '/custom-navigation.php');
</span><span class="cx">
</span><del>-wp_custom_navigation();
-
</del><span class="cx"> function wp_custom_nav_reset() {
</span><span class="cx">         wp_custom_navigation_setup(true);
</span><span class="cx">
</span><span class="cx">         return true;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><del>-/*-----------------------------------------------------------------------------------*/
-/* Custom Navigation Admin Interface
-/* wp_custom_navigation() is the main function for the Custom Navigation
-/* See functions in admin-functions.php
-/*-----------------------------------------------------------------------------------*/
</del><ins>+$messagesdiv = '';
+$menu_id_in_edit = 0;
</ins><span class="cx">
</span><del>-function wp_custom_navigation() {
-        global $wpdb, $user_ID;
-        ?>
</del><ins>+// Check which menu is selected and if menu is in edit already
+if ( isset( $_POST['switch_menu'] ) )
+        $menu_selected_id = (int) $_POST['menu_select'];
+elseif ( isset( $_POST['menu_id_in_edit'] ) )
+        $menu_selected_id = (int) $_POST['menu_id_in_edit'];
+else
+        $menu_selected_id = 0;
</ins><span class="cx">
</span><del>-        <div class="wrap">
-        <div id="no-js"><h3><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Menus functionality.'); ?></h3></div>
</del><ins>+// Default Menu to show
+$custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+if ( !empty( $custom_menus ) )
+        $menu_selected_id = $custom_menus[0]->term_id;
</ins><span class="cx">
</span><del>-        <?php
-        $messagesdiv = '';
-        $menu_id_in_edit = 0;
</del><ins>+$menu_title = '';
+if ( $menu_selected_id > 0 ) {
+        foreach ( $custom_menus as $menu ) {
+                if ( $menu->term_id == $menu_selected_id ) {
+                        $menu_title = $menu->name;
+                        break;
+                }
+        }
+}
</ins><span class="cx">
</span><del>-        // Get the theme name
-        $themename = get_current_theme();
</del><ins>+if ( isset( $_POST['set_wp_menu'] ) ) {
+        // @todo validate set_wp_menu
+        update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
+        $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Menu has been updated!') . '</p></div>';
+}
</ins><span class="cx">
</span><del>-        // Check which menu is selected and if menu is in edit already
-        if ( isset( $_POST['switch_menu'] ) )
-                $menu_selected_id = (int) $_POST['menu_select'];
-        elseif ( isset( $_POST['menu_id_in_edit'] ) )
-                $menu_selected_id = (int) $_POST['menu_id_in_edit'];
-        else
-                $menu_selected_id = 0;
</del><ins>+if ( isset( $_POST['licount'] ) )
+        $postCounter = $_POST['licount'];
+else
+        $postCounter = 0;
</ins><span class="cx">
</span><del>-        // Default Menu to show
-        $custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
-         if ( !empty( $custom_menus ) )
-                $menu_selected_id = $custom_menus[0]->term_id;
</del><ins>+// Create a new menu. Menus are stored as terms in the 'menu' taxonomy.
+if ( isset( $_POST['add_menu'] ) ) {
+        $insert_menu_name = $_POST['add_menu_name'];
</ins><span class="cx">
</span><del>-        $menu_title = '';
-        if ( $menu_selected_id > 0 ) {
-                foreach ( $custom_menus as $menu ) {
-                        if ( $menu->term_id == $menu_selected_id ) {
-                                $menu_title = $menu->name;
-                                break;
</del><ins>+        if ( $insert_menu_name != '' ) {
+                $existing_term = get_term_by( 'name', $insert_menu_name, 'nav_menu' );
+                if ( $existing_term ) {
+                        $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . esc_html( sprintf( e__('A menu named "%s" already exists; please try another name.'), $existing_term->name ) ) . '</p></div>';
+                } else {
+                        $term = wp_insert_term( $insert_menu_name, 'nav_menu' );
+                        if ( !is_wp_error($term) ) {
+                                $term = get_term($term['term_id'], 'nav_menu');
+                                $custom_menus[$term->term_id] = $term;
+                                $menu_selected_id = $term->term_id;
+                                $menu_id_in_edit = $menu_selected_id;
+                                $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . esc_html( sprintf( __('"%s" menu has been created!'), $term->name ) ) . '</p></div>';
+
+                                $postCounter = 0;
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><ins>+        } else {
+                $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('Please enter a valid menu name.') . '</p></div>';
</ins><span class="cx">         }
</span><ins>+}
</ins><span class="cx">
</span><del>-        if ( isset( $_POST['set_wp_menu'] ) ) {
-                // @todo validate set_wp_menu
-         update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
-                $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Menu has been updated!') . '</p></div>';
</del><ins>+if ( isset($_POST['reset_wp_menu']) ) {
+        $success = wp_custom_nav_reset();
+        if ( $success ) {
+                // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
+                $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been reset.') . '</p></div>';
+                // GET reset menu id
+                $custom_menus = array();
+                $menu_selected_id = 0;
+        } else {
+                // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
+                $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('The menu could not be reset. Please try again.') . '</p></div>';
</ins><span class="cx">         }
</span><ins>+} elseif ( $postCounter > 0 && $menu_selected_id > 0 ) {
+        $menu_objects = get_objects_in_term( $menu_selected_id, 'nav_menu' );
+        $menu_items = wp_custom_navigation_get_menu_items( $menu_objects );
</ins><span class="cx">
</span><del>-        if ( isset( $_POST['licount'] ) )
-                $postCounter = $_POST['licount'];
-        else
-         $postCounter = 0;
</del><ins>+        // Loop through all POST variables
+        for ( $k = 1; $k <= $postCounter; $k++ ) {
+                if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
+                if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
+                if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
+                if (isset($_POST['title'.$k])) { $custom_title = $_POST['title'.$k]; } else { $custom_title = ''; }
+                if (isset($_POST['linkurl'.$k])) { $custom_linkurl = $_POST['linkurl'.$k]; } else { $custom_linkurl = ''; }
+                if (isset($_POST['description'.$k])) { $custom_description = $_POST['description'.$k]; } else { $custom_description = ''; }
+                // doesn't seem to be used by UI
+                if (isset($_POST['icon'.$k])) { $icon = $_POST['icon'.$k]; } else { $icon = 0; }
+                if (isset($_POST['position'.$k])) { $position = $_POST['position'.$k]; } else { $position = 0; }
+                if (isset($_POST['linktype'.$k])) { $linktype = $_POST['linktype'.$k]; } else { $linktype = 'custom'; }
+                if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = $_POST['anchortitle'.$k]; } else { $custom_anchor_title = $custom_title; }
+                if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
</ins><span class="cx">
</span><del>-        // Create a new menu. Menus are stored as terms in the 'menu' taxonomy.
-        if ( isset( $_POST['add_menu'] ) ) {
-                 $insert_menu_name = $_POST['add_menu_name'];
</del><ins>+                $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
+                        'ping_status' => 0, 'post_parent' => 0, 'menu_order' => $position,
+                        'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'nav_menu' => $menu_title ),
+                        'post_content' => $custom_description, 'post_title' => $custom_title );
+                if ( $new_window )
+                        $post['post_content_filtered'] = '_blank';
+                else
+                        $post['post_content_filtered'] = '';
+                if ( $parent_id > 0 && isset( $_POST[ 'dbid' . $parent_id ] ) )
+                        $post[ 'post_parent' ] = (int) $_POST[ 'dbid' . $parent_id ];
</ins><span class="cx">
</span><del>-                 if ( $insert_menu_name != '' ) {
-                        $existing_term = get_term_by( 'name', $insert_menu_name, 'nav_menu' );
-                         if ( $existing_term ) {
-                                 $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . esc_html( sprintf( e__('A menu named "%s" already exists; please try another name.'), $existing_term->name ) ) . '</p></div>';
-                         } else {
-                                $term = wp_insert_term( $insert_menu_name, 'nav_menu' );
-                                if ( !is_wp_error($term) ) {
-                                        $term = get_term($term['term_id'], 'nav_menu');
-                                        $custom_menus[$term->term_id] = $term;
-                                         $menu_selected_id = $term->term_id;
-                                         $menu_id_in_edit = $menu_selected_id;
-                                         $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . esc_html( sprintf( __('"%s" menu has been created!'), $term->name ) ) . '</p></div>';
-
-                                        $postCounter = 0;
-                                 }
-                         }
-                 } else {
-                         $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('Please enter a valid menu name.') . '</p></div>';
-                 }
</del><ins>+                // New menu item
+                if ( $db_id == 0 ) {
+                        $db_id = wp_insert_post( $post );
+                } elseif ( isset( $menu_items[$db_id] ) ) {
+                        $post['ID'] = $db_id;
+                        wp_update_post( $post );
+                        unset( $menu_items[$db_id] );
+                }
+                update_post_meta($db_id, 'menu_type', $linktype);
+                update_post_meta($db_id, 'object_id', $object_id);
</ins><span class="cx">         }
</span><del>-
-        if ( isset($_POST['reset_wp_menu']) ) {
-         $success = wp_custom_nav_reset();
-         if ( $success ) {
-                 // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
-                        $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been reset.') . '</p></div>';
-                        // GET reset menu id
-                        $custom_menus = array();
-                        $menu_selected_id = 0;
-         } else {
-                 // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
-                        $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('The menu could not be reset. Please try again.') . '</p></div>';
-         }
-        } elseif ( $postCounter > 0 && $menu_selected_id > 0 ) {
-                $menu_objects = get_objects_in_term( $menu_selected_id, 'nav_menu' );
-                $menu_items = wp_custom_navigation_get_menu_items( $menu_objects );
-
-                // Loop through all POST variables
-                 for ( $k = 1; $k <= $postCounter; $k++ ) {
-                         if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
-                         if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
-                        if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
-                         if (isset($_POST['title'.$k])) { $custom_title = $_POST['title'.$k]; } else { $custom_title = ''; }
-                         if (isset($_POST['linkurl'.$k])) { $custom_linkurl = $_POST['linkurl'.$k]; } else { $custom_linkurl = ''; }
-                         if (isset($_POST['description'.$k])) { $custom_description = $_POST['description'.$k]; } else { $custom_description = ''; }
-                        // doesn't seem to be used by UI
-                        if (isset($_POST['icon'.$k])) { $icon = $_POST['icon'.$k]; } else { $icon = 0; }
-                         if (isset($_POST['position'.$k])) { $position = $_POST['position'.$k]; } else { $position = 0; }
-                         if (isset($_POST['linktype'.$k])) { $linktype = $_POST['linktype'.$k]; } else { $linktype = 'custom'; }
-                         if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = $_POST['anchortitle'.$k]; } else { $custom_anchor_title = $custom_title; }
-                         if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
-
-                        $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
-                                'ping_status' => 0, 'post_parent' => 0, 'menu_order' => $position,
-                                'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'nav_menu' => $menu_title ),
-                                'post_content' => $custom_description, 'post_title' => $custom_title );
-                        if ( $new_window )
-                                $post['post_content_filtered'] = '_blank';
-                        else
-                                $post['post_content_filtered'] = '';
-                        if ( $parent_id > 0 && isset( $_POST[ 'dbid' . $parent_id ] ) )
-                                $post[ 'post_parent' ] = (int) $_POST[ 'dbid' . $parent_id ];
-
-                        // New menu item
-                         if ( $db_id == 0 ) {
-                                $db_id = wp_insert_post( $post );
-                        } elseif ( isset( $menu_items[$db_id] ) ) {
-                                $post['ID'] = $db_id;
-                                wp_update_post( $post );
-                                unset( $menu_items[$db_id] );
-                        }
-                        update_post_meta($db_id, 'menu_type', $linktype);
-                        update_post_meta($db_id, 'object_id', $object_id);
</del><ins>+        if ( !empty( $menu_items ) ) {
+                foreach ( array_keys( $menu_items ) as $menu_id ) {
+                        wp_delete_post( $menu_id );
</ins><span class="cx">                 }
</span><del>-                if ( !empty( $menu_items ) ) {
-                        foreach ( array_keys( $menu_items ) as $menu_id ) {
-                                wp_delete_post( $menu_id );
-                        }
-                }
-                // DISPLAY SUCCESS MESSAGE IF POST CORRECT
-                $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been updated.') . '</p></div>';
</del><span class="cx">         }
</span><ins>+        // DISPLAY SUCCESS MESSAGE IF POST CORRECT
+        $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been updated.') . '</p></div>';
+}
</ins><span class="cx">
</span><del>-                 // DISPLAY Custom Navigation
-                 ?>
-                <?php screen_icon(); ?>
-                <h2 class="maintitle"><?php esc_html_e('Menus') ?></h2>
-                <div id="pages-left">
-                        <div class="inside">
-                        <?php
</del><ins>+?>
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2 class="maintitle"><?php esc_html_e('Menus') ?></h2>
</ins><span class="cx">
</span><del>-                                // CHECK if custom menu has been enabled
-                                $enabled_menu = get_option('wp_custom_nav_menu');
-                         $checked = strtolower($enabled_menu);
</del><ins>+        <div id="no-js"><h3><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Menus functionality.'); ?></h3></div>
+        <div id="pages-left">
+                <div class="inside">
+                <?php
+                        // CHECK if custom menu has been enabled
+                        $enabled_menu = get_option('wp_custom_nav_menu');
+                        $checked = strtolower($enabled_menu);
</ins><span class="cx">
</span><del>-                                if ( $checked != 'true' )
-                                        echo '<div id="message-enabled" class="error fade below-h2"><p><strong>' . __('Menu editing has not been Enabled yet. Please enable it in order to use it -------->') . '</strong></p></div>';
</del><ins>+                        if ( $checked != 'true' )
+                                echo '<div id="message-enabled" class="error fade below-h2"><p><strong>' . __('Menu editing has not been Enabled yet. Please enable it in order to use it -------->') . '</strong></p></div>';
+                ?>
+                <?php echo $messagesdiv; ?>
+                <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post" enctype="multipart/form-data">
</ins><span class="cx">
</span><del>-                        ?>
-                        <?php echo $messagesdiv; ?>
-                        <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post" enctype="multipart/form-data">
</del><ins>+                <input type="hidden" name="licount" id="licount" value="0" />
+                <input type="hidden" name="menu_id_in_edit" id="menu_id_in_edit" value="<?php echo esc_attr($menu_selected_id); ?>" />
</ins><span class="cx">
</span><del>-                        <input type="hidden" name="licount" id="licount" value="0" />
-                        <input type="hidden" name="menu_id_in_edit" id="menu_id_in_edit" value="<?php echo esc_attr($menu_selected_id); ?>" />
</del><ins>+                <div class="sidebar-name">
</ins><span class="cx">
</span><del>-                        <div class="sidebar-name">
-
-                                <div class="sidebar-name-arrow">
-                                        <br/>
-                                </div>
-                                <h3><?php echo esc_html($menu_title); ?></h3>
-
</del><ins>+                        <div class="sidebar-name-arrow">
+                                <br/>
</ins><span class="cx">                         </div>
</span><ins>+                        <h3><?php echo esc_html($menu_title); ?></h3>
</ins><span class="cx">
</span><del>-                        <div id="nav-container">
-                                <ul id="custom-nav">
-
-                        <?php
-                        //DISPLAY existing menu
-                        if ( $menu_selected_id > 0 ) {
-                                // SET output type
-                                $output_type = "backend";
-                                // MAIN OUTPUT FUNCTION
-                                wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
-                        }
-                        ?>
-
-                                </ul>
-                        </div><!-- /#nav-container -->
-
-                        <p class="submit">
-
-                        <script type="text/javascript">
-                                updatepostdata();
-                        </script>
-
-                        <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
-                        </div><!-- /.inside -->
</del><span class="cx">                 </div>
</span><span class="cx">
</span><del>-                <div id="menu-right">
-                        <div class="widgets-holder-wrap">
-                                <div class="sidebar-name">
-                                        <div class="sidebar-name-arrow"></div>
-                                        <h3><?php esc_html_e('Setup Menus'); ?></h3>
-                                </div>
-                                <div class="widget-holder">
</del><ins>+                <div id="nav-container">
+                        <ul id="custom-nav">
</ins><span class="cx">
</span><del>-                                        <?php
</del><ins>+                <?php
+                //DISPLAY existing menu
+                if ( $menu_selected_id > 0 ) {
+                        // SET output type
+                        $output_type = "backend";
+                        // MAIN OUTPUT FUNCTION
+                        wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
+                }
+                ?>
</ins><span class="cx">
</span><del>-                                 // Setup custom menu
</del><ins>+                        </ul>
+                </div><!-- /#nav-container -->
</ins><span class="cx">
</span><del>-                                        $enabled_menu = get_option('wp_custom_nav_menu');
</del><ins>+                <p class="submit">
</ins><span class="cx">
</span><del>-                                 $checked = strtolower($enabled_menu);
</del><ins>+                <script type="text/javascript">
+                        updatepostdata();
+                </script>
</ins><span class="cx">
</span><del>-                                 ?>
</del><ins>+                <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
+                </div><!-- /.inside -->
+        </div>
</ins><span class="cx">
</span><del>-                                 <span >
-                                         <label><?php _e('Enable'); ?></label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
-                                         <label><?php _e('Disable'); ?></label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
-                                        </span><!-- /.checkboxes -->
</del><ins>+        <div id="menu-right">
+                <div class="widgets-holder-wrap">
+                        <div class="sidebar-name">
+                                <div class="sidebar-name-arrow"></div>
+                                <h3><?php esc_html_e('Setup Menus'); ?></h3>
+                        </div>
+                        <div class="widget-holder">
</ins><span class="cx">
</span><del>-                                        <input id="set_wp_menu" type="submit" value="<?php esc_attr_e('Set Menu'); ?>" name="set_wp_menu" class="button" /><br />
</del><ins>+                                <?php
+                                // Setup custom menu
+                                $enabled_menu = get_option('wp_custom_nav_menu');
+                                $checked = strtolower($enabled_menu);
+                                ?>
</ins><span class="cx">
</span><del>-                                        <span>
-                                                <label><?php _e('Reset Menu to Default'); ?></label>
-                                                <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('<?php _e('Are you sure you want to reset the menu to its default settings?'); ?>');" />
-                                        </span>
</del><ins>+                                <span >
+                                        <label><?php _e('Enable'); ?></label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
+                                        <label><?php _e('Disable'); ?></label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
+                                </span><!-- /.checkboxes -->
</ins><span class="cx">
</span><del>-                                        <div class="fix"></div>
-                                </div>
-                        </div><!-- /.widgets-holder-wrap -->
</del><ins>+                                <input id="set_wp_menu" type="submit" value="<?php esc_attr_e('Set Menu'); ?>" name="set_wp_menu" class="button" /><br />
</ins><span class="cx">
</span><del>-                        <div class="widgets-holder-wrap">
-                                <div class="sidebar-name">
-                                        <div class="sidebar-name-arrow"></div>
-                                        <h3><?php esc_html_e('Menu Selector'); ?></h3>
-                                </div>
-                                <div class="widget-holder">
-                                        <select id="menu_select" name="menu_select">
-                                                <?php
</del><ins>+                                <span>
+                                        <label><?php _e('Reset Menu to Default'); ?></label>
+                                        <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('<?php _e('Are you sure you want to reset the menu to its default settings?'); ?>');" />
+                                </span>
</ins><span class="cx">
</span><del>-                                                // Display select options
-                                                foreach ( $custom_menus as $menu ) {
-                                                        $menu_term = get_term( $menu, 'nav_menu' );
-                                                        if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) )
-                                                                $selected_option = 'selected="selected"';
-                                                        else
-                                                                $selected_option = '';
-                                                        ?>
-                                                        <option value="<?php echo esc_attr($menu_term->term_id); ?>" <?php echo $selected_option; ?>><?php echo $menu_term->name; ?></option>
-                                                        <?php
</del><ins>+                                <div class="fix"></div>
+                        </div>
+                </div><!-- /.widgets-holder-wrap -->
</ins><span class="cx">
</span><del>-                                                }
</del><ins>+                <div class="widgets-holder-wrap">
+                        <div class="sidebar-name">
+                                <div class="sidebar-name-arrow"></div>
+                                <h3><?php esc_html_e('Menu Selector'); ?></h3>
+                        </div>
+                        <div class="widget-holder">
+                                <select id="menu_select" name="menu_select">
+                                        <?php
+                                        // Display select options
+                                        foreach ( $custom_menus as $menu ) {
+                                                $menu_term = get_term( $menu, 'nav_menu' );
+                                                if ( ( $menu_id_in_edit == $menu->term_id ) || ( $menu_selected_id == $menu->term_id ) )
+                                                        $selected_option = 'selected="selected"';
+                                                else
+                                                        $selected_option = '';
</ins><span class="cx">                                                 ?>
</span><del>-                                        </select>
</del><ins>+                                                <option value="<?php echo esc_attr($menu_term->term_id); ?>" <?php echo $selected_option; ?>><?php echo $menu_term->name; ?></option>
+                                                <?php
+                                        }
+                                        ?>
+                                </select>
</ins><span class="cx">
</span><del>-                                        <input id="switch_menu" type="submit" value="<?php esc_attr_e('Switch'); ?>" name="switch_menu" class="button" />
-                                        <input id="add_menu_name" name="add_menu_name" type="text" value="" />
-                                        <input id="add_menu" type="submit" value="<?php esc_attr_e('Add Menu'); ?>" name="add_menu" class="button" />
</del><ins>+                                <input id="switch_menu" type="submit" value="<?php esc_attr_e('Switch'); ?>" name="switch_menu" class="button" />
+                                <input id="add_menu_name" name="add_menu_name" type="text" value="" />
+                                <input id="add_menu" type="submit" value="<?php esc_attr_e('Add Menu'); ?>" name="add_menu" class="button" />
</ins><span class="cx">
</span><del>-                                        <div class="fix"></div>
-                                </div>
-                        </div><!-- /.widgets-holder-wrap -->
-                        <?php $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options'); ?>
-                        <div class="widgets-holder-wrap" style="display:none;">
-                                <div class="sidebar-name">
-                                        <div class="sidebar-name-arrow"></div>
-                                        <h3><?php esc_html_e('Top Level Menu Descriptions'); ?></h3>
-                                </div>
-                                <div class="widget-holder">
-                                        <span><?php _e('Display Descriptions in Top Level Menu?'); ?></span>
</del><ins>+                                <div class="fix"></div>
+                        </div>
+                </div><!-- /.widgets-holder-wrap -->
+                <?php $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options'); ?>
+                <div class="widgets-holder-wrap" style="display:none;">
+                        <div class="sidebar-name">
+                                <div class="sidebar-name-arrow"></div>
+                                <h3><?php esc_html_e('Top Level Menu Descriptions'); ?></h3>
+                        </div>
+                        <div class="widget-holder">
+                                <span><?php _e('Display Descriptions in Top Level Menu?'); ?></span>
</ins><span class="cx">
</span><del>-                                        <?php
</del><ins>+                                <?php
+                                // UPDATE and DISPLAY Menu Description Option
+                                if ( isset($_POST['menu-descriptions']) ) {
+                                        if ( !isset($_POST['switch_menu']) ) {
+                                                $menu_options_to_edit = $_POST['menu_id_in_edit'];
+                                                update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
+                                        }
+                                }
</ins><span class="cx">
</span><del>-                                 // UPDATE and DISPLAY Menu Description Option
-                                 if ( isset($_POST['menu-descriptions']) ) {
-                                                if ( !isset($_POST['switch_menu']) ) {
-                                                        $menu_options_to_edit = $_POST['menu_id_in_edit'];
-                                                 update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
-                                                }
-                                 }
</del><ins>+                                if ( $menu_id_in_edit > 0 )
+                                        $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
+                                else
+                                        $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
</ins><span class="cx">
</span><del>-                                 if ( $menu_id_in_edit > 0 )
-                                                $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
-                                        else
-                                                $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
</del><ins>+                                $checked = strtolower($checkedraw);
</ins><span class="cx">
</span><del>-                                 $checked = strtolower($checkedraw);
</del><ins>+                                if ( $advanced_option_descriptions == 'no' )
+                                        $checked = 'no';
+                                ?>
</ins><span class="cx">
</span><del>-                                 if ( $advanced_option_descriptions == 'no' )
-                                         $checked = 'no';
</del><ins>+                                <span class="checkboxes">
+                                        <label><?php _e('Yes'); ?></label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
+                                        <label><?php _e('No'); ?></label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
+                                </span><!-- /.checkboxes -->
+                                </form>
+                                <div class="fix"></div>
+                        </div>
+                </div><!-- /.widgets-holder-wrap -->
</ins><span class="cx">
</span><del>-                                 ?>
</del><ins>+                <div class="widgets-holder-wrap">
+                        <div class="sidebar-name">
+                                <div class="sidebar-name-arrow"></div>
+                                <h3><?php esc_html_e('Add an Existing Page'); ?></h3>
+                        </div>
+                        <div class="widget-holder">
</ins><span class="cx">
</span><del>-                                 <span class="checkboxes">
-                                         <label><?php _e('Yes'); ?></label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
-                                         <label><?php _e('No'); ?></label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
-                                        </span><!-- /.checkboxes -->
-                                 </form>
-                                        <div class="fix"></div>
-                                </div>
-                        </div><!-- /.widgets-holder-wrap -->
</del><ins>+                                <?php
+                                $pages_args = array(
+                                'child_of' => 0,
+                                'sort_order' => 'ASC',
+                                'sort_column' => 'post_title',
+                                'hierarchical' => 1,
+                                'exclude' => '',
+                                'include' => '',
+                                'meta_key' => '',
+                                'meta_value' => '',
+                                'authors' => '',
+                                'parent' => -1,
+                                'exclude_tree' => '',
+                                'number' => '',
+                                'offset' => 0 );
</ins><span class="cx">
</span><del>-                        <div class="widgets-holder-wrap">
-                                <div class="sidebar-name">
-                                        <div class="sidebar-name-arrow"></div>
-                                        <h3><?php esc_html_e('Add an Existing Page'); ?></h3>
-                                </div>
-                                <div class="widget-holder">
-
-                                        <?php
-
-                                        $pages_args = array(
-                                 'child_of' => 0,
-                                        'sort_order' => 'ASC',
-                                        'sort_column' => 'post_title',
-                                        'hierarchical' => 1,
-                                        'exclude' => '',
-                                        'include' => '',
-                                        'meta_key' => '',
-                                        'meta_value' => '',
-                                        'authors' => '',
-                                        'parent' => -1,
-                                        'exclude_tree' => '',
-                                        'number' => '',
-                                        'offset' => 0 );
-
-                                        //GET all pages
-                                        $pages_array = get_pages($pages_args);
-                                        $page_name = '';
-                                        //CHECK if pages exist
-                                        if ( $pages_array ) {
-                                                foreach ( $pages_array as $post ) {
-                                                        //Add page name to
-                                                        $page_name .= htmlentities($post->post_title).'|';
-                                                }
-                                        } else {
-                                                $page_name = __('No pages available');
</del><ins>+                                //GET all pages
+                                $pages_array = get_pages($pages_args);
+                                $page_name = '';
+                                //CHECK if pages exist
+                                if ( $pages_array ) {
+                                        foreach ( $pages_array as $post ) {
+                                                //Add page name to
+                                                $page_name .= htmlentities($post->post_title).'|';
</ins><span class="cx">                                         }
</span><ins>+                                } else {
+                                        $page_name = __('No pages available');
+                                }
+                                ?>
</ins><span class="cx">
</span><del>-                                        ?>
</del><ins>+                                <script>
+                                        jQuery(document).ready(function(){
</ins><span class="cx">
</span><del>-                                        <script>
-                                                 jQuery(document).ready(function(){
</del><ins>+                                                //GET PHP pages
+                                                var dataposts = "<?php echo esc_js($page_name); ?>".split("|");
</ins><span class="cx">
</span><del>-                                                        //GET PHP pages
-                                                 var dataposts = "<?php echo esc_js($page_name); ?>".split("|");
</del><ins>+                                                //Set autocomplete
+                                                jQuery("#page-search").autocomplete(dataposts);
</ins><span class="cx">
</span><del>-                                                        //Set autocomplete
-                                                        jQuery("#page-search").autocomplete(dataposts);
</del><ins>+                                                //Handle autocomplete result
+                                                jQuery("#page-search").result(function(event, data, formatted) {
+                                                        jQuery('#existing-pages').css('display','block');
+                                                        jQuery("#existing-pages dt:contains('" + data + "')").css("display", "block");
</ins><span class="cx">
</span><del>-                                                        //Handle autocomplete result
-                                                        jQuery("#page-search").result(function(event, data, formatted) {
-                                                         jQuery('#existing-pages').css('display','block');
-                                                         jQuery("#existing-pages dt:contains('" + data + "')").css("display", "block");
</del><ins>+                                                        jQuery('#show-pages').hide();
+                                                        jQuery('#hide-pages').show();
</ins><span class="cx">
</span><del>-                                                         jQuery('#show-pages').hide();
-                                                         jQuery('#hide-pages').show();
</del><ins>+                                                });
+                                                jQuery('#existing-pages').css('display','none');
+                                        });
+                                </script>
</ins><span class="cx">
</span><del>-                                                        });
-                                                        jQuery('#existing-pages').css('display','none');
-                                                 });
-                                         </script>
</del><ins>+                                <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="<?php esc_attr_e('Search Pages'); ?>" />
</ins><span class="cx">
</span><ins>+                                <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
+                                <a id="hide-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','none');jQuery('#page-search').attr('value','Search Pages');jQuery('#existing-pages dt').css('display','none');jQuery('#show-pages').show();jQuery('#hide-pages').hide();">Hide All</a>
</ins><span class="cx">
</span><del>-                                        <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="<?php esc_attr_e('Search Pages'); ?>" />
</del><ins>+                                <script type="text/javascript">
+                                        jQuery('#hide-pages').hide();
+                                </script>
</ins><span class="cx">
</span><del>-                                        <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
-                                        <a id="hide-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','none');jQuery('#page-search').attr('value','Search Pages');jQuery('#existing-pages dt').css('display','none');jQuery('#show-pages').show();jQuery('#hide-pages').hide();">Hide All</a>
</del><ins>+                                <ul id="existing-pages" class="list">
+                                        <?php
+                                                $intCounter = 0;
+                                                //Get default Pages
+                                                $intCounter = wp_custom_nav_get_pages($intCounter,'default');
+                                        ?>
+                                </ul>
</ins><span class="cx">
</span><del>-                                        <script type="text/javascript">
</del><ins>+                                <div class="fix"></div>
</ins><span class="cx">
</span><del>-                                                jQuery('#hide-pages').hide();
</del><ins>+                        </div>
+                </div><!-- /.widgets-holder-wrap -->
</ins><span class="cx">
</span><del>-                                        </script>
</del><ins>+                <div class="widgets-holder-wrap">
+                        <div class="sidebar-name">
+                                <div class="sidebar-name-arrow"></div>
+                                <h3><?php esc_html_e('Add an Existing Category'); ?></h3>
+                        </div>
+                        <div class="widget-holder">
</ins><span class="cx">
</span><del>-                                        <ul id="existing-pages" class="list">
-                                                <?php
-                                                        $intCounter = 0;
-                                                        //Get default Pages
-                                                        $intCounter = wp_custom_nav_get_pages($intCounter,'default');
-                                                ?>
-                                        </ul>
</del><ins>+                                <?php
+                                // Custom GET categories query
+                                // @todo Use API
+                                $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
+                                $cat_name = '';
+                                //CHECK for results
+                                if ( $categories ) {
+                                        foreach ( $categories as $category ) {
+                                                $cat_id = $category->term_id;
</ins><span class="cx">
</span><del>-                                        <div class="fix"></div>
</del><ins>+                                                $cat_args = array(
+                                                        'orderby' => 'name',
+                                                        'include' => $cat_id,
+                                                        'hierarchical' => 1,
+                                                        'order' => 'ASC'
+                                                );
</ins><span class="cx">
</span><del>-                                </div>
-                        </div><!-- /.widgets-holder-wrap -->
</del><ins>+                                                $category_names=get_categories($cat_args);
</ins><span class="cx">
</span><del>-                        <div class="widgets-holder-wrap">
-                                <div class="sidebar-name">
-                                        <div class="sidebar-name-arrow"></div>
-                                        <h3><?php esc_html_e('Add an Existing Category'); ?></h3>
-                                </div>
-                                <div class="widget-holder">
-
-                                        <?php
-
-                                        // Custom GET categories query
-                                        // @todo Use API
-                                        $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
-                                        $cat_name = '';
-                                        //CHECK for results
-                                        if ( $categories ) {
-                                                foreach ( $categories as $category ) {
-                                                        $cat_id = $category->term_id;
-
-                                                        $cat_args = array(
-                                                                 'orderby' => 'name',
-                                                                 'include' => $cat_id,
-                                                                 'hierarchical' => 1,
-                                                                 'order' => 'ASC'
-                                                         );
-
-                                                         $category_names=get_categories($cat_args);
-
-                                                        if ( isset($category_names[0]->name) ) {
-                                                                // Add category name to data string
-                                                                $cat_name .= htmlentities($category_names[0]->name).'|';
-                                                        }
-                                                 }
-                                         } else {
-                                                $cat_name = __('No categories available');
</del><ins>+                                                if ( isset($category_names[0]->name) ) {
+                                                        // Add category name to data string
+                                                        $cat_name .= htmlentities($category_names[0]->name).'|';
+                                                }
</ins><span class="cx">                                         }
</span><ins>+                                } else {
+                                        $cat_name = __('No categories available');
+                                }
+                                ?>
</ins><span class="cx">
</span><del>-                                        ?>
</del><ins>+                                <script>
+                                        jQuery(document).ready(function(){
</ins><span class="cx">
</span><del>-                                        <script>
-                                                 jQuery(document).ready(function(){
</del><ins>+                                                //GET PHP categories
+                                                var datacats = "<?php echo esc_js($cat_name); ?>".split("|");
</ins><span class="cx">
</span><del>-                                                        //GET PHP categories
-                                                 var datacats = "<?php echo esc_js($cat_name); ?>".split("|");
</del><ins>+                                                //Set autocomplete
+                                                jQuery("#cat-search").autocomplete(datacats);
</ins><span class="cx">
</span><del>-                                                        //Set autocomplete
-                                                        jQuery("#cat-search").autocomplete(datacats);
</del><ins>+                                                //Handle autocomplete result
+                                                jQuery("#cat-search").result(function(event, data, formatted) {
+                                                        jQuery('#existing-categories').css('display','block');
+                                                        jQuery("#existing-categories dt:contains('" + data + "')").css("display", "block");
</ins><span class="cx">
</span><del>-                                                        //Handle autocomplete result
-                                                        jQuery("#cat-search").result(function(event, data, formatted) {
-                                                         jQuery('#existing-categories').css('display','block');
-                                                         jQuery("#existing-categories dt:contains('" + data + "')").css("display", "block");
</del><ins>+                                                        jQuery('#show-cats').hide();
+                                                        jQuery('#hide-cats').show();
</ins><span class="cx">
</span><del>-                                                         jQuery('#show-cats').hide();
-                                                         jQuery('#hide-cats').show();
</del><ins>+                                                });
+                                                jQuery('#existing-categories').css('display','none');
</ins><span class="cx">
</span><del>-                                                        });
-                                                        jQuery('#existing-categories').css('display','none');
</del><ins>+                                        });
+                                </script>
</ins><span class="cx">
</span><del>-                                                 });
-                                         </script>
</del><ins>+                                <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="<?php esc_attr_e('Search Categories'); ?>" />
</ins><span class="cx">
</span><del>-                                        <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="<?php esc_attr_e('Search Categories'); ?>" />
</del><ins>+                                <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
+                                <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
</ins><span class="cx">
</span><del>-                                        <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
-                                        <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
</del><ins>+                                <script type="text/javascript">
+                                        jQuery('#hide-cats').hide();
+                                </script>
</ins><span class="cx">
</span><del>-                                        <script type="text/javascript">
</del><ins>+                                <ul id="existing-categories" class="list">
+                                        <?php
+                                                // Get default Categories
+                                                $intCounter = wp_custom_nav_get_categories($intCounter, 'default');
+                                        ?>
+                                </ul>
</ins><span class="cx">
</span><del>-                                                jQuery('#hide-cats').hide();
</del><ins>+                                <div class="fix"></div>
</ins><span class="cx">
</span><del>-                                        </script>
</del><ins>+                        </div>
+                </div><!-- /.widgets-holder-wrap -->
</ins><span class="cx">
</span><del>-                                        <ul id="existing-categories" class="list">
-                         <?php
-                                                         // Get default Categories
-                                 $intCounter = wp_custom_nav_get_categories($intCounter, 'default');
-                                                ?>
-                                 </ul>
</del><ins>+                <div class="widgets-holder-wrap">
+                        <div class="sidebar-name">
+                                <div class="sidebar-name-arrow"></div>
+                                <h3><?php esc_html_e('Add a Custom Url'); ?></h3>
+                        </div>
+                        <div class="widget-holder">
+                                <input id="custom_menu_item_url" type="text" value="http://" />
+                                <label><?php _e('URL'); ?></label><br />
+                                <?php $templatedir = get_bloginfo('url'); ?>
+                                <input type="hidden" id="templatedir" value="<?php echo esc_attr($templatedir); ?>" />
+                                <input id="custom_menu_item_name" type="text" value="Menu Item" onfocus="jQuery('#custom_menu_item_name').attr('value','');" />
+                                <label><?php _e('Menu Text'); ?></label><br />
+                                <input id="custom_menu_item_description" type="text" value="<?php esc_attr_e('A description'); ?>" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> onfocus="jQuery('#custom_menu_item_description').attr('value','');" />
+                                <label <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label>
+                                <a class="addtomenu" onclick="appendToList('<?php echo $templatedir; ?>','Custom','','','','0','');jQuery('#custom_menu_item_name').attr('value','Menu Item');jQuery('#custom_menu_item_description').attr('value','A description');"><?php _e('Add to menu'); ?></a>
+                                <div class="fix"></div>
+                        </div>
+                </div><!-- /.widgets-holder-wrap -->
</ins><span class="cx">
</span><del>-                                 <div class="fix"></div>
</del><ins>+ </div>
+</div>
</ins><span class="cx">
</span><del>-                                </div>
-                        </div><!-- /.widgets-holder-wrap -->
</del><ins>+<script type="text/javascript">
+        document.getElementById('pages-left').style.display='block';
+        document.getElementById('menu-right').style.display='block';
+        document.getElementById('no-js').style.display='none';
+</script>
</ins><span class="cx">
</span><del>-                        <div class="widgets-holder-wrap">
-                                <div class="sidebar-name">
-                                        <div class="sidebar-name-arrow"></div>
-                                        <h3><?php esc_html_e('Add a Custom Url'); ?></h3>
-                                </div>
-                                <div class="widget-holder">
-                                        <input id="custom_menu_item_url" type="text" value="http://" />
-                                        <label><?php _e('URL'); ?></label><br />
-                         <?php $templatedir = get_bloginfo('url'); ?>
-                 <input type="hidden" id="templatedir" value="<?php echo esc_attr($templatedir); ?>" />
-                 <input id="custom_menu_item_name" type="text" value="Menu Item" onfocus="jQuery('#custom_menu_item_name').attr('value','');" />
-                 <label><?php _e('Menu Text'); ?></label><br />
-                         <input id="custom_menu_item_description" type="text" value="<?php esc_attr_e('A description'); ?>" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> onfocus="jQuery('#custom_menu_item_description').attr('value','');" />
-                         <label <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label>
-                         <a class="addtomenu" onclick="appendToList('<?php echo $templatedir; ?>','Custom','','','','0','');jQuery('#custom_menu_item_name').attr('value','Menu Item');jQuery('#custom_menu_item_description').attr('value','A description');"><?php _e('Add to menu'); ?></a>
-                                        <div class="fix"></div>
-                                </div>
-                        </div><!-- /.widgets-holder-wrap -->
</del><ins>+<div id="dialog-confirm" title="<?php esc_attr_e('Edit Menu Item'); ?>">
+        </label><input id="edittitle" type="text" name="edittitle" value="" /><label class="editlabel" for="edittitle"><?php _e('Menu Title'); ?></label><br />
+        <input id="editlink" type="text" name="editlink" value="" /><label class="editlabel" for="editlink"><?php _e('URL'); ?></label><br />
+        <input id="editanchortitle" type="text" name="editanchortitle" value="" /><label class="editlabel" for="editanchortitle"><?php _e('Link Title'); ?></label><br />
+        <select id="editnewwindow" name="editnewwindow">
+                <option value="1"><?php _e('Yes'); ?></option>
+                <option value="0"><?php _e('No'); ?></option>
+        </select><label class="editlabel" for="editnewwindow"><?php _e('Open Link in a new window'); ?></label>
+        <input id="editdescription" type="text" name="editdescription" value="" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> /><label class="editlabel" for="editdescription" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label><br />
+</div>
</ins><span class="cx">
</span><del>- </div>
- </div>
-
- <script type="text/javascript">
-                document.getElementById('pages-left').style.display='block';
-                document.getElementById('menu-right').style.display='block';
-                document.getElementById('no-js').style.display='none';
-        </script>
-
-        <div id="dialog-confirm" title="<?php esc_attr_e('Edit Menu Item'); ?>">
-                </label><input id="edittitle" type="text" name="edittitle" value="" /><label class="editlabel" for="edittitle"><?php _e('Menu Title'); ?></label><br />
-                <input id="editlink" type="text" name="editlink" value="" /><label class="editlabel" for="editlink"><?php _e('URL'); ?></label><br />
-                <input id="editanchortitle" type="text" name="editanchortitle" value="" /><label class="editlabel" for="editanchortitle"><?php _e('Link Title'); ?></label><br />
-                <select id="editnewwindow" name="editnewwindow">
-                        <option value="1"><?php _e('Yes'); ?></option>
-                        <option value="0"><?php _e('No'); ?></option>
-                </select><label class="editlabel" for="editnewwindow"><?php _e('Open Link in a new window'); ?></label>
-                <input id="editdescription" type="text" name="editdescription" value="" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> /><label class="editlabel" for="editdescription" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> ><?php _e('Description'); ?></label><br />
-        </div>
-
</del><span class="cx"> <?php
</span><del>-}
</del><span class="cx">
</span><span class="cx"> include("admin-footer.php");
</span></span></pre>
</div>
</div>
</body>
</html>