diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index 4959ad287c..08d9906c4b 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -2425,12 +2425,13 @@ table.fixed { .fixed .column-date, .fixed .column-parent, -.fixed .column-links { +.fixed .column-links, +.fixed .column-author, +.fixed .column-format { width: 10%; } .fixed .column-response, -.fixed .column-author, .fixed .column-categories, .fixed .column-tags, .fixed .column-rel, @@ -2529,8 +2530,8 @@ table.fixed { } tr.wp-locked .locked-indicator { - background: url('../images/lock16.png') no-repeat; - margin: -2px 0 0 8px; + background: url('../images/lock.png') no-repeat; + margin: -2px 0 0 6px; height: 16px; width: 16px; } @@ -2538,15 +2539,10 @@ tr.wp-locked .locked-indicator { tr.wp-locked .check-column label, tr.wp-locked .check-column input[type="checkbox"], tr.wp-locked .row-actions .inline, -tr.wp-locked .row-actions .trash, -.lock-holder { +tr.wp-locked .row-actions .trash { display: none; } -tr.wp-locked .lock-holder { - display: inline; -} - .fixed .column-comments .sorting-indicator { margin-top: 3px; } @@ -9034,6 +9030,11 @@ a.widget-control-edit { background-size: 18px 100px; } + tr.wp-locked .locked-indicator { + background-image: url('../images/lock-2x.png'); + background-size: 16px 16px; + } + th .comment-grey-bubble { background-image: url('../images/comment-grey-bubble-2x.png'); background-size: 12px 12px; diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 15f9702ab6..8af5bbc100 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -145,7 +145,6 @@ if ( $doaction ) { $wp_list_table->prepare_items(); wp_enqueue_script('inline-edit-post'); -wp_enqueue_script('edit-post'); $title = $post_type_object->labels->name; diff --git a/wp-admin/images/lock-2x.png b/wp-admin/images/lock-2x.png new file mode 100644 index 0000000000..46c5a482b7 Binary files /dev/null and b/wp-admin/images/lock-2x.png differ diff --git a/wp-admin/images/lock.png b/wp-admin/images/lock.png new file mode 100644 index 0000000000..e17cc7dcb6 Binary files /dev/null and b/wp-admin/images/lock.png differ diff --git a/wp-admin/images/lock16.png b/wp-admin/images/lock16.png deleted file mode 100644 index 8f66ac5732..0000000000 Binary files a/wp-admin/images/lock16.png and /dev/null differ diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 996dc4fcae..8a2aa319e1 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -553,9 +553,15 @@ class WP_Posts_List_Table extends WP_List_Table { echo "\n"; - if ( $lock_holder && $can_edit_post && $post->post_status != 'trash' ) { - printf( '%s', - esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) ) ); + if ( $can_edit_post && $post->post_status != 'trash' ) { + if ( $lock_holder ) { + $locked_avatar = get_avatar( $lock_holder->ID, 18 ); + $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) ); + } else { + $locked_avatar = $locked_text = ''; + } + + echo '' . $locked_avatar . ' ' . $locked_text . "\n"; } if ( ! $this->hierarchical_display && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) ) diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 630a28128b..8f7aa2200c 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -566,16 +566,21 @@ add_action('admin_head', '_ipad_meta'); * * @since 3.6 */ -function wp_check_locked_posts( $response, $data ) { +function wp_check_locked_posts( $response, $data, $screen_id ) { $checked = array(); - if ( array_key_exists( 'wp-check-locked', $data ) && is_array( $data['wp-check-locked'] ) ) { + if ( 'edit-post' == $screen_id && array_key_exists( 'wp-check-locked', $data ) && is_array( $data['wp-check-locked'] ) ) { foreach ( $data['wp-check-locked'] as $key ) { $post_id = (int) substr( $key, 5 ); - if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) ) { - if ( $user = get_userdata( $user_id ) ) - $checked[$key] = sprintf( __( '%s is currently editing' ), $user->display_name ); + if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) { + $send = array(); + + if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) + $send['avatar_src'] = $matches[1]; + + $send['text'] = sprintf( __( '%s is currently editing' ), $user->display_name ); + $checked[$key] = $send; } } } @@ -585,7 +590,7 @@ function wp_check_locked_posts( $response, $data ) { return $response; } -add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 2 ); +add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 ); /** * Check lock status on the New/Edit Post screen and refresh the lock diff --git a/wp-admin/js/edit-post.js b/wp-admin/js/edit-post.js deleted file mode 100644 index ef581c7c39..0000000000 --- a/wp-admin/js/edit-post.js +++ /dev/null @@ -1,25 +0,0 @@ -(function($){ - $( document ).on( 'heartbeat-tick.wp-check-locked', function( e, data ) { - var locked = data['wp-check-locked'] || {}; - - $('#the-list tr').each( function(i, el) { - var key = el.id, row = $(el); - - if ( locked.hasOwnProperty( key ) ) { - if ( ! row.hasClass('wp-locked') ) - row.addClass('wp-locked').find('.column-title strong').after( $('').text(locked[key]) ); - row.find('.check-column checkbox').prop('checked', false); - } else if ( row.hasClass('wp-locked') ) { - row.removeClass('wp-locked').find('.column-title span.lock-holder').remove(); - } - }); - }).on( 'heartbeat-send.wp-check-locked', function( e, data ) { - var check = []; - - $('#the-list tr').each( function(i, el) { - check.push( el.id ); - }); - - data['wp-check-locked'] = check; - }); -}(jQuery)); diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js index 1764c162b4..db4e80bc3c 100644 --- a/wp-admin/js/inline-edit-post.js +++ b/wp-admin/js/inline-edit-post.js @@ -290,5 +290,39 @@ inlineEditPost = { } }; -$(document).ready(function(){inlineEditPost.init();}); -})(jQuery); +$( document ).ready( function(){ inlineEditPost.init(); } ); + +// Show/hide locks on posts +$( document ).on( 'heartbeat-tick.wp-check-locked', function( e, data ) { + var locked = data['wp-check-locked'] || {}; + + $('#the-list tr').each( function(i, el) { + var key = el.id, row = $(el), lock_data, avatar; + + if ( locked.hasOwnProperty( key ) ) { + if ( ! row.hasClass('wp-locked') ) { + lock_data = locked[key]; + row.addClass('wp-locked').find('.column-title .locked-text').text( lock_data.text ); + row.find('.check-column checkbox').prop('checked', false); + + if ( lock_data.avatar_src ) { + avatar = $('').attr( 'src', lock_data.avatar_src.replace(/&/g, '&') ); + row.find('.column-title .locked-avatar').empty().append( avatar ); + } + } + } else if ( row.hasClass('wp-locked') ) { + row.removeClass('wp-locked').find('.column-title .locked-text').empty(); + row.find('.column-title .locked-avatar').empty(); + } + }); +}).on( 'heartbeat-send.wp-check-locked', function( e, data ) { + var check = []; + + $('#the-list tr').each( function(i, el) { + check.push( el.id ); + }); + + data['wp-check-locked'] = check; +}); + +}(jQuery)); diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 84b76d34b8..38c44889a1 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -419,9 +419,7 @@ function wp_default_scripts( &$scripts ) { // @todo: Core no longer uses theme-preview.js. Remove? $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), false, 1 ); - $scripts->add( 'edit-post', "/wp-admin/js/edit-post$suffix.js", array( 'heartbeat' ), false, 1 ); - - $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 ); + $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest', 'heartbeat' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array( 'error' => __('Error while saving the changes.'), 'ntdeltitle' => __('Remove From Bulk Edit'),