<!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>[13286] trunk: add custom menu hierarchy support to admin, See #11817</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13286">13286</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-22 00:26:21 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add custom menu hierarchy support to admin, 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>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/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 (13285 => 13286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-21 21:24:48 UTC (rev 13285)
+++ trunk/wp-admin/custom-navigation.php 2010-02-22 00:26:21 UTC (rev 13286)
</span><span class="lines">@@ -134,7 +134,6 @@
</span><span class="cx"> for ( $k = 1; $k <= $postCounter; $k++ ) {
</span><span class="cx"> if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
</span><span class="cx"> if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
</span><del>- //@todo implement heirarchy
</del><span class="cx"> if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
</span><span class="cx"> if (isset($_POST['title'.$k])) { $custom_title = $_POST['title'.$k]; } else { $custom_title = ''; }
</span><span class="cx"> if (isset($_POST['linkurl'.$k])) { $custom_linkurl = $_POST['linkurl'.$k]; } else { $custom_linkurl = ''; }
</span><span class="lines">@@ -154,6 +153,8 @@
</span><span class="cx"> $post['post_content_filtered'] = '_blank';
</span><span class="cx"> else
</span><span class="cx"> $post['post_content_filtered'] = '';
</span><ins>+ if ( $parent_id > 0 && isset( $_POST[ 'dbid' . $parent_id ] ) )
+ $post[ 'post_parent' ] = (int) $_POST[ 'dbid' . $parent_id ];
</ins><span class="cx">
</span><span class="cx"> // New menu item
</span><span class="cx"> if ( $db_id == 0 ) {
</span></span></pre></div>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13285 => 13286)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-21 21:24:48 UTC (rev 13285)
+++ trunk/wp-includes/custom-navigation.php 2010-02-22 00:26:21 UTC (rev 13286)
</span><span class="lines">@@ -114,6 +114,8 @@
</span><span class="cx"> $queried_id = $wp_query->get_queried_object_id();
</span><span class="cx"> elseif ( is_category() )
</span><span class="cx"> $queried_id = $wp_query->get_queried_object_id();
</span><ins>+
+ $parent_stack = array();
</ins><span class="cx"> // Display Loop
</span><span class="cx"> foreach ( $menu_items as $menu_item ) {
</span><span class="cx"> $menu_type = get_post_meta($menu_item->ID, 'menu_type', true);
</span><span class="lines">@@ -191,6 +193,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> */
</span><ins>+ // 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;
+ }
+
</ins><span class="cx"> // List Items
</span><span class="cx"> ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $li_class; ?>><?php
</span><span class="cx"> //@todo: update front end to use post data
</span><span class="lines">@@ -256,27 +279,14 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
- //@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
</del><span class="cx"> }
</span><ins>+ while ( !empty( $parent_stack ) ) { ?>
+ </li></ul>
+<? array_shift( $parent_stack );
+ }
+ if ( !empty( $menu_items ) ) { ?>
+ </li>
+<?php }
</ins><span class="cx"> }
</span><span class="cx"> //@todo: implement menu heirarchy
</span><span class="cx"> //RECURSIVE Sub Menu Items
</span></span></pre>
</div>
</div>
</body>
</html>