Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 9592) +++ wp-includes/script-loader.php (working copy) @@ -263,12 +263,12 @@ $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 @@ $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 @@ $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' ); Index: wp-admin/wp-admin.css =================================================================== --- wp-admin/wp-admin.css (revision 9592) +++ wp-admin/wp-admin.css (working copy) @@ -204,6 +204,19 @@ 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 @@ } #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,237 @@ 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; +#wpbody-content .inline-edit-row fieldset { + font-size: 12px; + float: left; + margin: 0; + padding: 0; + width: 100%; } -.inline-editor .save, -.inline-editor .cancel { - margin-right: 5px; +#wpbody-content .inline-edit-row fieldset .inline-edit-col { + padding: 0 0.5em; } -.inline-editor .quick-edit-div { - float: left; - height: 85px; - margin: 0 5px 3px 0; - width: 130px; - border-style: solid; - border-width: 1px; - padding: 2px; +#wpbody-content .quick-edit-row-page fieldset.inline-edit-col-right .inline-edit-col { + border-left: 1px solid; } -.inline-editor .in { - padding: 4px; - margin: 2px 0 0; - line-height: 15px; +#wpbody-content .quick-edit-row-post .inline-edit-col-left, +#wpbody-content .quick-edit-row-post .inline-edit-col-right { + width: 40%; } -.inline-editor input { - font-size: 11px !important; - padding: 2px; - border-width: 1px; - border-style: solid; +#wpbody-content .inline-edit-row-post .inline-edit-col-center { + width: 20%; } -#wpbody-content .inline-editor select { - padding: 0; - height: auto; - width: 120px; - font-size: 11px !important; +#wpbody-content .quick-edit-row-page .inline-edit-col-left, +#wpbody-content .quick-edit-row-page .inline-edit-col-right, +#wpbody-content .bulk-edit-row-post .inline-edit-col-right { + width: 50%; } -.inline-editor div.title { - height: 18px; - line-height: 16px; - padding: 1px 5px; - cursor: default; +#wpbody-content .bulk-edit-row .inline-edit-col-left { + width: 30%; } -.inline-editor .post-title, -.inline-editor .page-title, -.inline-editor .tax-name, -.inline-editor .tax-slug { - width: 260px; +#wpbody-content .bulk-edit-row-page .inline-edit-col-right { + width: 70%; } -#bulk-edit .post-title, -#bulk-edit .page-title { - width: 200px; - height: 179px; +#wpbody-content .bulk-edit-row .inline-edit-col-bottom { + float: right; + width: 70%; } -.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 .inline-edit-row-page .inline-edit-col-right, +#owpbody-content .bulk-edit-row-post .inline-edit-col-right { + margin-top: 27px; } -.inline-editor .post-title .slug, -.inline-editor .page-title .slug { - text-align: right; +.inline-edit-row fieldset .inline-edit-group { + clear: both; } -.inline-editor .slug input { - width: 170px; - margin: 0 2px 0 4px; +.inline-edit-row fieldset .inline-edit-group:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } -.inline-editor .password input, -.inline-editor .order input { - width: 112px; +.inline-edit-row p.submit { + clear: both; + padding: 0.5em 0; + margin: 0.5em 0.5em 0; } -.inline-editor .password label input { +/* 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; + clear: both; + 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"] { - width: 3.5em; +.inline-edit-row fieldset label textarea { + width: 100%; + clear: both; + height: 4em; } -#wpbody-content .inline-editor .date select, -#wpbody-content .inline-editor .modified select { - width: 6em; +#wpbody-content .bulk-edit-row fieldset .inline-edit-group label { + max-width: 50%; } -.inline-editor .categories, -.inline-editor .column-posts { - width: 200px; +#wpbody-content .quick-edit-row fieldset .inline-edit-group label.alignleft:first-child { + margin-right: 0.5em } -.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; +/* Styling */ +.inline-edit-row h4 { + text-transform: uppercase; } -.inline-editor .categories ul.cat-hover { - height: 200px; - overflow-x: auto; +.inline-edit-row fieldset span.title, +.inline-edit-row fieldset span.checkbox-title { + font-family: Georgia, serif; + font-style: italic; } -.inline-editor .categories ul.children { - list-style: none; - padding-left: 15px; +/* Specific Elements */ +.inline-edit-row fieldset .inline-edit-date { + float: left; } -.inline-editor .categories li { - margin-bottom: 3px; - line-height: auto; +.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-editor .categories input { - vertical-align: middle; - padding: 0; - border: 0; +.inline-edit-row fieldset input[name=aa] { + font-size: 12px; + width: 3.5em; } -.inline-editor .categories .catshow, -.inline-editor .categories .cathide { - font-size: 9px; - cursor: pointer; +.inline-edit-row fieldset label input.inline-edit-password-input { + width: 8em; } -.inline-editor .tags { - width: 200px; +ul.cat-checklist { + display: block; + height: 12em; + border: 1px solid; + overflow-y: scroll; + padding: .1em; + margin: 0 0 0.5em; } -.inline-editor textarea { - border-width: 1px; - border-style: solid; - height: 45px; - width: 180px; - font-size: 11px; +#bulk-titles { + display: block; + height: 12em; + border: 1px solid; + overflow-y: scroll; + padding: .1em; + margin: 0 0 0.5em; } -.inline-editor .comments { - text-align: left; - width: 160px; +.inline-edit-row fieldset ul.cat-checklist li, +.inline-edit-row fieldset ul.cat-checklist input { + margin: 0; } -#wpbody-content .inline-editor .comments select { - margin-bottom: 3px; - width: 150px; +.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; } -.inline-editor .parent, -.inline-editor .tax-parent { - width: 180px; +table .inline-edit-row fieldset ul.cat-hover { + height: auto; + max-height: 30em; + overflow-y: auto; + position: absolute; } -#wpbody-content .inline-editor .parent select, -#wpbody-content .inline-editor .tax-parent select { - width: 170px; +.inline-edit-row fieldset label input.inline-edit-menu-order-input { + width: 3em; } -.inline-editor .quick-edit-save { - padding: 8px 10px; +.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 { - height: 150px; - overflow: auto; - cursor: default; + line-height: 140%; } - #bulk-titles div { - padding: 1px 2px; + margin: 0.2em 0.3em; } #bulk-titles div a { Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 9592) +++ wp-admin/includes/post.php (working copy) @@ -215,7 +215,7 @@ $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 @@ $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 ); Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 9592) +++ wp-admin/includes/template.php (working copy) @@ -204,66 +204,57 @@ $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 = ''; ?>
- "; - break; - case 'slug': ?> -
title=""> -
-
- -
-
- + + + - $output .= ""; - break; - case 'posts': - if ( 'category' == $type ) { ?> -
title=""> -
-
- 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?> -
-
- + + + + + + + + true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true ); + + foreach ( $columns as $column_name => $column_display_name ) { + if ( isset( $core_columns[$column_name] ) ) + continue; + do_action( 'quick_edit_custom_box', $column_name, $type ); } - ?> -
-
- - + +?> + +

