golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up the menu name/actions section. see #13525. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-05-27 04:19:23 +00:00
parent addcd21cc0
commit c029f47d0e
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/nav-menu.css
View File

File diff suppressed because one or more lines are too long

23
wp-admin/css/nav-menu.dev.css
View File

@ -162,12 +162,6 @@ body {
display: inline; display: inline;
} }
/* Menu Toolbar */
#menu-management .major-publishing-actions #delete-action {
float: right;
margin-right: 10px;
}
#menu-name-label { #menu-name-label {
margin-top: -2px; margin-top: -2px;
} }
@ -482,30 +476,37 @@ body.js .item-order {
/* Major/minor publishing actions (classes) */ /* Major/minor publishing actions (classes) */
.major-publishing-actions { .major-publishing-actions {
clear:both; clear:both;
padding: 5px 10px; padding: 5px 10px;
zoom:1; zoom:1;
} }
.major-publishing-actions .publishing-action { .major-publishing-actions .publishing-action {
clear: both;
text-align: right; text-align: right;
float: right; float: right;
line-height: 23px; line-height: 23px;
margin: 5px 0 1px;
} }
.major-publishing-actions .delete-action { .major-publishing-actions .delete-action {
vertical-align: middle; vertical-align: middle;
text-align: left; text-align: left;
float: right; float: left;
padding-right: 15px; padding-right: 15px;
margin-top: 5px;
} }
.menu-name-label span, .auto-add-pages label { .menu-name-label span, .auto-add-pages label {
font-size: 11px; font-size: 11px;
font-style: normal; font-style: normal;
} }
.auto-add-pages label.howto { .menu-name-label {
display: inline; margin-right: 15px;
}
.auto-add-pages input {
margin-top: 0;
} }
.auto-add-pages { .auto-add-pages {
clear: both; margin-top: 4px;
float: left;
} }
.submitbox .submitcancel { .submitbox .submitcancel {
color: #21759B; color: #21759B;

19
wp-admin/nav-menus.php
View File

@ -525,16 +525,6 @@ require_once( 'admin-header.php' );
<span><?php _e('Menu Name'); ?></span> <span><?php _e('Menu Name'); ?></span>
<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here.'); ?>" value="<?php echo esc_attr( $nav_menu_selected_title ); ?>" /> <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here.'); ?>" value="<?php echo esc_attr( $nav_menu_selected_title ); ?>" />
</label> </label>
<div class="publishing-action">
<input class="button-primary menu-save" name="save_menu" type="submit" value="<?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?>" />
</div><!--END .publishing-action-->
<?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
<div class="delete-action">
<a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ) ); ?>"><?php _e('Delete Menu'); ?></a>
</div><!--END .delete-action-->
<?php endif; ?>
<?php if ( !empty( $nav_menu_selected_id ) ) : <?php if ( !empty( $nav_menu_selected_id ) ) :
if ( ! isset( $auto_add ) ) { if ( ! isset( $auto_add ) ) {
$auto_add = get_option( 'nav_menu_options' ); $auto_add = get_option( 'nav_menu_options' );
@ -550,6 +540,15 @@ require_once( 'admin-header.php' );
<label class="howto"><input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" value="1" /> <?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label> <label class="howto"><input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" value="1" /> <?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="publishing-action">
<input class="button-primary menu-save" name="save_menu" type="submit" value="<?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?>" />
</div><!--END .publishing-action-->
<?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
<div class="delete-action">
<a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ) ); ?>"><?php _e('Delete Menu'); ?></a>
</div><!--END .delete-action-->
<?php endif; ?>
</div><!--END .major-publishing-actions--> </div><!--END .major-publishing-actions-->
</div><!--END #submitpost .submitbox--> </div><!--END #submitpost .submitbox-->
<?php <?php

4
wp-includes/script-loader.php
View File

@ -385,7 +385,7 @@ function wp_default_scripts( &$scripts ) {
) ); ) );
// Custom Navigation // Custom Navigation
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100526' ); $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100527' );
$scripts->localize( 'nav-menu', 'navMenuL10n', array( $scripts->localize( 'nav-menu', 'navMenuL10n', array(
'home' => _x('Home', 'nav menu home label'), 'home' => _x('Home', 'nav menu home label'),
'homeurl' => home_url('/'), 'homeurl' => home_url('/'),
@ -467,7 +467,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100526' ); $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100527' );
foreach ( $rtl_styles as $rtl_style ) { foreach ( $rtl_styles as $rtl_style ) {
$styles->add_data( $rtl_style, 'rtl', true ); $styles->add_data( $rtl_style, 'rtl', true );