<!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>[29219] trunk/src/wp-admin: Plugin install cards:</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29219">29219</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-07-18 06:07:21 +0000 (Fri, 18 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Plugin install cards:

* Move author attribution to its own line.
* Use `esc_url()` where appropriate.
* Better i18n.
* min-height for cards for a more even appearance.
* Show more cards on wide screens.
* Tighten up spacing below the filter bar.

props ocean90, helen. see <a href="http://core.trac.wordpress.org/ticket/28785">#28785</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsslisttablescss">trunk/src/wp-admin/css/list-tables.css</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsslisttablescss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/list-tables.css (29218 => 29219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/list-tables.css   2014-07-18 04:49:19 UTC (rev 29218)
+++ trunk/src/wp-admin/css/list-tables.css      2014-07-18 06:07:21 UTC (rev 29219)
</span><span class="lines">@@ -1211,6 +1211,10 @@
</span><span class="cx">  margin: 2.5em 0 8px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.plugin-install-php .wp-filter {
+       margin-bottom: 0;
+}
+
</ins><span class="cx"> /* Plugin card table view */
</span><span class="cx"> .plugin-card {
</span><span class="cx">  float: left;
</span><span class="lines">@@ -1225,6 +1229,41 @@
</span><span class="cx">  box-sizing: border-box;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.plugin-card:nth-child(odd) {
+       clear: both;
+       margin-left: 0;
+}
+
+.plugin-card:nth-child(even) {
+       margin-right: 0;
+}
+
+@media screen and ( min-width: 1600px ) {
+       .plugin-card {
+               width: 30%;
+               width: -webkit-calc( 33.1% - 8px );
+               width: calc( 33.1% - 8px );
+       }
+
+       .plugin-card:nth-child(odd) {
+               clear: none;
+               margin-left: 8px;
+       }
+
+       .plugin-card:nth-child(even) {
+               margin-right: 8px;
+       }
+
+       .plugin-card:nth-child(3n+1) {
+               clear: both;
+               margin-left: 0;
+       }
+
+       .plugin-card:nth-child(3n) {
+               margin-right: 0;
+       }
+}
+
</ins><span class="cx"> @media screen and ( max-width: 782px ) {
</span><span class="cx">  .plugin-card {
</span><span class="cx">          margin-left: 0;
</span><span class="lines">@@ -1233,17 +1272,9 @@
</span><span class="cx">  }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.plugin-card:nth-child(odd) {
-       clear: both;
-       margin-left: 0;
-}
-
-.plugin-card:nth-child(even) {
-       margin-right: 0
-}
-
</del><span class="cx"> .plugin-card-top {
</span><span class="cx">  padding: 20px 20px 10px;
</span><ins>+       min-height: 115px; /* 2 lines for the description + author */
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> div.action-links,
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php (29218 => 29219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php       2014-07-18 04:49:19 UTC (rev 29218)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php  2014-07-18 06:07:21 UTC (rev 29219)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx">                  $details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
</span><span class="cx">                                                          '&amp;TB_iframe=true&amp;width=600&amp;height=550' );
</span><span class="cx"> 
</span><del>-                       $action_links[] = '<a href="' . esc_attr( $details_link ) . '" class="thickbox" aria-labelledby="' . $plugin['slug'] . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
</del><ins>+                        $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox" aria-labelledby="' . $plugin['slug'] . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">                  /**
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx">          <div class="plugin-card">
</span><span class="cx">                  <div class="plugin-card-top">
</span><span class="cx">                          <div class="name column-name"<?php echo $style['name']; ?>>
</span><del>-                                       <h4><a href="<?php echo esc_attr( $details_link ) ?>" class="thickbox"><?php echo $title; ?></a></h4>
</del><ins>+                                        <h4><a href="<?php echo esc_url( $details_link ) ?>" class="thickbox"><?php echo $title; ?></a></h4>
</ins><span class="cx">                                   <div class="action-links">
</span><span class="cx">                                          <?php
</span><span class="cx">                                                  if ( ! empty( $action_links ) ) {
</span><span class="lines">@@ -332,11 +332,8 @@
</span><span class="cx">                                  </div>
</span><span class="cx">                          </div>
</span><span class="cx">                          <div class="desc column-description"<?php echo $style['description']; ?>>
</span><del>-                                       <p><?php echo $description ?>
-                                       <span class="authors">
-                                               <?php echo $author; ?>
-                                       </span>
-                                       </p>
</del><ins>+                                        <p><?php echo $description ?></p>
+                                       <p class="authors"><?php echo $author; ?></p>
</ins><span class="cx">                           </div>
</span><span class="cx">                  </div>
</span><span class="cx">                  <div class="plugin-card-bottom">
</span><span class="lines">@@ -344,10 +341,16 @@
</span><span class="cx">                                  <?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
</span><span class="cx">                                  <span class="num-ratings">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
</span><span class="cx">                          </div>
</span><del>-                               <div class="column-updated"><?php echo __( '<strong>Last updated:</strong>' ) . ' '. sprintf( '%s ago', human_time_diff( strtotime($plugin['last_updated']) ) ); ?></div>
-                               <div class="column-downloaded"><?php echo sprintf( __('%s downloads'), number_format_i18n( $plugin['downloaded'] ) ); ?></div>
</del><ins>+                                <div class="column-updated">
+                                       <strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( $plugin['last_updated'] ); ?>">
+                                               <?php printf( __( '%s ago' ), human_time_diff( strtotime( $plugin['last_updated'] ) ) ); ?>
+                                       </span>
+                               </div>
+                               <div class="column-downloaded">
+                                       <?php echo sprintf( _n( '%s download', '%s downloads', $plugin['downloaded'] ), number_format_i18n( $plugin['downloaded'] ) ); ?>
+                               </div>
</ins><span class="cx">                           <div class="column-compatibility">
</span><del>-                               <?php
</del><ins>+                                        <?php
</ins><span class="cx">                                   if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
</span><span class="cx">                                          echo  __( '<strong>Untested</strong> with your install ');
</span><span class="cx">                                  } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
</span><span class="lines">@@ -355,7 +358,7 @@
</span><span class="cx">                                  } else {
</span><span class="cx">                                          echo __( '<strong>Compatible</strong> with your install ');
</span><span class="cx">                                  }
</span><del>-                               ?>
</del><ins>+                                        ?>
</ins><span class="cx">                           </div>
</span><span class="cx">                  </div>
</span><span class="cx">          </div>
</span></span></pre>
</div>
</div>

</body>
</html>