<!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>[33268] trunk/src/wp-admin: Media: Reduce link noise between icons and titles in list view.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33268">33268</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33268","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-14 17:23:42 +0000 (Tue, 14 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Reduce link noise between icons and titles in list view.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/32254">#32254</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincsslisttablescss">trunk/src/wp-admin/css/list-tables.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2015-07-14 16:29:37 UTC (rev 33267)
+++ trunk/src/wp-admin/css/common.css 2015-07-14 17:23:42 UTC (rev 33268)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #00a0d2;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-a:focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+a:focus,
+a:focus .media-icon img {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #124964;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow:
</span><span class="cx" style="display: block; padding: 0 10px"> 0 0 0 1px #5b9dd9,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,10 +531,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 9px 0 22px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.widefat.media .check-column {
- padding-top: 8px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .widefat thead td.check-column,
</span><span class="cx" style="display: block; padding: 0 10px"> .widefat tbody th.check-column,
</span><span class="cx" style="display: block; padding: 0 10px"> .widefat tfoot td.check-column {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2029,23 +2026,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* - Only used once or twice in all of WP - deprecate for global style
</span><span class="cx" style="display: block; padding: 0 10px"> ------------------------------------------------------------------------------*/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-td.media-icon {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-icon {
+ width: 62px; /* icon + border */
</ins><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 80px;
- padding-top: 8px;
- padding-bottom: 8px;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-td.media-icon a {
- display: inline-block;
-}
-
-td.media-icon img {
- display: block;
- max-width: 80px;
- max-height: 60px;
- width: auto;
- height: auto;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-icon img {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #e7e7e7;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid rgba(0, 0, 0, 0.07);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincsslisttablescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/list-tables.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/list-tables.css 2015-07-14 16:29:37 UTC (rev 33267)
+++ trunk/src/wp-admin/css/list-tables.css 2015-07-14 17:23:42 UTC (rev 33268)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding-left: 3px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> td.column-title strong,
</span><span class="cx" style="display: block; padding: 0 10px"> td.plugin-title strong {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,27 +352,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Media file column */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-table.media .column-title {
- position: relative;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> table.media .column-title .media-icon {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- position: absolute;
- top: 8px; /* match cell padding */
- left: 10px; /* match cell padding */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ float: left;
+ min-height: 60px;
+ margin: 0 9px 0 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> table.media .column-title .media-icon img {
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 60px;
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ vertical-align: top; /* Remove descender white-space. */
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-table.media .column-title .media-info,
</del><span class="cx" style="display: block; padding: 0 10px"> table.media .column-title .row-actions {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: 70px; /* 60px image + margin */
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-table.media .column-title .media-info p {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+table.media .column-title .filename {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0.2em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-07-14 16:29:37 UTC (rev 33267)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-07-14 17:23:42 UTC (rev 33268)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,40 +338,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_title( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $mime ) = explode( '/', $post->post_mime_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_can_edit = current_user_can( 'edit_post', $post->ID );
- $att_title = _draft_or_post_title();
- ?>
- <div class="media-icon <?php echo $mime ?>-icon">
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = _draft_or_post_title();
+ $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+ $link_start = $link_end = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true );
- if ( $thumb ) {
- if ( $this->is_trash || ! $user_can_edit ) {
- echo $thumb;
- } else { ?>
- <a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php
- echo esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) );
- ?>"><?php echo $thumb; ?></a><?php
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
+ $link_start = '<a href="' . get_edit_post_link( $post->ID ) . '">';
+ $link_end = '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </div>
- <div class="media-info">
- <strong>
- <?php
- if ( $this->is_trash || ! $user_can_edit ) {
- echo $att_title;
- } else { ?>
- <a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php
- echo esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) );
- ?>"><?php echo $att_title; ?></a><?php
- }
- _media_states( $post );
- ?>
- </strong>
- <p class="filename"><?php echo wp_basename( $post->guid ); ?></p>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong>
+ <?php echo $link_start; ?>
+ <?php if ( $thumb ) : ?>
+ <span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
+ <?php endif; ?>
+
+ <span aria-hidden="true"><?php echo $title; ?></span>
+ <span class="screen-reader-text"><?php printf( __( 'Edit “%s”' ), $title ); ?></span>
+ <?php echo $link_end; ?>
+ <?php _media_states( $post ); ?>
+ </strong>
+ <p class="filename"><span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span><?php echo wp_basename( $post->guid ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>