New design of Quick/Bulk Edit (added some colors and IE fixes), props mdawaffe, see #8144

git-svn-id: http://svn.automattic.com/wordpress/trunk@9604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-11-11 02:58:24 +00:00
parent d244c57a7f
commit 41870c14a8
10 changed files with 563 additions and 441 deletions

View File

@ -1,4 +1,8 @@
html {
background-color: #f9f9f9;
}
.find-box-search {
border-color: #dfdfdf;
background-color: #f1f1f1;
@ -65,6 +69,7 @@ div.dashboard-widget,
.widefat {
border-color: #dfdfdf;
background-color: #fff;
}
div.dashboard-widget-error {
@ -1160,8 +1165,9 @@ div.star.select:hover {
}
/* inline editor */
.inline-editor input,
.inline-editor textarea,
.inline-edit-row fieldset input[type="text"],
.inline-edit-row fieldset textarea,
#bulk-titles,
#replyrow input {
border-color: #ddd;
}
@ -1172,6 +1178,11 @@ div.star.select:hover {
.inline-editor ul.cat-checklist {
background-color: #FFFFFF;
border-color: #ddd;
}
.inline-edit-row p.submit {
background-color: #f1f1f1;
}
.inline-editor .categories .catshow,

View File

@ -296,20 +296,6 @@ div.postbox div.inside {
margin: 0 1em 0 10px;
}
#dashboard-widgets #dashboard_quick_press form p.submit .cancel {
padding-left: 0;
padding-right: 0;
border: none;
background-color: transparent;
text-decoration: underline;
color: red;
}
#dashboard-widgets #dashboard_quick_press form p.submit .cancel:hover {
text-decoration: none;
}
#dashboard-widgets #dashboard_quick_press form p.submit #publish {
float: right;
}

View File

@ -61,7 +61,6 @@ table {
#wpwrap {
height: auto;
min-height: 100%;
overflow: hidden;
width: 100%;
}

View File

