<!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>[13340] trunk/wp-admin/custom-navigation.php: Use 'Menus'.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13340">13340</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-23 20:38:27 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use 'Menus'. 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 (13339 => 13340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-23 20:28:52 UTC (rev 13339)
+++ trunk/wp-admin/custom-navigation.php 2010-02-23 20:38:27 UTC (rev 13340)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * WordPress Administration Custom Navigation
</del><ins>+ * WordPress Administration for Navigation Menus
</ins><span class="cx"> * Interface functions
</span><span class="cx"> *
</span><span class="cx"> * @author Jeffikus <pearce.jp@gmail.com>
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><del>- <div id="no-js"><h3><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.'); ?></h3></div>
</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>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $messagesdiv = '';
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if ( isset( $_POST['set_wp_menu'] ) ) {
</span><span class="cx"> // @todo validate set_wp_menu
</span><span class="cx"> update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
</span><del>- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Custom Menu has been updated!') . '</p></div>';
</del><ins>+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Menu has been updated!') . '</p></div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['licount'] ) )
</span><span class="lines">@@ -178,9 +178,10 @@
</span><span class="cx">
</span><span class="cx"> // DISPLAY Custom Navigation
</span><span class="cx"> ?>
</span><ins>+ <?php screen_icon(); ?>
+ <h2 class="maintitle"><?php esc_html_e('Menus') ?></h2>
</ins><span class="cx"> <div id="pages-left">
</span><span class="cx"> <div class="inside">
</span><del>- <h2 class="maintitle"><?php esc_html_e('Custom Navigation') ?></h2>
</del><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> // CHECK if custom menu has been enabled
</span><span class="lines">@@ -188,7 +189,7 @@
</span><span class="cx"> $checked = strtolower($enabled_menu);
</span><span class="cx">
</span><span class="cx"> if ( $checked != 'true' )
</span><del>- echo '<div id="message-enabled" class="error fade below-h2"><p><strong>' . __('The Custom Menu has not been Enabled yet. Please enable it in order to use it -------->') . '</strong></p></div>';
</del><ins>+ 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>';
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <?php echo $messagesdiv; ?>
</span><span class="lines">@@ -233,13 +234,10 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="menu-right">
</span><del>-
- <h2 class="heading"><?php esc_html_e('Options'); ?></h2>
-
</del><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3><?php esc_html_e('Setup Custom Menu'); ?></h3>
</del><ins>+ <h3><?php esc_html_e('Setup Menus'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>