<!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>[13332] trunk/wp-includes/custom-navigation.php:
Start consolidatinh menu item outupt into output_menu_item().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13332">13332</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-23 18:17:51 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start consolidatinh menu item outupt into output_menu_item(). DRY. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13331 => 13332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-23 17:13:24 UTC (rev 13331)
+++ trunk/wp-includes/custom-navigation.php 2010-02-23 18:17:51 UTC (rev 13332)
</span><span class="lines">@@ -57,16 +57,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function setup_menu_item($menu_item) {
</del><ins>+function setup_menu_item($menu_item, $type = 'item', $position = 0) {
</ins><span class="cx"> global $parent_menu_order;
</span><span class="cx">
</span><del>- $menu_item->type = get_post_meta($menu_item->ID, 'menu_type', true);
- $menu_item->object_id = get_post_meta($menu_item->ID, 'object_id', true);
- //$parent_menu_order[ $menu_item->ID ] = $menu_item->menu_order;
- if ( isset( $parent_menu_order[ $menu_item->post_parent ] ) )
- $menu_item->parent_item = $parent_menu_order[ $menu_item->post_parent ];
- else
- $menu_item->parent_item = 0;
</del><ins>+ if ( 'item' == $type ) {
+ $menu_item->type = get_post_meta($menu_item->ID, 'menu_type', true);
+ $menu_item->object_id = get_post_meta($menu_item->ID, 'object_id', true);
+ if ( isset( $parent_menu_order[ $menu_item->post_parent ] ) )
+ $menu_item->parent_item = $parent_menu_order[ $menu_item->post_parent ];
+ else
+ $menu_item->parent_item = 0;
+ } elseif ( 'category' == $type ) {
+ $menu_item->type = $type;
+ $menu_item->object_id = $menu_item->term_id;
+ $menu_item->parent_item = $menu_item->parent;
+ $menu_item->menu_order = $position;
+ } elseif ( 'page' == $type ) {
+ $menu_item->type = $type;
+ $menu_item->object_id = $menu_item->ID;
+ $menu_item->parent_item = $menu_item->post_parent;
+ $menu_item->menu_order = $position;
+ }
</ins><span class="cx">
</span><span class="cx"> switch ( $menu_item->type ) {
</span><span class="cx"> // Page Menu Item
</span><span class="lines">@@ -86,6 +97,7 @@
</span><span class="cx"> else
</span><span class="cx"> $menu_item->description = htmlentities( $menu_item->post_content );
</span><span class="cx"> $menu_item->target = '';
</span><ins>+ $menu_item->append = 'Page';
</ins><span class="cx"> break;
</span><span class="cx"> // Category Menu Item
</span><span class="cx"> case 'category':
</span><span class="lines">@@ -106,6 +118,7 @@
</span><span class="cx"> else
</span><span class="cx"> $menu_item->description = htmlentities( $menu_item->post_content );
</span><span class="cx"> $menu_item->target = '';
</span><ins>+ $menu_item->append = 'Category';
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> // Custom Menu Item
</span><span class="lines">@@ -113,6 +126,7 @@
</span><span class="cx"> $menu_item->title = htmlentities( $menu_item->post_title );
</span><span class="cx"> $menu_item->description = htmlentities( $menu_item->post_content );
</span><span class="cx"> $menu_item->target = 'target="_blank"';
</span><ins>+ $menu_item->append = 'Custom';
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,6 +162,43 @@
</span><span class="cx"> return $menu_item;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function output_menu_item($menu_item, $context) {
+ switch( $context ) {
+ case 'backend':
+ case 'menu':
+?>
+ <dl>
+ <dt>
+ <span class="title"><?php echo esc_html($menu_item->title); ?></span>
+ <span class="controls">
+ <span class="type"><?php echo esc_html($menu_item->type); ?></span>
+ <a id="edit<?php echo $menu_item->menu_order; ?>" onclick="edititem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="edit" alt="<?php esc_attr_e('Edit Menu Item'); ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" src="<?php echo admin_url('images/ico-edit.png'); ?>" /></a>
+ <a id="remove<?php echo $menu_item->menu_order; ?>" onclick="removeitem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="remove" alt="<?php esc_attr_e('Remove from Custom Menu'); ?>" title="<?php esc_attr_e('Remove from Custom Menu'); ?>" src="<?php echo admin_url('images/ico-close.png'); ?>" /></a>
+ <a id="view<?php echo $menu_item->menu_order; ?>" target="_blank" href="<?php echo $menu_item->link; ?>"><img alt="<?php esc_attr_e('View Page'); ?>" title="<?php esc_attr_e('View Page'); ?>" src="<?php echo admin_url('images/ico-viewpage.png'); ?>" /></a>
+ </span>
+ </dt>
+ </dl>
+ <?php if ( 'backend' == $context ) { ?>
+ <a><span class=""></span></a>
+ <php } else { ?>
+ <a class="hide" href="<?php echo $menu_item->link; ?>"><?php echo $menu_item->title; ?></a>
+ <?php } ?>
+ <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
+ <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
+ <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->parent_item; ?>" />
+ <input type="hidden" name="title<?php echo $menu_item->menu_order; ?>" id="title<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->title; ?>" />
+ <input type="hidden" name="linkurl<?php echo $menu_item->menu_order; ?>" id="linkurl<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->link; ?>" />
+ <input type="hidden" name="description<?php echo $menu_item->menu_order; ?>" id="description<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->description; ?>" />
+ <input type="hidden" name="icon<?php echo $menu_item->menu_order; ?>" id="icon<?php echo $menu_item->menu_order; ?>" value="0" />
+ <input type="hidden" name="position<?php echo $menu_item->menu_order; ?>" id="position<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->menu_order; ?>" />
+ <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->type; ?>" />
+ <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
+ <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />
+<?php
+ break;
+ }
+}
+
</ins><span class="cx"> /*-----------------------------------------------------------------------------------*/
</span><span class="cx"> /* Custom Navigation Functions */
</span><span class="cx"> /* wp_custom_navigation_output() displays the menu in the back/frontend
</span><span class="lines">@@ -216,34 +267,7 @@
</span><span class="cx">
</span><span class="cx"> ?></a><?php
</span><span class="cx"> } elseif ( $type == 'backend' ) {
</span><del>- ?>
-
- <dl>
- <dt>
- <span class="title"><?php echo $menu_item->title; ?></span>
- <span class="controls">
- <span class="type"><?php echo $menu_item->type; ?></span>
- <a id="edit<?php echo $menu_item->menu_order; ?>" onclick="edititem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo admin_url('images/ico-edit.png'); ?>" /></a>
- <a id="remove<?php echo $menu_item->menu_order; ?>" onclick="removeitem(<?php echo $menu_item->menu_order; ?>)" value="<?php echo $menu_item->menu_order; ?>"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo admin_url('images/ico-close.png'); ?>" /></a>
- <a id="view<?php echo $menu_item->menu_order; ?>" target="_blank" href="<?php echo $menu_item->link; ?>"><img alt="View Page" title="View Page" src="<?php echo admin_url('images/ico-viewpage.png'); ?>" /></a>
- </span>
- </dt>
- </dl>
-
- <a><span class=""></span></a>
- <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
- <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $id; ?>" />
- <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->parent_item; ?>" />
- <input type="hidden" name="title<?php echo $menu_item->menu_order; ?>" id="title<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->title; ?>" />
- <input type="hidden" name="linkurl<?php echo $menu_item->menu_order; ?>" id="linkurl<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->link; ?>" />
- <input type="hidden" name="description<?php echo $menu_item->menu_order; ?>" id="description<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->description; ?>" />
- <input type="hidden" name="icon<?php echo $menu_item->menu_order; ?>" id="icon<?php echo $menu_item->menu_order; ?>" value="0" />
- <input type="hidden" name="position<?php echo $menu_item->menu_order; ?>" id="position<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->menu_order; ?>" />
- <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->type; ?>" />
- <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
- <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />
-
- <?php
</del><ins>+ output_menu_item($menu_item, 'backend');
</ins><span class="cx"> }
</span><span class="cx"> // Indent children
</span><span class="cx"> $last_item = ( count( $menu_items ) == $menu_item->menu_order );
</span><span class="lines">@@ -301,39 +325,13 @@
</span><span class="cx"> // Custom Menu
</span><span class="cx"> if ( $type == 'menu' ) {
</span><span class="cx"> $description = get_post_meta($post->ID, 'page-description', true);
</span><ins>+ $post = setup_menu_item($post, 'page', $intCounter);
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
</span><span class="cx">
</span><del>- <dl>
- <dt>
- <span class="title"><?php echo $post->post_title; ?></span>
- <span class="controls">
- <span class="type">page</span>
- <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
- <a id="remove<?php echo $intCounter; ?>" onclick="removeitem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>">
- <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
- </a>
- <a target="_blank" href="<?php echo get_permalink($post->ID); ?>">
- <img alt="View Page" title="View Page" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-viewpage.png" />
- </a>
- </span>
</del><ins>+ <?php output_menu_item($post, 'menu', $intCounter); ?>
</ins><span class="cx">
</span><del>- </dt>
- </dl>
- <a class="hide" href="<?php echo get_permalink($post->ID); ?>"><span class="title"><?php echo $post->post_title; ?></span>
- </a>
- <input type="hidden" name="postmenu<?php echo $intCounter; ?>" id="postmenu<?php echo $intCounter; ?>" value="<?php echo $post->ID; ?>" />
- <input type="hidden" name="parent<?php echo $intCounter; ?>" id="parent<?php echo $intCounter; ?>" value="0" />
- <input type="hidden" name="title<?php echo $intCounter; ?>" id="title<?php echo $intCounter; ?>" value="<?php echo htmlentities($post->post_title); ?>" />
- <input type="hidden" name="linkurl<?php echo $intCounter; ?>" id="linkurl<?php echo $intCounter; ?>" value="<?php echo get_permalink($post->ID); ?>" />
- <input type="hidden" name="description<?php echo $intCounter; ?>" id="description<?php echo $intCounter; ?>" value="<?php echo $description; ?>" />
- <input type="hidden" name="icon<?php echo $intCounter; ?>" id="icon<?php echo $intCounter; ?>" value="0" />
- <input type="hidden" name="position<?php echo $intCounter; ?>" id="position<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>" />
- <input type="hidden" name="linktype<?php echo $intCounter; ?>" id="linktype<?php echo $intCounter; ?>" value="page" />
- <input type="hidden" name="anchortitle<?php echo $intCounter; ?>" id="anchortitle<?php echo $intCounter; ?>" value="<?php echo htmlentities($post->post_title); ?>" />
- <input type="hidden" name="newwindow<?php echo $intCounter; ?>" id="newwindow<?php echo $intCounter; ?>" value="0" />
-
</del><span class="cx"> <?php $parentli = $post->ID; ?>
</span><span class="cx"> <?php $intCounter++; ?>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>