@ -137,6 +137,43 @@ input.button-highlighted {
margin-top: 10px;
}
/* Inline Editor */
#wpbody-content .quick-edit-row-post .inline-edit-col-left {
width: 39%;
}
#wpbody-content .inline-edit-row-post .inline-edit-col-center {
width: 19%;
}
#wpbody-content .quick-edit-row-page .inline-edit-col-left {
width: 49%;
}
#wpbody-content .bulk-edit-row .inline-edit-col-left {
width: 29%;
}
.inline-edit-row p.submit {
zoom: 100%;
}
.inline-edit-row fieldset label span.title {
display: block;
float: left;
width: 5em;
}
.inline-edit-row fieldset label span.input-text-wrap {
margin-left: 0;
zoom: 100%;
}
#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input {
line-height: 130%;
}
/* end Inline Editor */
* html div.widget-liquid-left-holder,
* html div.widget-liquid-right {
display: block;

View File

@ -215,7 +215,7 @@ function bulk_edit_posts( $post_data = null ) {
$post_IDs = array_map( intval, (array) $post_data['post'] );
$reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category' );
$reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category', 'sticky' );
foreach ( $reset as $field ) {
if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
unset($post_data[$field]);
@ -274,6 +274,14 @@ function bulk_edit_posts( $post_data = null ) {
$post_data['ID'] = $post_ID;
$updated[] = wp_update_post( $post_data );
if ( current_user_can( 'edit_others_posts' ) && isset( $post_data['sticky'] ) ) {
if ( 'sticky' == $post_data['sticky'] )
stick_post( $post_ID );
else
unstick_post( $post_ID );
}
}
return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );

View File

@ -204,66 +204,57 @@ function inline_edit_term_row($type) {
$is_tag = $type == 'tag';
$columns = $is_tag ? get_column_headers('tag') : get_column_headers('category');
$hidden = (array) get_user_option( "manage-$type-columns-hidden" );
$hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) );
$col_count = count($columns) - count($hidden);
$output = ''; ?>
<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
<tr id="inline-edit" style="display: none"><td colspan="8">
<?php
<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $col_count; ?>">
<fieldset><div class="inline-edit-col">
<h4><?php _e( 'Quick Edit' ); ?></h4>
<label>
<span class="title"><?php _e( 'Name' ); ?></span>
<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
</label>
<label>
<span class="title"><?php _e( 'Slug' ); ?></span>
<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
</label>
<?php if ( 'category' == $type ) : ?>
<label>
<span class="title"><?php _e( 'Parent' ); ?></span>
<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?>
</label>
<?php endif; // $type ?>
</div></fieldset>
<?php
$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
foreach ( $columns as $column_name => $column_display_name ) {
$class = "class=\"$column_name column-$column_name quick-edit-div\"";
$style = in_array($column_name, $hidden) ? ' style="display:none;"' : '';
$attributes = "$class$style";
switch ($column_name) {
case 'cb':
break;
case 'description':
break;
case 'name': ?>
<div class="tax-name quick-edit-div"<?php echo $style ?> title="<?php _e('Name'); ?>">
<div class="title"><?php _e('Name'); ?></div>
<div class="in">
<input type="text" name="name" class="ptitle" value="" />
</div>
</div>
<?php
$output .= "<td $attributes></td>";
break;
case 'slug': ?>
<div class="tax-slug quick-edit-div"<?php echo $style ?> title="<?php _e('Slug'); ?>">
<div class="title"><?php _e('Slug'); ?></div>
<div class="in">
<input type="text" name="slug" class="ptitle" value="" />
</div>
</div>
<?php
$output .= "<td $attributes></td>";
break;
case 'posts':
if ( 'category' == $type ) { ?>
<div class="tax-parent quick-edit-div"<?php echo $style ?> title="<?php _e('Parent Category'); ?>">
<div class="title"><?php _e('Parent Category'); ?></div>
<div class="in">
<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?>
</div>
</div>
<?php }
break;
}
if ( isset( $core_columns[$column_name] ) )
continue;
do_action( 'quick_edit_custom_box', $column_name, $type );
}
?>
<div class="clear"></div>
<div class="quick-edit-save">
<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel"><?php _e('Cancel'); ?></a>
<a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-secondary save"><?php _e('Save'); ?></a>
?>
<p class="inline-edit-save submit">
<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
<a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="save button-primary alignright"><?php _e('Save'); ?></a>
<img class="waiting" style="display:none;" src="images/loading.gif" alt="" />
<span class="error" style="display:none;"></span>
<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
</div>
<br class="clear" />
</p>
</td></tr>
</tbody></table></form>
<?php
@ -886,224 +877,258 @@ function inline_edit_row( $type ) {
$post = get_default_post_to_edit();
$columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
$hidden = (array) get_user_option( "manage-$type-columns-hidden" );
$hidden_count = empty($hidden[0]) ? 0 : count($hidden);
$col_count = count($columns) - $hidden_count;
$hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) );
$col_count = count($columns) - count($hidden);
$m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
$can_publish = current_user_can('publish_posts'); ?>
$can_publish = current_user_can('publish_posts');
$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
?>
<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
<?php
$bulk = 0;
while ( $bulk < 2 ) { ?>
<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
<?php
foreach($columns as $column_name=>$column_display_name) {
$class = "class=\"$column_name column-$column_name quick-edit-div\"";
<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type ";
echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type";
?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
$style = '';
if ( in_array($column_name, $hidden) )
$style = ' style="display:none;"';
<fieldset class="inline-edit-col-left"><div class="inline-edit-col">
<h4><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></h4>
$attributes = "$class$style";
switch($column_name) {
case 'cb':
break;
<?php if ( $bulk ) : ?>
<div id="bulk-title-div">
<div id="bulk-titles"></div>
</div>
case 'date':
if ( ! $bulk ) { ?>
<div <?php echo $attributes; ?> title="<?php _e('Timestamp'); ?>">
<div class="title"><?php _e('Timestamp'); ?></div>
<div class="in">
<?php touch_time(1, 1, 4, 1); ?>
</div>
</div>
<?php
}
break;
<?php else : // $bulk ?>
case 'title':
$attributes = "class=\"$type-title column-title quick-edit-div\"" . $style; ?>
<?php if ( $bulk ) { ?>
<div <?php echo $attributes; ?> id="bulk-title-div" title="<?php $is_page ? _e('Selected pages') : _e('Selected posts'); ?>">
<div class="title"><?php $is_page ? _e('Selected pages') : _e('Selected posts'); ?></div>
<div class="in">
<div id="bulk-titles"></div>
</div>
</div>
<?php } else { ?>
<div <?php echo $attributes ?>>
<div class="title"><?php _e('Title'); ?></div>
<div class="in">
<label title="<?php _e('Title'); ?>"><input type="text" name="post_title" class="ptitle" value="" /></label><br />
<div class="slug">
<label title="<?php _e('Slug'); ?>"><?php _e('Slug'); ?><input type="text" name="post_name" value="" /></label></div>
</div>
</div>
<?php } ?>
<label>
<span class="title"><?php _e( 'Title' ); ?></span>
<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
</label>
<div class="status quick-edit-div" title="<?php _e('Status'); ?>">
<div class="title"><?php _e('Status'); ?></div>
<div class="in">
<select name="_status">
<?php if ( $bulk ) { ?>
<option value="-1"><?php _e('- No Change -'); ?></option>
<?php if ( $can_publish ) { ?>
<option value="private"><?php _e('Private') ?></option>
<?php } ?>
<?php } ?>
<?php if ( $can_publish ) { // Contributors only get "Unpublished" and "Pending Review" ?>
<option value="publish"><?php _e('Published') ?></option>
<option value="future"><?php _e('Scheduled') ?></option>
<?php } ?>
<option value="pending"><?php _e('Pending Review') ?></option>
<option value="draft"><?php _e('Unpublished') ?></option>
</select>
<?php if ( !$is_page ) { ?>
<label title="<?php _e('Sticky') ?>">
<input type="checkbox" name="sticky" value="sticky" /> <?php _e('Sticky') ?></label>
<?php } ?>
</div>
</div>
<?php endif; // $bulk ?>
<?php if ( $is_page ) { ?>
<div class="parent quick-edit-div" title="<?php _e('Page Parent'); ?>">
<div class="title"><?php _e('Page Parent'); ?></div>
<div class="in">
<select name="post_parent">
<?php if ( $bulk ) { ?>
<option value="-1"><?php _e('- No Change -'); ?></option>
<?php } ?>
<option value="0"><?php _e('Main Page (no parent)'); ?></option>
<?php parent_dropdown(); ?>
</select>
</div>
</div>
<div class="template quick-edit-div" title="<?php _e('Page Template'); ?>">
<div class="title"><?php _e('Page Template'); ?></div>
<div class="in">
<select name="page_template">
<?php if ( $bulk ) { ?>
<option value="-1"><?php _e('- No Change -'); ?></option>
<?php } ?>
<option value="default"><?php _e('Default Template'); ?></option>
<?php page_template_dropdown() ?>
</select>
</div>
</div>
<?php if ( !$bulk ) : ?>
<?php if ( ! $bulk ) { ?>
<div class="order quick-edit-div" title="<?php _e('Page Order'); ?>">
<div class="title"><?php _e('Page Order'); ?></div>
<div class="in">
<input type="text" name="menu_order" value="<?php echo $post->menu_order ?>" />
</div>
</div>
<?php }
}
<label>
<span class="title"><?php _e( 'Slug' ); ?></span>
<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
</label>
break;
<label><span class="title"><?php _e( 'Date' ); ?></span></label>
<div class="inline-edit-date">
<?php touch_time(1, 1, 4, 1); ?>
</div>
<br class="clear" />
case 'categories': ?>
<?php if ( ! $bulk ) { ?>
<div <?php echo $attributes ?> title="<?php _e('Categories'); ?>">
<div class="title"><?php _e('Categories'); ?>
<span class="catshow"><?php _e('(expand)'); ?></span>
<span class="cathide" style="display:none;"><?php _e('(fold)'); ?></span></div>
<ul class="cat-checklist">
<?php wp_category_checklist(); ?>
</ul>
</div>
<?php }
break;
<?php endif; // $bulk
case 'tags': ?>
<?php if ( ! $bulk ) { ?>
<div <?php echo $attributes ?> title="<?php _e('Tags'); ?>">
<div class="title"><?php _e('Tags'); ?></div>
<div class="in">
<textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea>
</div>
</div>
<?php }
break;
ob_start();
$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
if ( $authors && count( $authors ) > 1 ) :
$users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1);
if ( $bulk )
$users_opt['show_option_none'] = __('- No Change -');
?>
<label>
<span class="title"><?php _e( 'Author' ); ?></span>
<?php wp_dropdown_users( $users_opt ); ?>
</label>
case 'comments':
?>
<div <?php echo $attributes ?> title="<?php _e('Comments and Pings'); ?>">
<div class="title"><?php _e('Comments and Pings'); ?></div>
<div class="in">
<?php if ( $bulk ) { ?>
<select name="comment_status">
<option value=""><?php _e('- No Change -'); ?></option>
<option value="open"><?php _e('Allow Comments'); ?></option>
<option value="closed"><?php _e('Disallow Comments'); ?></option>
</select>
<select name="ping_status">
<option value=""><?php _e('- No Change -'); ?></option>
<option value="open"><?php _e('Allow Pings'); ?></option>
<option value="closed"><?php _e('Disallow Pings'); ?></option>
</select>
<?php } else { ?>
<label><input type="checkbox" name="comment_status" value="open" />
<?php _e('Allow Comments'); ?></label><br />
<label><input type="checkbox" name="ping_status" value="open" />
<?php _e('Allow Pings'); ?></label>
<?php } ?>
</div>
</div>
<?php
break;
<?php
endif; // authors
$authors_dropdown = ob_get_clean();
?>
case 'author':
$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
if ( $authors && count( $authors ) > 1 ) { ?>
<div <?php echo $attributes ?> title="<?php _e('Author'); ?>">
<div class="title"><?php _e('Author'); ?></div>
<div class="in">
<?php
$users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1);
if ( $bulk ) $users_opt['show_option_none'] = __('- No Change -');
wp_dropdown_users( $users_opt ); ?>
</div>
</div>
<?php } ?>
<?php if ( !$bulk ) : echo $authors_dropdown; ?>
<?php if ( ! $bulk ) { ?>
<div class="password quick-edit-div" title="<?php _e('Password'); ?>">
<div class="title"><?php _e('Password'); ?></div>
<div class="in">
<input type="text" name="post_password" value="" />
<label title="<?php _e('Privacy'); ?>">
<input type="checkbox" name="keep_private" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php echo $is_page ? __('Keep this page private') : __('Keep this post private'); ?></label>
</div>
</div>
<?php }
break;
<div class="inline-edit-group">
<label class="alignleft">
<span class="title"><?php _e( 'Password' ); ?></span>
<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
</label>
default:
if ( $bulk )
do_action('bulk_edit_custom_box', $column_name, $type);
else
do_action('quick_edit_custom_box', $column_name, $type);
<label class="alignleft inline-edit-private">
<input type="checkbox" name="keep_private" value="private" <?php checked($post->post_status, 'private'); ?> />
<span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span>
</label>
</div>
break;
}
} ?>
<?php endif; ?>
<div class="clear"></div>
<div class="quick-edit-save">
<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel"><?php _e('Cancel'); ?></a>
<a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-secondary save"><?php _e('Save'); ?></a>
</div></fieldset>
<?php if ( !$is_page && !$bulk ) : ?>
<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
<span class="title inline-edit-categories-label"><?php _e( 'Categories' ); ?>
<span class="catshow"><?php _e('[more]'); ?></span>
<span class="cathide" style="display:none;"><?php _e('[less]'); ?></span>
</span>
<ul class="cat-checklist">
<?php wp_category_checklist(); ?>
</ul>
</div></fieldset>
<?php endif; // !$is_page && !$bulk ?>
<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
<?php
if ( $bulk )
echo $authors_dropdown;
?>
<?php if ( $is_page ) : ?>
<label>
<span class="title"><?php _e( 'Parent' ); ?></span>
<select name="post_parent">
<?php if ( $bulk ) : ?>
<option value="-1"><?php _e('- No Change -'); ?></option>
<?php endif; // $bulk ?>
<option value="0"><?php _e( 'Main Page (no parent)' ); ?></option>
<?php parent_dropdown(); ?>
</select>
</label>
<?php if ( !$bulk ) : ?>
<label>
<span class="title"><?php _e( 'Order' ); ?></span>
<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
</label>
<?php endif; // !$bulk ?>
<label>
<span class="title"><?php _e( 'Template' ); ?></span>
<select name="page_template">
<?php if ( $bulk ) : ?>
<option value="-1"><?php _e('- No Change -'); ?></option>
<?php endif; // $bulk ?>
<option value="default"><?php _e( 'Default Template' ); ?></option>
<?php page_template_dropdown() ?>
</select>
</label>
<?php elseif ( !$bulk ) : // $is_page ?>
<label class="inline-edit-tags">
<span class="title"><?php _e( 'Tags' ); ?></span>
<textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea>
</label>
<?php endif; // $is_page ?>
<?php if ( $bulk ) : ?>
<div class="inline-edit-group">
<label class="alignleft">
<span class="title"><?php _e( 'Comments' ); ?></span>
<select name="comment_status">
<option value=""><?php _e('- No Change -'); ?></option>
<option value="open"><?php _e('Allow'); ?></option>
<option value="closed"><?php _e('Do not allow'); ?></option>
</select>
</label>
<label class="alignright">
<span class="title"><?php _e( 'Pings' ); ?></span>
<select name="ping_status">
<option value=""><?php _e('- No Change -'); ?></option>
<option value="open"><?php _e('Allow'); ?></option>
<option value="closed"><?php _e('Do not allow'); ?></option>
</select>
</label>
</div>
<?php else : // $bulk ?>
<div class="inline-edit-group">
<label class="alignleft">
<input type="checkbox" name="comment_status" value="open" />
<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
</label>
<label class="alignleft">
<input type="checkbox" name="ping_status" value="open" />
<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
</label>
</div>
<?php endif; // $bulk ?>
<div class="inline-edit-group">
<label class="inline-edit-status alignleft">
<span class="title"><?php _e( 'Status' ); ?></span>
<select name="_status">
<?php if ( $bulk ) : ?>
<option value="-1"><?php _e('- No Change -'); ?></option>
<?php endif; // $bulk ?>
<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
<option value="publish"><?php _e( 'Published' ); ?></option>
<option value="future"><?php _e( 'Scheduled' ); ?></option>
<?php if ( $bulk ) : ?>
<option value="private"><?php _e('Private') ?></option>
<?php endif; // $bulk ?>
<?php endif; ?>
<option value="pending"><?php _e( 'Pending Review' ); ?></option>
<option value="draft"><?php _e( 'Unpublished' ); ?></option>
</select>
</label>
<?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
<?php if ( $bulk ) : ?>
<label class="alignright">
<span class="title"><?php _e( 'Sticky' ); ?></span>
<select name="sticky">
<option value="-1"><?php _e( '- No Change -' ); ?></option>
<option value="sticky"><?php _e( 'Sticky' ); ?></option>
<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
</select>
</label>
<?php else : // $bulk ?>
<label class="alignleft">
<input type="checkbox" name="sticky" value="sticky" />
<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
</label>
<?php endif; // $bulk ?>
<?php endif; // !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ?>
</div>
</div></fieldset>
<?php
foreach ( $columns as $column_name => $column_display_name ) {
if ( isset( $core_columns[$column_name] ) )
continue;
do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $type);
}
?>
<p class="submit inline-edit-save">
<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></a>
<a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-primary save alignright"><?php _e('Save'); ?></a>
<?php if ( ! $bulk ) {
wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?>
<img class="waiting" style="display:none;" src="images/loading.gif" alt="" />
<?php } ?>
<input type="hidden" name="post_view" value="<?php echo $m; ?>" />
</div>
<br class="clear" />
</p>
</td></tr>
<?php
$bulk++;
@ -2030,13 +2055,14 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
<div id="replycontainer"><textarea rows="8" cols="40" name="replycontent" tabindex="104" id="replycontent"></textarea></div>
<p id="replysubmit">
<a href="#comments-form" class="cancel button" tabindex="106"><?php _e('Cancel'); ?></a>
<a href="#comments-form" class="save button" tabindex="104">
<p id="replysubmit" class="submit">
<a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a>
<a href="#comments-form" class="save button-primary alignright" tabindex="104">
<span id="savebtn" style="display:none;"><?php _e('Save'); ?></span>
<span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
<img class="waiting" style="display:none;" src="images/loading.gif" alt="" />
<span class="error" style="display:none;"></span>
<br class="clear" />
</p>
<input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" />

