<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23371] trunk/wp-admin: Posts screen: show when a post is "locked", hide the checkbox, Quick Edit and Trash links, props dh-shredder, see #23312</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23371">23371</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-02-02 01:31:06 +0000 (Sat, 02 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Posts screen: show when a post is "locked", hide the checkbox, Quick Edit and Trash links, props dh-shredder, see <a href="http://core.trac.wordpress.org/ticket/23312">#23312</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminimageslock16png">trunk/wp-admin/images/lock16.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (23370 => 23371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-02-02 01:01:35 UTC (rev 23370)
+++ trunk/wp-admin/css/wp-admin.css 2013-02-02 01:31:06 UTC (rev 23371)
</span><span class="lines">@@ -2527,6 +2527,25 @@
</span><span class="cx"> background-repeat: no-repeat;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+tr.wp-locked .locked-indicator {
+ background: url('../images/lock16.png') no-repeat;
+ margin: -2px 0 0 8px;
+ height: 16px;
+ width: 16px;
+}
+
+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 {
+ display: none;
+}
+
+tr.wp-locked .lock-holder {
+ display: inline;
+}
+
</ins><span class="cx"> .fixed .column-comments .sorting-indicator {
</span><span class="cx"> margin-top: 3px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimageslock16png"></a>
<div class="binary"><h4>Added: trunk/wp-admin/images/lock16.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/wp-admin/images/lock16.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (23370 => 23371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2013-02-02 01:01:35 UTC (rev 23370)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2013-02-02 01:31:06 UTC (rev 23371)
</span><span class="lines">@@ -472,9 +472,19 @@
</span><span class="cx"> $title = _draft_or_post_title();
</span><span class="cx"> $post_type_object = get_post_type_object( $post->post_type );
</span><span class="cx"> $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID );
</span><ins>+ $lock_holder_id = wp_check_post_lock( $post->ID );
+ $lock_holder = '';
</ins><span class="cx">
</span><span class="cx"> $alternate = 'alternate' == $alternate ? '' : 'alternate';
</span><span class="cx"> $classes = $alternate . ' iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
</span><ins>+
+ if ( $lock_holder_id ) {
+ $classes .= ' wp-locked';
+ $lock_holder_data = get_user_by( 'id', $lock_holder_id );
+
+ if ( $lock_holder_data )
+ $lock_holder = esc_html( sprintf( __('Currently edited by %s'), $lock_holder_data->data->display_name ) );
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>" valign="top">
</span><span class="cx"> <?php
</span><span class="lines">@@ -495,10 +505,16 @@
</span><span class="cx"> case 'cb':
</span><span class="cx"> ?>
</span><span class="cx"> <th scope="row" class="check-column">
</span><del>- <?php if ( $can_edit_post ) { ?>
</del><ins>+ <?php
+ if ( $can_edit_post ) {
+
+ ?>
</ins><span class="cx"> <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php printf( __( 'Select %s' ), $title ); ?></label>
</span><span class="cx"> <input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
</span><del>- <?php } ?>
</del><ins>+ <div class="locked-indicator"></div>
+ <?php
+ }
+ ?>
</ins><span class="cx"> </th>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="lines">@@ -525,17 +541,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $pad = str_repeat( '&#8212; ', $level );
</span><del>-?>
- <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); echo isset( $parent_name ) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?></strong>
-<?php
- }
- else {
</del><ins>+
+ ?>
+ <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); echo isset( $parent_name ) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?></strong>
+ <?php
+
+ if ( $can_edit_post && $post->post_status != 'trash' ) {
+ ?>
+ <span class="lock-holder"><?php echo $lock_holder; ?></span>
+ <?php
+ }
+ } else {
</ins><span class="cx"> $attributes = 'class="post-title page-title column-title"' . $style;
</span><span class="cx">
</span><span class="cx"> $pad = str_repeat( '&#8212; ', $level );
</span><del>-?>
- <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); ?></strong>
-<?php
</del><ins>+
+ ?>
+ <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); ?></strong>
+ <?php
+
+ if ( $can_edit_post && $post->post_status != 'trash' ) {
+ ?>
+ <span class="lock-holder"><?php echo $lock_holder; ?></span>
+ <?php
+ }
+
</ins><span class="cx"> if ( 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) )
</span><span class="cx"> the_excerpt();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>