<!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" />
<title>[23622] trunk/wp-admin: Tweak the Nav Menu UX, especially around menu creation.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23622">23622</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-03-06 19:34:01 +0000 (Wed, 06 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tweak the Nav Menu UX, especially around menu creation.

props lessbloat, DrewAPicture, jkudish. fixes <a href="http://core.trac.wordpress.org/ticket/23641">#23641</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (23621 => 23622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css        2013-03-05 21:44:38 UTC (rev 23621)
+++ trunk/wp-admin/css/wp-admin.css        2013-03-06 19:34:01 UTC (rev 23622)
</span><span class="lines">@@ -7382,6 +7382,12 @@
</span><span class="cx">         padding: 0px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.nav-menus-php .add-new-menu-action {
+        float: left;
+        margin: 6px 0 0 6px;
+        line-height: 15px;
+}
+
</ins><span class="cx"> .nav-menus-php .meta-sep,
</span><span class="cx"> .nav-menus-php .submitdelete,
</span><span class="cx"> .nav-menus-php .submitcancel {
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (23621 => 23622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php        2013-03-05 21:44:38 UTC (rev 23621)
+++ trunk/wp-admin/nav-menus.php        2013-03-06 19:34:01 UTC (rev 23622)
</span><span class="lines">@@ -453,17 +453,21 @@
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;div class=&quot;wrap&quot;&gt;
</span><span class="cx">         &lt;?php screen_icon(); ?&gt;
</span><del>-        &lt;h2&gt;&lt;?php _e( 'Menus' ); ?&gt; &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( array( 'action' =&gt; 'edit', 'menu' =&gt; 0, ), admin_url( 'nav-menus.php' ) ) ); ?&gt;&quot; class=&quot;add-new-h2&quot;&gt;&lt;?php _e( 'Add New' ); ?&gt;&lt;/a&gt;&lt;/h2&gt;
</del><ins>+        &lt;h2&gt;&lt;?php _e( 'Menus' ); ?&gt;&lt;/h2&gt;
</ins><span class="cx">         &lt;?php
</span><span class="cx">         foreach( $messages as $message ) :
</span><span class="cx">                 echo $message . &quot;\n&quot;;
</span><span class="cx">         endforeach;
</span><span class="cx">         ?&gt;
</span><del>-        &lt;?php if ( 1 &lt; $menu_count ) : ?&gt;
-        &lt;form method=&quot;post&quot; action=&quot;&lt;?php echo admin_url( 'nav-menus.php' ); ?&gt;&quot;&gt;
-                &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;edit&quot; /&gt;
-                &lt;div class=&quot;manage-menus&quot;&gt;
-                        &lt;label for=&quot;menu&quot; class=&quot;selected-menu&quot;&gt;&lt;?php _e('Select menu to edit'); ?&gt;&lt;/label&gt;
</del><ins>+        &lt;div class=&quot;manage-menus&quot;&gt;
+        &lt;?php if ( $menu_count &lt; 2 ) : ?&gt;
+                &lt;span class=&quot;add-edit-menu-action&quot;&gt;
+                        &lt;?php printf( __( 'Edit your menu below, or &lt;a href=&quot;%s&quot;&gt;create a new menu&lt;/a&gt;.' ), esc_url( add_query_arg( array( 'action' =&gt; 'edit', 'menu' =&gt; 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?&gt;
+                &lt;/span&gt;&lt;!-- /add-edit-menu-action --&gt;
+        &lt;?php else : ?&gt;
+                &lt;form method=&quot;post&quot; action=&quot;&lt;?php echo admin_url( 'nav-menus.php' ); ?&gt;&quot;&gt;
+                        &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;edit&quot; /&gt;
+                        &lt;label for=&quot;menu&quot; class=&quot;selected-menu&quot;&gt;&lt;?php _e( 'Select a menu to edit:' ); ?&gt;&lt;/label&gt;
</ins><span class="cx">                         &lt;select name=&quot;menu&quot; id=&quot;menu&quot;&gt;
</span><span class="cx">                                 &lt;?php if ( $add_new_screen ) : ?&gt;
</span><span class="cx">                                         &lt;option value=&quot;0&quot; selected=&quot;selected&quot;&gt;&lt;?php _e( '-- Select --' ); ?&gt;&lt;/option&gt;
</span><span class="lines">@@ -491,9 +495,12 @@
</span><span class="cx">                                 &lt;?php endforeach; ?&gt;
</span><span class="cx">                         &lt;/select&gt;
</span><span class="cx">                         &lt;span class=&quot;submit-btn&quot;&gt;&lt;input type=&quot;submit&quot; class=&quot;button-secondary&quot; value=&quot;&lt;?php _e( 'Select' ); ?&gt;&quot;&gt;&lt;/span&gt;
</span><del>-                &lt;/div&gt;
-        &lt;/form&gt;
</del><ins>+                        &lt;span class=&quot;add-new-menu-action&quot;&gt;
+                                &lt;?php printf( __( 'or &lt;a href=&quot;%s&quot;&gt;create a new menu&lt;/a&gt;.' ), esc_url( add_query_arg( array( 'action' =&gt; 'edit', 'menu' =&gt; 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?&gt;
+                        &lt;/span&gt;&lt;!-- /add-new-menu-action --&gt;
+                &lt;/form&gt;
</ins><span class="cx">         &lt;?php endif; ?&gt;
</span><ins>+        &lt;/div&gt;&lt;!-- /manage-menus --&gt;
</ins><span class="cx">         &lt;div id=&quot;nav-menus-frame&quot;&gt;
</span><span class="cx">         &lt;div id=&quot;menu-settings-column&quot; class=&quot;metabox-holder&lt;?php if ( isset( $_GET['menu'] ) &amp;&amp; '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?&gt;&quot;&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>