WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add custom menu hierarchy support to admin, See #11817 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-22 00:26:21 +00:00
parent 76a24ce6b1
commit 624e51d2c8
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/custom-navigation.php
View File

@ -134,7 +134,6 @@ function wp_custom_navigation() {
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; }
//@todo implement heirarchy
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 = ''; }
@ -154,6 +153,8 @@ function wp_custom_navigation() {
$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 ) {

48
wp-includes/custom-navigation.php
View File

@ -114,6 +114,8 @@ function wp_custom_navigation_output($args = array()) {
$queried_id = $wp_query->get_queried_object_id();
elseif ( is_category() )
$queried_id = $wp_query->get_queried_object_id();
$parent_stack = array();
// Display Loop
foreach ( $menu_items as $menu_item ) {
$menu_type = get_post_meta($menu_item->ID, 'menu_type', true);
@ -191,6 +193,27 @@ function wp_custom_navigation_output($args = array()) {
}
}
*/
// Indent children
if ( empty( $parent_stack ) ) {
array_unshift( $parent_stack, $menu_item->ID );
} elseif ( $menu_item->post_parent > 0 ) {
if ( $menu_item->post_parent == $parent_stack[0] ) { ?>
<ul>
<?php array_unshift( $parent_stack, $menu_item->ID );
} elseif ( count( $parent_stack ) > 1 && $menu_item->post_parent == $parent_stack[1] ) { ?>
</li>
<?php $parent_stack[0] = $menu_item->ID;
} elseif ( in_array( $menu_item->post_parent, $parent_stack ) ) {
while ( !empty( $parent_stack ) && $menu_item->post_parent != $parent_stack[0] ) { ?>
</li></ul>
<? array_shift( $parent_stack );
}
}
} else { ?>
</li>
<?php $parent_stack[0] = $menu_item->ID;
}
// List Items
?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $li_class; ?>><?php
//@todo: update front end to use post data
@ -256,27 +279,14 @@ function wp_custom_navigation_output($args = array()) {
<?php
}
//@todo: implement menu heirarchy
/* //DISPLAY menu sub items
if ($wp_custom_nav_menu_items->parent_id == 0)
{
//FRONTEND
if ($type == 'frontend')
{
//Recursive function
$intj = wp_custom_navigation_sub_items($wp_custom_nav_menu_items->id,$wp_custom_nav_menu_items->link_type,$table_name,$type,$wp_custom_nav_menu_id);
}
//BACKEND
else
{
//Recursive function
$intj = wp_custom_navigation_sub_items($wp_custom_nav_menu_items->id,$wp_custom_nav_menu_items->link_type,$table_name,$type,$id);
}
}
*/ ?></li>
<?php
while ( !empty( $parent_stack ) ) { ?>
</li></ul>
<? array_shift( $parent_stack );
}
if ( !empty( $menu_items ) ) { ?>
</li>
<?php }
}
//@todo: implement menu heirarchy
//RECURSIVE Sub Menu Items