Changeset 23681

Timestamp:

03/13/2013 12:28:07 AM (12 years ago)

Author:

azaozz

Message:

Post locks on the posts list screen: new icons for the lock, props empireoflight, show avatar for the user currently editing, props dh-shredder, see #23312

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (4 diffs)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/images/lock-2x.png (added)
• wp-admin/images/lock.png (added)
• wp-admin/images/lock16.png (deleted)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (2 diffs)
• wp-admin/js/edit-post.js (deleted)
• wp-admin/js/inline-edit-post.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin.css

@@ -2426 +2426 @@
 .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,
@@ -2530 +2531 @@
 
 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;
@@ -2539 +2540 @@
 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;
 }
 
@@ -9035 +9031 @@
     }
 
+    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');

trunk/wp-admin/edit.php

@@ -146 +146 @@
 
 wp_enqueue_script('inline-edit-post');
-wp_enqueue_script('edit-post');
 
 $title = $post_type_object->labels->name;

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -554 +554 @@
                 echo "</strong>\n";
 
-                if ( $lock_holder && $can_edit_post && $post->post_status != 'trash' ) {
-                    printf( '<span class="lock-holder">%s</span>',
-                        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 '<span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span>\n";
                 }
 

trunk/wp-admin/includes/misc.php

@@ -567 +567 @@
  * @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;
             }
         }
@@ -586 +591 @@
     return $response;
 }
-add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 2 );
+add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
 
 /**

trunk/wp-admin/js/inline-edit-post.js

@@ -291 +291 @@
 };
 
-$(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 = $('<img class="avatar avatar-18 photo" width="18" height="18" />').attr( 'src', lock_data.avatar_src.replace(/&amp;/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));

trunk/wp-includes/script-loader.php

@@ -420 +420 @@
         $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.'),