View File

@ -29,9 +29,12 @@ inlineEditPost = {
// t.rows.dblclick(function() { inlineEditPost.toggle(this); });
t.addEvents(t.rows);
$('#bulk-title-div').after(
$('#inline-edit div.categories').clone(),
$('#inline-edit div.tags').clone()
$('#bulk-title-div').parents('fieldset').after(
$('#inline-edit fieldset.inline-edit-categories').clone()
).siblings( 'fieldset:last' ).prepend(
// ).siblings( 'fieldset:last' ).after( '<fieldset class="inline-edit-col-bottom"><div class="inline-edit-col"></div></fieldset>' );
// $('fieldset.inline-edit-col-bottom').prepend(
$('#inline-edit label.inline-edit-tags').clone()
);
// categories expandable?
@ -97,8 +100,7 @@ inlineEditPost = {
$('tbody th.check-column input[type="checkbox"]').each(function(i){
if ( $(this).attr('checked') ) {
var id = $(this).val();
c = c == '' ? ' class="alternate"' : '';
te += '<div'+c+' id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton">X</a>'+$('#inline_'+id+' .post_title').text()+'</div>';
te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton">X</a>'+$('#inline_'+id+' .post_title').text()+'</div>';
}
});
@ -188,7 +190,7 @@ inlineEditPost = {
if( typeof(id) == 'object' )
id = this.getId(id);
$('table.widefat .quick-edit-save .waiting').show();
$('table.widefat .inline-edit-save .waiting').show();
var params = {
action: 'inline-save',
@ -218,7 +220,7 @@ inlineEditPost = {
.animate( { backgroundColor: '#eefee7' }, 500);
inlineEditPost.addEvents(row);
} else {
$('#edit-'+id+' .quick-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>');
$('#edit-'+id+' .inline-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>');
}
}
);
@ -233,7 +235,7 @@ inlineEditPost = {
var id;
if ( id = $('table.widefat tr.inline-editor').attr('id') ) {
$('table.widefat .quick-edit-save .waiting').hide();
$('table.widefat .inline-edit-save .waiting').hide();
if ( 'bulk-edit' == id ) {
$('table.widefat #bulk-edit').removeClass('inline-editor').hide();

View File

@ -92,7 +92,7 @@ inlineEditTax = {
if( typeof(id) == 'object' )
id = this.getId(id);
$('table.widefat .quick-edit-save .waiting').show();
$('table.widefat .inline-edit-save .waiting').show();
var params = {
action: 'inline-save-tax',
@ -117,9 +117,9 @@ inlineEditTax = {
.animate( { backgroundColor: '#eefee7' }, 500);
inlineEditTax.addEvents(row);
} else
$('#edit-'+id+' .quick-edit-save .error').html(r).show();
$('#edit-'+id+' .inline-edit-save .error').html(r).show();
} else
$('#edit-'+id+' .quick-edit-save .error').html(inlineEditL10n.error).show();
$('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
}
);
return false;
@ -129,7 +129,7 @@ inlineEditTax = {
var id = $('table.widefat tr.inline-editor').attr('id');
if ( id ) {
$('table.widefat .quick-edit-save .waiting').hide();
$('table.widefat .inline-edit-save .waiting').hide();
$('#'+id).remove();
id = id.substr( id.lastIndexOf('-') + 1 );
$(this.what+id).show();

View File

@ -204,6 +204,19 @@ table#availablethemes td.bottom {
border-bottom-right-radius: 3px;
}
form p.submit .cancel {
padding-left: 0;
padding-right: 0;
border: none;
background: transparent;
text-decoration: underline;
color: red;
}
form p.submit .cancel:hover {
text-decoration: none;
}
.submit-top {
border-top: 0 none;
border-bottom-style: solid;
@ -2383,7 +2396,7 @@ fieldset {
}
#replysubmit img.waiting,
.quick-edit-save img.waiting,
.inline-edit-save img.waiting,
#commentstatusdiv img.waiting {
padding: 0 10px;
vertical-align: top;
@ -2556,209 +2569,248 @@ fieldset {
display: none;
}
/* Inline Editor */
.inline-editor {
font-size: 11px;
/* Inline Editor
.quick-edit* is for Quick Edit
.bulk-edit* is for Bulk Edit
.inline-edit* is for everything
*/
/* Layout */
tr.inline-edit-row td {
padding: 0 0.5em;
}
.inline-editor td {
padding: 3px;
}
.inline-editor .save,
.inline-editor .cancel {
margin-right: 5px;
}
.inline-editor .quick-edit-div {
#wpbody-content .inline-edit-row fieldset {
font-size: 12px;
float: left;
height: 85px;
margin: 0 5px 3px 0;
width: 130px;
border-style: solid;
border-width: 1px;
padding: 2px;
}
.inline-editor .in {
padding: 4px;
margin: 2px 0 0;
line-height: 15px;
}
.inline-editor input {
font-size: 11px !important;
padding: 2px;
border-width: 1px;
border-style: solid;
}
#wpbody-content .inline-editor select {
margin: 0;
padding: 0;
height: auto;
width: 120px;
font-size: 11px !important;
width: 100%;
}
.inline-editor div.title {
height: 18px;
line-height: 16px;
padding: 1px 5px;
cursor: default;
#wpbody-content .inline-edit-row fieldset .inline-edit-col {
padding: 0 0.5em;
}
.inline-editor .post-title,
.inline-editor .page-title,
.inline-editor .tax-name,
.inline-editor .tax-slug {
width: 260px;
#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col {
border-left: 1px solid;
}
#bulk-edit .post-title,
#bulk-edit .page-title {
width: 200px;
height: 179px;
#wpbody-content .quick-edit-row-post .inline-edit-col-left {
width: 40%;
}
.inline-editor .post-title .ptitle,
.inline-editor .page-title .ptitle,
.inline-editor .tax-name .ptitle,
.inline-editor .tax-slug .ptitle {
width: 245px;
margin-bottom: 5px;
font-size: 12px !important;
#wpbody-content .quick-edit-row-post .inline-edit-col-right {
width: 39%;
}
.inline-editor .post-title .slug,
.inline-editor .page-title .slug {
text-align: right;
#wpbody-content .inline-edit-row-post .inline-edit-col-center {
width: 20%;
}
.inline-editor .slug input {
width: 170px;
margin: 0 2px 0 4px;
#wpbody-content .quick-edit-row-page .inline-edit-col-left {
width: 50%;
}
.inline-editor .password input,
.inline-editor .order input {
width: 112px;
#wpbody-content .quick-edit-row-page .inline-edit-col-right,
#wpbody-content .bulk-edit-row-post .inline-edit-col-right {
width: 49%;
}
.inline-editor .password label input {
#wpbody-content .bulk-edit-row .inline-edit-col-left {
width: 30%;
}
#wpbody-content .bulk-edit-row-page .inline-edit-col-right {
width: 69%;
}
#wpbody-content .bulk-edit-row .inline-edit-col-bottom {
float: right;
width: 69%;
}
#wpbody-content .inline-edit-row-page .inline-edit-col-right,
#owpbody-content .bulk-edit-row-post .inline-edit-col-right {
margin-top: 27px;
}
.inline-edit-row fieldset .inline-edit-group {
clear: both;
}
.inline-edit-row fieldset .inline-edit-group:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.inline-edit-row p.submit {
clear: both;
padding: 0.5em;
margin: 0.5em 0 0;
}
/* Positioning */
.inline-edit-row h4 {
margin: .2em 0;
padding: 0;
line-height: 27px;
}
.inline-edit-row fieldset span.title,
.inline-edit-row fieldset span.checkbox-title {
margin: 0;
padding: 0;
line-height: 27px;
}
.inline-edit-row fieldset label,
.inline-edit-row fieldset span.inline-edit-categories-label {
display: block;
margin: .2em 0;
}
.inline-edit-row fieldset label.inline-edit-tags {
margin-top: 0;
}
.inline-edit-row fieldset label.inline-edit-tags span.title {
margin: .2em 0;
}
.inline-edit-row fieldset label span.title {
display: block;
float: left;
width: 5em;
}
.inline-edit-row fieldset label span.input-text-wrap {
display: block;
margin-left: 5em;
}
.quick-edit-row-post fieldset.inline-edit-col-right label span.title {
width: auto;
margin: 3px 0 0;
padding-right: 0.5em;
}
.inline-editor .date,
.inline-editor .modified {
width: 160px;
.inline-edit-row fieldset label input[type=text] {
width: 100%;
}
.inline-editor .date input,
.inline-editor .modified input {
padding: 2px 1px;
margin: 1px;
width: 2em;
.inline-edit-row fieldset label input[type=checkbox] {
vertical-align: text-bottom;
}
.inline-editor .date input[name="aa"],
.inline-editor .modified input[name="aa"] {
.inline-edit-row fieldset label textarea {
width: 100%;
height: 4em;
}
#wpbody-content .bulk-edit-row fieldset .inline-edit-group label {
max-width: 50%;
}
#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child {
margin-right: 0.5em
}
/* Styling */
.inline-edit-row h4 {
text-transform: uppercase;
}
.inline-edit-row fieldset span.title,
.inline-edit-row fieldset span.checkbox-title {
font-family: Georgia, serif;
font-style: italic;
}
/* Specific Elements */
.inline-edit-row fieldset input[type="text"],
.inline-edit-row fieldset textarea {
border-style: solid;
border-width: 1px;
}
.inline-edit-row fieldset .inline-edit-date {
float: left;
}
.inline-edit-row fieldset input[name=jj],
.inline-edit-row fieldset input[name=hh],
.inline-edit-row fieldset input[name=mn] {
font-size: 12px;
width: 2.1em;
}
.inline-edit-row fieldset input[name=aa] {
font-size: 12px;
width: 3.5em;
}
#wpbody-content .inline-editor .date select,
#wpbody-content .inline-editor .modified select {
width: 6em;
.inline-edit-row fieldset label input.inline-edit-password-input {
width: 8em;
}
.inline-editor .categories,
.inline-editor .column-posts {
width: 200px;
}
.inline-editor .categories ul.cat-checklist {
list-style: none;
padding: 0 0 0 4px;
margin: 0;
height: 65px;
overflow: auto;
font-size: 11px;
z-index: 5;
position: relative;
overflow-x: hidden;
}
.inline-editor .categories ul.cat-hover {
height: 200px;
overflow-x: auto;
}
.inline-editor .categories ul.children {
list-style: none;
padding-left: 15px;
}
.inline-editor .categories li {
margin-bottom: 3px;
line-height: auto;
}
.inline-editor .categories input {
vertical-align: middle;
padding: 0;
border: 0;
}
.inline-editor .categories .catshow,
.inline-editor .categories .cathide {
font-size: 9px;
cursor: pointer;
}
.inline-editor .tags {
width: 200px;
}
.inline-editor textarea {
border-width: 1px;
ul.cat-checklist {
height: 12em;
border-style: solid;
height: 45px;
width: 180px;
font-size: 11px;
}
.inline-editor .comments {
text-align: left;
width: 160px;
}
#wpbody-content .inline-editor .comments select {
margin-bottom: 3px;
width: 150px;
}
.inline-editor .parent,
.inline-editor .tax-parent {
width: 180px;
}
#wpbody-content .inline-editor .parent select,
#wpbody-content .inline-editor .tax-parent select {
width: 170px;
}
.inline-editor .quick-edit-save {
padding: 8px 10px;
border-width: 1px;
overflow-y: scroll;
padding: 0 5px;
margin: 0 0 5px;
}
#bulk-titles {
height: 150px;
overflow: auto;
cursor: default;
display: block;
height: 12em;
border-style: solid;
border-width: 1px;
overflow-y: scroll;
padding: 0 5px;
margin: 0 0 5px;
}
.inline-edit-row fieldset ul.cat-checklist li,
.inline-edit-row fieldset ul.cat-checklist input {
margin: 0;
}
.inline-edit-row fieldset ul.cat-checklist label,
.inline-edit-row .catshow,
.inline-edit-row .cathide,
.inline-edit-row #bulk-titles div {
font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
font-style: normal;
font-size: 11px;
}
table .inline-edit-row fieldset ul.cat-hover {
height: auto;
max-height: 30em;
overflow-y: auto;
position: absolute;
}
.inline-edit-row fieldset label input.inline-edit-menu-order-input {
width: 3em;
}
.inline-edit-row fieldset label input.inline-edit-slug-input {
width: 75%;
}
.quick-edit-row-post fieldset label.inline-edit-status {
float: left;
}
#bulk-titles {
line-height: 140%;
}
#bulk-titles div {
padding: 1px 2px;
margin: 0.2em 0.3em;
}
#bulk-titles div a {
@ -3058,3 +3110,4 @@ br.clear {
vertical-align: middle;
}

View File

@ -263,12 +263,12 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
$scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081107' );
$scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081110' );
$scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
'error' => __('Error while saving the changes.')
) );
$scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081107' );
$scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081110' );
$scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
'error' => __('Error while saving the changes.')
) );
@ -328,7 +328,7 @@ function wp_default_styles( &$styles ) {
$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie', 'plugin-install', 'farbtastic' );
$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081109' );
$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081110' );
$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
$styles->add( 'ie', '/wp-admin/css/ie.css' );
@ -341,7 +341,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'global', '/wp-admin/css/global.css', array(), '20081106' );
$styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' );
$styles->add( 'widgets', '/wp-admin/css/widgets.css' );
$styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081105' );
$styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081110' );
$styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' );
$styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
$styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' );