+
+
+
- $items_counter = $counter;
-
- // Get all categories
- $categories_array = get_categories( $category_args );
-
- if ( !$categories_array ) {
- _e('Not Found');
- return $items_counter;
- }
-
- // Display Loop
- foreach ( $categories_array as $cat_item ) {
- if ( $cat_item->parent == 0 ) {
- $cat_item = wp_setup_nav_menu_item( $cat_item, 'category', $items_counter );
- // Custom Menu
- if ( $context == 'menu' ) {
- ?>
-
-
-
- cat_ID;
- $items_counter++;
- $items_counter = wp_nav_menu_sub_items( $cat_item->cat_ID, $items_counter, $parentli, 'categories', 'default' );
- ?>
-
- $childof,
- 'hide_empty' => false,
- 'parent' => $childof);
- } elseif ( $output_type == 'default' ) {
- // Sidebar Menu
- $sub_args = array(
- 'child_of' => $childof,
- 'hide_empty' => false,
- 'parent' => $childof);
- }
-
- if ( $context == 'categories' ) {
- // Get Sub Category Items
- $item_type = 'category';
- $sub_array = get_categories($sub_args);
- } elseif ($context == 'pages') {
- // Get Sub Page Items
- $item_type = 'page';
- $sub_array = get_pages($sub_args);
- } else {
- $item_type = 'custom';
- $sub_array = array();
- }
-
- if ( $sub_array ) {
- ?>
-
+
+
+
+
+
';
+ $output .= wp_get_nav_menu_item( $menu_item, $object_type, $object );
+ $output .= wp_get_nav_menu_sub_items( $menu_item->ID, $object_type, $object, $context );
+ $output .= '';
+
+ ++$i;
+ }
+ }
+
+ return $output;
+}
+
+/**
+ * Recursive function to retrieve sub menu items.
+ *
+ * @since 3.0.0
+ *
+ * @param string $childof The Parent ID.
+ * @param string $object_type The object type.
+ * @param string $object The object name.
+ * @return string $output sub menu items.
+ */
+function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $context = 'frontend' ) {
+ $args = array( 'child_of' => $childof, 'parent' => $childof, 'hide_empty' => false, );
+
+ switch ( $object_type ) {
+ case 'post_type':
+ $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
+ if ( in_array( $object, $hierarchical_post_types ) ) {
+ $args['post_type'] = $object;
+ $sub_menu_items = get_pages( $args );
+ } else {
+ $sub_menu_items = array();
+ }
+ break;
+
+ case 'taxonomy':
+ if ( is_taxonomy_hierarchical( $object ) ) {
+ $sub_menu_items = get_terms( $object, $args );
+ } else {
+ $sub_menu_items = array();
+ }
+ break;
+
+ default:
+ $sub_menu_items = array();
+ break;
+ }
+
+ $output = '';
+ $i = 1;
+ if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) {
+ $output .= '';
+ }
+ return $output;
}
?>
\ No newline at end of file
diff --git a/wp-admin/js/nav-menu-default-items.dev.js b/wp-admin/js/nav-menu-default-items.dev.js
index 0eb6b8a5c0..4112aa54d6 100644
--- a/wp-admin/js/nav-menu-default-items.dev.js
+++ b/wp-admin/js/nav-menu-default-items.dev.js
@@ -15,13 +15,26 @@ jQuery(document).ready(function($){
wp_drag_and_drop();
- wp_update_post_data();
+ // Delete AYS
+ $('#update-nav-menu .deletion').click(function(){
+ if ( confirm( navMenuL10n.warnDelete ) ) {
+ return true;
+ } else {
+ return false;
+ };
+ });
// Handle Save Button Clicks
$('#save_menu').click(function(){
return wp_update_post_data();
});
-
+
+ // close postboxes that should be closed
+ $('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+
+ // postboxes setup
+ postboxes.add_postbox_toggles('menus');
+
// Clear the quick search textbox
$('.quick-search').click(function(){
$(this).attr( 'value', '' );
@@ -38,18 +51,14 @@ jQuery(document).ready(function($){
});
// Delete menu item
- $('#menu-container .item-delete').live( 'click', function(){
+ $('#menu-container .item-delete').live( 'click', function(e){
return wp_remove_menu_item( $(this).attr('value') );
});
// Update menu item settings (thickbox)
$('#update-menu-item').click(function(){
wp_update_menu_item();
- tb_remove();
-
- // Give feedback to the user
- var id = $('#edit-item-id').val();
- $('#menu-' + id + ' dt:first').animate( { backgroundColor: '#FFFF33' }, { duration: 'normal', complete: function() { jQuery(this).css( 'backgroundColor', '' ); }});
+ return tb_remove();
});
// Close thickbox
@@ -58,55 +67,32 @@ jQuery(document).ready(function($){
});
// Show All Button
- $('.show-all').click(function(){
- $(this).offsetParent().find('#add-buttons-actions').attr( 'style','margin-bottom: 10px;' );
- $(this).offsetParent().find('.list-wrap').css( 'display','block' );
- $(this).siblings('.quick-search').attr( 'value', '' );
- $(this).offsetParent().find('.list-wrap li').css( 'display', 'block' );
- $(this).hide();
- $(this).siblings('.hide-all').show();
+ $('.show-all').click(function(e){
+ jQuery(e.currentTarget).parent().siblings('.list-wrap').css( 'display', 'block' );
+ jQuery(e.currentTarget).parent().siblings('.list-wrap').find('li').css( 'display', 'block' );
+ jQuery(e.currentTarget).hide();
+ jQuery(e.currentTarget).siblings('.hide-all').show();
});
// Hide All Button
- $('.hide-all').click(function(){
- $(this).offsetParent().find('#add-buttons-actions').attr( 'style','margin-bottom: 0px;' );
- $(this).offsetParent().find('.list-wrap').css( 'display','none' );
- $(this).siblings('.quick-search').attr( 'value', 'Search' );
- $(this).offsetParent().find('.list-wrap li').css( 'display', 'none' );
- $(this).hide();
- $(this).siblings('.show-all').show();
+ $('.hide-all').click(function(e){
+ jQuery(e.currentTarget).parent().siblings('.list-wrap').css( 'display', 'none' );
+ jQuery(e.currentTarget).parent().siblings('.list-wrap').find('li').css( 'display', 'none' );
+ jQuery(e.currentTarget).hide();
+ jQuery(e.currentTarget).siblings('.show-all').show();
});
- // Add menu item to queue
- $('.list input').click(function(){
+ // Add menu items into the menu
+ $('.add-to-menu').click(function(e){
+ return wp_add_checked_items_to_menu(e.currentTarget);
+ });
- var item_type = jQuery(this).parent().siblings('.item-type').val();
- var item_title = jQuery(this).parent().siblings('.item-title').val();
- var item_url = jQuery(this).parent().siblings('.item-url').val();
- var item_id = jQuery(this).parent().siblings('.item-dbid').val();
- var item_parent_id = jQuery(this).parent().siblings('.item-parent').val();
- var item_description = jQuery(this).parent().siblings('.item-description').val();
+ // Create a new link then add it to the menu
+ $('#add-custom-links .add-to-menu a').click(function(e){
+ var link_url = jQuery(e.currentTarget).parent().parent().find('#custom-menu-item-url').val();
+ var link_name = jQuery(e.currentTarget).parent().parent().find('#custom-menu-item-name').val();
- return wp_update_queue( $(this), item_type, item_title, item_url, item_id, item_parent_id, item_description );
- });
-
- // Add queued menu items into the menu
- $('.enqueue a').click(function(){
- return wp_add_queued_items_to_menu(this);
- });
-
- // Create the link, add it to the menu + available links section
- $('#add-custom-link .add-to-menu a').click(function(){
- var link_url = $(this).offsetParent().find('#menu-item-url').val();
- var link_name = $(this).offsetParent().find('#menu-item-name').val();
-
- wp_add_queued_items_to_menu( this );
-
- // Don't save the link if it was left with it's default settings
- if ( 'http://' == link_url || 'Menu Item' == link_name )
- return;
-
- // and update the Menu with the new link
- wp_add_item_to_menu( 'custom', link_name, link_url, 0, 0, '' );
+ // Add link to menu
+ wp_add_item_to_menu( 0, '', 'custom', navMenuL10n.custom, 0, link_name, link_url, '', '', '_none', '', '' );
});
});
\ No newline at end of file
diff --git a/wp-admin/js/nav-menu-default-items.js b/wp-admin/js/nav-menu-default-items.js
index 32a2324fe6..329e6b8c88 100644
--- a/wp-admin/js/nav-menu-default-items.js
+++ b/wp-admin/js/nav-menu-default-items.js
@@ -1 +1 @@
-jQuery(document).ready(function(a){wp_drag_and_drop();wp_update_post_data();a("#save_menu").click(function(){return wp_update_post_data()});a(".quick-search").click(function(){a(this).attr("value","")});a(".quick-search-submit").click(function(){a(this).siblings(".quick-search").search()});a("#menu-container .item-edit").click(function(){return wp_edit_menu_item(a(this).attr("value"))});a("#menu-container .item-delete").live("click",function(){return wp_remove_menu_item(a(this).attr("value"))});a("#update-menu-item").click(function(){wp_update_menu_item();tb_remove();var b=a("#edit-item-id").val();a("#menu-"+b+" dt:first").animate({backgroundColor:"#FFFF33"},{duration:"normal",complete:function(){jQuery(this).css("backgroundColor","")}})});a("#cancel-save").click(function(){return tb_remove()});a(".show-all").click(function(){a(this).offsetParent().find("#add-buttons-actions").attr("style","margin-bottom: 10px;");a(this).offsetParent().find(".list-wrap").css("display","block");a(this).siblings(".quick-search").attr("value","");a(this).offsetParent().find(".list-wrap li").css("display","block");a(this).hide();a(this).siblings(".hide-all").show()});a(".hide-all").click(function(){a(this).offsetParent().find("#add-buttons-actions").attr("style","margin-bottom: 0px;");a(this).offsetParent().find(".list-wrap").css("display","none");a(this).siblings(".quick-search").attr("value","Search");a(this).offsetParent().find(".list-wrap li").css("display","none");a(this).hide();a(this).siblings(".show-all").show()});a(".list input").click(function(){var d=jQuery(this).parent().siblings(".item-type").val();var g=jQuery(this).parent().siblings(".item-title").val();var c=jQuery(this).parent().siblings(".item-url").val();var e=jQuery(this).parent().siblings(".item-dbid").val();var b=jQuery(this).parent().siblings(".item-parent").val();var f=jQuery(this).parent().siblings(".item-description").val();return wp_update_queue(a(this),d,g,c,e,b,f)});a(".enqueue a").click(function(){return wp_add_queued_items_to_menu(this)});a("#add-custom-link .add-to-menu a").click(function(){var b=a(this).offsetParent().find("#menu-item-url").val();var c=a(this).offsetParent().find("#menu-item-name").val();wp_add_queued_items_to_menu(this);if("http://"==b||"Menu Item"==c){return}wp_add_item_to_menu("custom",c,b,0,0,"")})});
\ No newline at end of file
+jQuery(document).ready(function(a){wp_drag_and_drop();a("#update-nav-menu .deletion").click(function(){if(confirm(navMenuL10n.warnDelete)){return true}else{return false}});a("#save_menu").click(function(){return wp_update_post_data()});a(".if-js-closed").removeClass("if-js-closed").addClass("closed");postboxes.add_postbox_toggles("menus");a(".quick-search").click(function(){a(this).attr("value","")});a(".quick-search-submit").click(function(){a(this).siblings(".quick-search").search()});a("#menu-container .item-edit").click(function(){return wp_edit_menu_item(a(this).attr("value"))});a("#menu-container .item-delete").live("click",function(b){return wp_remove_menu_item(a(this).attr("value"))});a("#update-menu-item").click(function(){wp_update_menu_item();return tb_remove()});a("#cancel-save").click(function(){return tb_remove()});a(".show-all").click(function(b){jQuery(b.currentTarget).parent().siblings(".list-wrap").css("display","block");jQuery(b.currentTarget).parent().siblings(".list-wrap").find("li").css("display","block");jQuery(b.currentTarget).hide();jQuery(b.currentTarget).siblings(".hide-all").show()});a(".hide-all").click(function(b){jQuery(b.currentTarget).parent().siblings(".list-wrap").css("display","none");jQuery(b.currentTarget).parent().siblings(".list-wrap").find("li").css("display","none");jQuery(b.currentTarget).hide();jQuery(b.currentTarget).siblings(".show-all").show()});a(".add-to-menu").click(function(b){return wp_add_checked_items_to_menu(b.currentTarget)});a("#add-custom-links .add-to-menu a").click(function(d){var b=jQuery(d.currentTarget).parent().parent().find("#custom-menu-item-url").val();var c=jQuery(d.currentTarget).parent().parent().find("#custom-menu-item-name").val();wp_add_item_to_menu(0,"","custom",navMenuL10n.custom,0,c,b,"","","_none","","")})});
\ No newline at end of file
diff --git a/wp-admin/js/nav-menu-dynamic-functions.dev.js b/wp-admin/js/nav-menu-dynamic-functions.dev.js
index 7098ada94b..34a8c466aa 100644
--- a/wp-admin/js/nav-menu-dynamic-functions.dev.js
+++ b/wp-admin/js/nav-menu-dynamic-functions.dev.js
@@ -8,66 +8,75 @@
* @subpackage Administration
*/
-/**
- * Adds a link to the available links section
- *
- * @param object e - An object recieved via ajax
- */
-function wp_update_links_list(e) {
- var link = '
' + item_title + ' ' + item_type + ' ' + navMenuL10n.edit + ' | Delete
' + item_title + ' ' + item_append + ' ' + navMenuL10n.edit + ' | Delete
' + item_title + ' ' + item_type + ' ' + navMenuL10n.edit + ' | Delete
'+item_title+' '+item_type+' '+navMenuL10n.edit+' | Delete
'+item_title+' '+item_type+' '+navMenuL10n.edit+' | Delete
')}});jQuery(".menu li").draggable({handle:" > dl",opacity:0.8,addClasses:false,helper:"clone",zIndex:100,});jQuery(".menu li dl, .menu li .dropzone").droppable({accept:".menu li",tolerance:"pointer",drop:function(e,ui){var li=jQuery(this).parent();var child=!jQuery(this).hasClass("dropzone");if(child&&li.children("ul").length==0){li.append('')}if(child){li.children("ul").append(ui.draggable)}else{li.before(ui.draggable)}li.find("dl,.dropzone").css({backgroundColor:"",borderColor:""});var draggablevalue=ui.draggable.attr("value");var droppablevalue=li.attr("value");li.find("#menu-"+draggablevalue).find("#parent"+draggablevalue).val(droppablevalue);jQuery(this).parent().find("dt").removeAttr("style");jQuery(this).parent().find("div:first").removeAttr("style")},over:function(){if(jQuery(this).attr("class")=="dropzone ui-droppable"){jQuery(this).parent().find("div:first").css("background","none").css("height","50px")}else{if(jQuery(this).attr("class")=="ui-droppable"){jQuery(this).parent().find("dt:first").css("background","#d8d8d8")}else{}}var parentid=jQuery(this).parent().attr("id")},out:function(){jQuery(this).parent().find("dt").removeAttr("style");jQuery(this).parent().find("div:first").removeAttr("style");jQuery(this).filter(".dropzone").css({borderColor:""})}})}function wp_get_unique_menu_id(){var count=jQuery(".menu li").length+1;var randomnumber=count;var validatetest=0;try{var test=document.getElementById("menu-"+randomnumber.toString()).value}catch(err){validatetest=1}while(validatetest==0){randomnumber=randomnumber+1;try{var test2=document.getElementById("menu-"+randomnumber.toString()).value}catch(err){validatetest=1}}return randomnumber};
\ No newline at end of file
+function wp_nav_menu_autocomplete(a){jQuery("#add-"+a+" .quick-search").autocomplete(jQuery("#add-"+a+" .autocomplete").val().split("|"));jQuery("#add-"+a+" .quick-search").result(function(b,d,c){jQuery("#add-"+a+" .list-wrap").css("display","block");jQuery("#add-"+a+" .list-wrap li:contains('"+d+"')").css("display","block");jQuery("#add-"+a+" .show-all").hide();jQuery("#add-"+a+" .hide-all").show()})}function wp_edit_menu_item(a){var f=jQuery("#menu-item-type"+a).val();var b=jQuery("#menu-item-title"+a).val();var g=jQuery("#menu-item-url"+a).val();var c=jQuery("#menu-item-attr-title"+a).val();var d=jQuery("#menu-item-target"+a).val();var h=jQuery("#menu-item-description"+a).val();var e=jQuery("#menu-item-classes"+a).val();var i=jQuery("#menu-item-xfn"+a).val();if("custom"!=f){jQuery("#edit-menu-item-url").attr("disabled","disabled")}jQuery("#edit-menu-item-id").val(a);jQuery("#edit-menu-item-title").val(b);jQuery("#edit-menu-item-url").val(g);jQuery("#edit-menu-item-attr-title").val(c);jQuery("#edit-menu-item-target").val(d);jQuery("#edit-menu-item-target option[value='"+d+"']").attr("selected","selected");jQuery("#edit-menu-item-description").val(h);jQuery("#edit-menu-item-classes").val(e);jQuery("#edit-menu-item-xfn").val(i);jQuery("#edit-menu-item-title").focus()}function wp_update_menu_item(){var h=jQuery("#edit-menu-item-id").val();var f=jQuery("#edit-menu-item-title").val();var b=jQuery("#edit-menu-item-url").val();var g=jQuery("#edit-menu-item-attr-title").val();var d=jQuery("#edit-menu-item-target").val();var c=jQuery("#edit-menu-item-description").val();var a=jQuery("#edit-menu-item-classes").val();var e=jQuery("#edit-menu-item-xfn").val();jQuery(".menu #menu-item"+h).find("span.item-title").html(f);jQuery(".menu #menu-item-title"+h).val(f);jQuery(".menu #menu-item-url"+h).val(b);jQuery(".menu #menu-item-attr-title"+h).val(g);jQuery(".menu #menu-item-target"+h).val(d);jQuery(".menu #menu-item-description"+h).val(c);jQuery(".menu #menu-item-classes"+h).val(a);jQuery(".menu #menu-item-xfn"+h).val(e);jQuery(".menu #menu-item"+h+" dt:first").animate({backgroundColor:"#FFFF33"},{duration:"normal",complete:function(){jQuery(this).css("backgroundColor","")}})}function wp_remove_menu_item(b){var a=document.getElementById("menu-item"+b);if(a){jQuery(a).find("dt").each(function(){jQuery(this).animate({backgroundColor:"#FF3333"},{duration:"normal",complete:function(){jQuery(this).parent().parent().remove()}})})}}function wp_add_item_to_menu(a,k,f,n,l,b,m,h,e,d,c,i){var j=wp_get_unique_menu_id();var g=wp_get_hidden_inputs(j,a,k,f,n,l,b,m,h,e,d,c,i);jQuery(".menu").append('");jQuery(".menu #menu-item"+j+" dt:first").animate({backgroundColor:"#FFFF33"},{duration:"normal",complete:function(){jQuery(this).css("backgroundColor","")}});wp_drag_and_drop();tb_init("a.thickbox, area.thickbox, input.thickbox")}function wp_add_checked_items_to_menu(b){var a=jQuery(b).siblings(".list-wrap").find(":checked");if(0==a.length){return false}jQuery(a).each(function(){var h=jQuery(this).parent().siblings(".menu-item-type").val();if("custom"==h){var e=jQuery(this).parent().siblings(".menu-item-attr-title").val();var f=jQuery(this).parent().siblings(".menu-item-target").val();var g=jQuery(this).parent().siblings(".menu-item-classes").val();var j=jQuery(this).parent().siblings(".menu-item-xfn").val()}else{var e="";var f="_none";var g="";var j=""}var c=jQuery(this).parent().siblings(".menu-item-db-id").val();var k=jQuery(this).parent().siblings(".menu-item-object-id").val();var n=jQuery(this).parent().siblings(".menu-item-append").val();var l=jQuery(this).parent().siblings(".menu-item-parent-id").val();var d=jQuery(this).parent().siblings(".menu-item-title").val();var m=jQuery(this).parent().siblings(".menu-item-url").val();var i=jQuery(this).parent().siblings(".menu-item-description").val();if(undefined==i){i=""}wp_add_item_to_menu(c,k,h,n,l,d,m,i,e,f,g,j);jQuery(this).attr("checked",false)})}function wp_drag_and_drop(){jQuery(".menu li").each(function(){if(!jQuery(this).children(".dropzone").attr("class")){jQuery(this).prepend('
')}});jQuery(".menu li").draggable({handle:" > dl",opacity:0.8,addClasses:false,helper:"clone",zIndex:100});jQuery(".menu li dl, .menu li .dropzone").droppable({accept:".menu li",tolerance:"pointer",drop:function(f,d){var a=jQuery(this).parent();var g=!jQuery(this).hasClass("dropzone");if(g&&a.children("ul").length==0){a.append('')}if(g){a.children("ul").append(d.draggable)}else{a.before(d.draggable)}a.find("dl,.dropzone").css({backgroundColor:"",borderColor:""});var c=d.draggable.attr("value");var b=a.attr("value");a.find("#menu-"+c).find("#parent"+c).val(b);jQuery(this).parent().find("dt").removeAttr("style");jQuery(this).parent().find("div:first").removeAttr("style")},over:function(){if(jQuery(this).attr("class")=="dropzone ui-droppable"){jQuery(this).parent().find("div:first").css("background","none").css("height","50px")}else{if(jQuery(this).attr("class")=="ui-droppable"){jQuery(this).parent().find("dt:first").css("background","#d8d8d8")}else{}}var a=jQuery(this).parent().attr("id")},out:function(){jQuery(this).parent().find("dt").removeAttr("style");jQuery(this).parent().find("div:first").removeAttr("style");jQuery(this).filter(".dropzone").css({borderColor:""})}})}function wp_update_post_data(){var a=0;jQuery(".menu li").each(function(c){c=c+1;var b=jQuery(this).attr("value");jQuery(this).find("#menu-item-position"+b).attr("value",c);jQuery(this).attr("id","menu-item"+c);jQuery(this).attr("value",c);jQuery(this).find("#menu-item-db-id"+b).attr("id","menu-item-db-id"+c);jQuery(this).find("#menu-item-object-id"+b).attr("id","menu-item-object-id"+c);jQuery(this).find("#menu-item-append"+b).attr("id","menu-item-append"+c);jQuery(this).find("#menu-item-type"+b).attr("id","menu-item-type"+c);jQuery(this).find("#menu-item-position"+b).attr("id","menu-item-position"+c);var d=jQuery(this).find("#menu-item-parent-id"+b).parent().parent().parent().attr("value");jQuery(this).find("#menu-item-parent-id"+b).attr("id","menu-item-parent-id"+c);if(d){}else{d=0}jQuery(this).find("#menu-item-parent-id"+b).attr("value",d);jQuery(this).find("#menu-item-title"+b).attr("id","menu-item-title"+c);jQuery(this).find("#menu-item-url"+b).attr("id","menu-item-url"+c);jQuery(this).find("#menu-item-description"+b).attr("id","menu-item-description"+c);jQuery(this).find("#menu-item-classes"+b).attr("id","menu-item-classes"+c);jQuery(this).find("#menu-item-xfn"+b).attr("id","menu-item-xfn"+c);jQuery(this).find("#menu-item-description"+b).attr("id","menu-item-description"+c);jQuery(this).find("#menu-item-attr-title"+b).attr("id","menu-item-attr-title"+c);jQuery(this).find("#menu-item-target"+b).attr("id","menu-item-target"+c);jQuery("#li-count").attr("value",c)})}function wp_get_unique_menu_id(){var d=jQuery(".menu li").length+1;var e=d;var a=0;try{var f=document.getElementById("menu-"+e.toString()).value}catch(c){a=1}while(a==0){e=e+1;try{var b=document.getElementById("menu-"+e.toString()).value}catch(c){a=1}}return e}function wp_get_hidden_inputs(j,a,k,f,n,l,b,m,h,e,d,c,i){var g="";g+='';g+='';g+='';g+='';g+='';g+='';g+='';g+='';g+='';g+='';g+='';g+='';g+='';return g};
\ No newline at end of file
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 685241b632..68841f72f4 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -9,170 +9,203 @@
* @subpackage Administration
*/
-require_once('admin.php');
+/** Load WordPress Administration Bootstrap */
+require_once( 'admin.php' );
-/*
-TODO
- Add caps: edit_menus, delete_menus
-*/
+// Permissions Check
if ( ! current_user_can('switch_themes') )
wp_die( __( 'Cheatin’ uh?' ));
+// Nav Menu CSS
wp_admin_css( 'nav-menu' );
+
+// jQuery
wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'jquery-ui-draggable' );
wp_enqueue_script( 'jquery-ui-droppable' );
wp_enqueue_script( 'jquery-ui-sortable' );
-wp_enqueue_script( 'jquery-ui-dialog' );
+wp_enqueue_script( 'jquery-autocomplete' );
+
+// Nav Menu functions
wp_enqueue_script( 'nav-menu-dynamic-functions' );
wp_enqueue_script( 'nav-menu-default-items' );
-wp_enqueue_script( 'jquery-autocomplete' );
wp_enqueue_script( 'nav-menu-php-functions' );
+
+// Metaboxes
+wp_enqueue_script( 'common' );
+wp_enqueue_script( 'wp-lists' );
+wp_enqueue_script( 'postbox' );
+
+// Thickbox
add_thickbox();
-require_once( 'admin-header.php' );
+// Load all the nav menu interface functions
require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
-function wp_reset_nav_menu() {
- wp_nav_menu_setup( true );
- return true;
-}
-
+// Container for any messages displayed to the user
$messages_div = '';
-$menu_id_in_edit = 0;
-$updated = false;
-$advanced_option_descriptions = 'no';
-// Check which menu is selected and if menu is in edit already
-if ( isset( $_GET['edit-menu'] ) ) {
- $menu_selected_id = (int) $_GET['edit-menu'];
- $updated = true;
-} elseif ( isset( $_POST[ 'menu-id-in-edit' ] ) ) {
- $menu_selected_id = (int) $_POST[ 'menu-id-in-edit' ];
-} else {
- $menu_selected_id = 0;
-}
+// Container that stores the name of the active menu
+$nav_menu_selected_title = '';
-// Delete a menu
-if ( isset($_GET['delete-menu']) && $_GET['delete-menu'] > 0 ) {
- // if ( ! current_user_can('delete_menus') )
- // wp_die( __( 'Cheatin’ uh?' ));
+// The menu id of the current menu being edited
+$nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;
- $menu_id = (int) $_GET['delete-menu'];
- check_admin_referer( 'delete_menu-' . $menu_id );
+// Allowed actions: add, update, delete
+$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
- wp_delete_nav_menu( $menu_id );
- $messages_div = '' . __('Menu successfully deleted.') . '
' . __('Menu successfully deleted.') . '
' . $add_nav_menu->get_error_message() . '
' . sprintf( __('The %s menu has been successfully created.'), esc_html( $add_nav_menu->name ) ) . '
' . __('Please enter a valid menu name.') . '
' . __('The menu has been updated.') . '
' . $menu->get_error_message() . '
' . sprintf( __('“%s” menu has been created.'), esc_html( $menu->name ) ) . '
' . __('You haven\'t setup any menus yet. Create a new menu.') . '
' . __('Please enter a valid menu name.') . '
' . __('The current theme does not support menus.') . '
' . __('The menu has been updated.') . '
@@ -180,266 +213,110 @@ if ( $post_counter > 0 && $menu_selected_id > 0 && ! $updated ) {
-