+ + -

+
+

+ $can_publish = current_user_can('publish_posts'); + $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true ); +?> +
- " style="display: none"> -

- - +

+ + +

Index: wp-admin/js/inline-edit-post.js =================================================================== --- wp-admin/js/inline-edit-post.js (revision 9592) +++ wp-admin/js/inline-edit-post.js (working copy) @@ -29,9 +29,12 @@ // 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.inline-edit-col-bottom').prepend( + $('#inline-edit label.inline-edit-tags').clone() ); // categories expandable? @@ -97,8 +100,7 @@ $('tbody th.check-column input[type="checkbox"]').each(function(i){ if ( $(this).attr('checked') ) { var id = $(this).val(); - c = c == '' ? ' class="alternate"' : ''; - te += 'X'+$('#inline_'+id+' .post_title').text()+''; + te += '
X'+$('#inline_'+id+' .post_title').text()+'
'; } }); @@ -188,7 +190,7 @@ 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 @@ .animate( { backgroundColor: '#eefee7' }, 500); inlineEditPost.addEvents(row); } else { - $('#edit-'+id+' .quick-edit-save').append(''+inlineEditL10n.error+''); + $('#edit-'+id+' .inline-edit-save').append(''+inlineEditL10n.error+''); } } ); @@ -233,7 +235,7 @@ 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(); Index: wp-admin/js/inline-edit-tax.js =================================================================== --- wp-admin/js/inline-edit-tax.js (revision 9592) +++ wp-admin/js/inline-edit-tax.js (working copy) @@ -92,7 +92,7 @@ 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 @@ .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 @@ 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(); Index: wp-admin/css/dashboard.css =================================================================== --- wp-admin/css/dashboard.css (revision 9592) +++ wp-admin/css/dashboard.css (working copy) @@ -296,20 +296,6 @@ 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; }
- $style = ''; - if ( in_array($column_name, $hidden) ) - $style = ' style="display:none;"'; +
+

- $attributes = "$class$style"; - switch($column_name) { - case 'cb': - break; + +
+
+
- case 'date': - if ( ! $bulk ) { ?> -
title=""> -
-
- -
-
- - case 'title': - $attributes = "class=\"$type-title column-title quick-edit-div\"" . $style; ?> - -
id="bulk-title-div" title=""> -
-
-
-
-
- -
> -
-
-
-
-
-
-
- + -
-
-
- - - - -
-
+ - -
-
-
- -
-
-
-
-
- -
-
+ - -
-
-
- -
-
- + + + - break; + +
+ +
+
- case 'categories': ?> - -
title=""> -
- -
-
    - -
-
- - -
title=""> -
-
- -
-
- 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 -'); +?> + - case 'comments': - ?> -
title=""> -
-
- - - - -
- - -
-
- - case 'author': - $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM - if ( $authors && count( $authors ) > 1 ) { ?> -
title=""> -
-
- $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1); - if ( $bulk ) $users_opt['show_option_none'] = __('- No Change -'); - wp_dropdown_users( $users_opt ); ?> -
-
- + - -
-
-
- - -
-
- + - default: - if ( $bulk ) - do_action('bulk_edit_custom_box', $column_name, $type); - else - do_action('quick_edit_custom_box', $column_name, $type); + +
- break; - } - } ?> + -
-
- - +
+ + + +
+ + + + +
    + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + + +
+ + + + + + + + + + + + + + + + +
+ +
+ + $column_display_name ) { + if ( isset( $core_columns[$column_name] ) ) + continue; + do_action( $bulk ? 'bulk_edit_custom_box' : 'quick_edit_custom_box', $column_name, $type); + } +?> +

+ + - +
+