<!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>[20730] trunk/wp-admin: Add 'Install now', 'Preview', and 'Details' links to theme install list items.</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/20730">20730</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-06 23:06:47 +0000 (Sun, 06 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add 'Install now', 'Preview', and 'Details' links to theme install list items. fixes <a href="http://core.trac.wordpress.org/ticket/20403">#20403</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeinstalllisttablephp">trunk/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (20729 => 20730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-05-06 07:28:28 UTC (rev 20729)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-05-06 23:06:47 UTC (rev 20730)
</span><span class="lines">@@ -5373,28 +5373,27 @@
</span><span class="cx"> border: 1px solid #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.install-theme-info .theme-version {
</del><ins>+.theme-details .theme-version {
</ins><span class="cx"> margin: 15px 0;
</span><del>- float: right;
</del><ins>+ float: left;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.install-theme-info .theme-rating {
</del><ins>+.theme-details .theme-rating {
</ins><span class="cx"> margin: 14px 0;
</span><span class="cx"> width: 100px;
</span><span class="cx"> height: 17px;
</span><del>- float: left;
</del><ins>+ float: right;
</ins><span class="cx"> background: url('../images/stars.png?ver=20120307') repeat-x bottom left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.install-theme-info .theme-rating div {
</del><ins>+.theme-details .theme-rating div {
</ins><span class="cx"> background: url('../images/stars.png?ver=20120307') repeat-x top left;
</span><span class="cx"> height: 17px;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.install-theme-info .theme-description {
- margin-top: 34px;
- padding-top: 1em;
</del><ins>+.theme-details .theme-description {
+ float: left;
</ins><span class="cx"> color: #777;
</span><span class="cx"> line-height: 20px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (20729 => 20730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-05-06 07:28:28 UTC (rev 20729)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-05-06 23:06:47 UTC (rev 20730)
</span><span class="lines">@@ -192,14 +192,35 @@
</span><span class="cx"> 'theme' => $theme->slug,
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ $actions = array();
+
+ $install_url = add_query_arg( array(
+ 'action' => 'install-theme',
+ 'theme' => $theme->slug,
+ ), self_admin_url( 'update.php' ) );
+ $actions[] = '<a class="install-now" href="' . wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+
+ $actions[] = '<a class="install-theme-preview" href="#" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
+
+ $actions = apply_filters( 'theme_install_actions', $actions, $theme );
+
</ins><span class="cx"> ?>
</span><del>- <a class="screenshot" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
</del><ins>+ <a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
</ins><span class="cx"> <img src='<?php echo esc_url( $theme->screenshot_url ); ?>' width='150' />
</span><span class="cx"> </a>
</span><span class="cx">
</span><span class="cx"> <h3><?php echo $name; ?></h3>
</span><span class="cx"> <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
</span><span class="cx">
</span><ins>+ <div class="action-links">
+ <ul>
+ <?php foreach ( $actions as $action ): ?>
+ <li><?php echo $action; ?></li>
+ <?php endforeach; ?>
+ <li class="hide-if-no-js"><a href="#" class="theme-detail" tabindex='4'><?php _e('Details') ?></a></li>
+ </ul>
+ </div>
+
</ins><span class="cx"> <?php
</span><span class="cx"> $this->install_theme_info( $theme );
</span><span class="cx"> }
</span><span class="lines">@@ -277,16 +298,18 @@
</span><span class="cx"> <?php if ( isset( $theme->screenshot_url ) ): ?>
</span><span class="cx"> <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" />
</span><span class="cx"> <?php endif; ?>
</span><del>- <div class="theme-rating" title="<?php echo esc_attr( $num_ratings ); ?>">
- <div style="width:<?php echo esc_attr( intval( $theme->rating ) . 'px' ); ?>;"></div>
</del><ins>+ <div class="theme-details">
+ <div class="theme-rating" title="<?php echo esc_attr( $num_ratings ); ?>">
+ <div style="width:<?php echo esc_attr( intval( $theme->rating ) . 'px' ); ?>;"></div>
+ </div>
+ <div class="theme-version">
+ <strong><?php _e('Version:') ?> </strong>
+ <?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
+ </div>
+ <div class="theme-description">
+ <?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
+ </div>
</ins><span class="cx"> </div>
</span><del>- <div class="theme-version">
- <strong><?php _e('Version:') ?> </strong>
- <?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
- </div>
- <div class="theme-description">
- <?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
- </div>
</del><span class="cx"> <input class="theme-preview-url" type="hidden" value="<?php echo esc_url( $theme->preview_url ); ?>" />
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (20729 => 20730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2012-05-06 07:28:28 UTC (rev 20729)
+++ trunk/wp-admin/js/theme.dev.js 2012-05-06 23:06:47 UTC (rev 20730)
</span><span class="lines">@@ -5,7 +5,15 @@
</span><span class="cx"> */
</span><span class="cx"> jQuery( function($) {
</span><span class="cx"> $('#availablethemes').on( 'click', '.theme-detail', function (event) {
</span><del>- $(this).parents('.action-links').siblings('.themedetaildiv').toggle();
</del><ins>+ var theme = $(this).closest('.available-theme'),
+ details = theme.find('.themedetaildiv');
+
+ if ( ! details.length ) {
+ details = theme.find('.install-theme-info .theme-details');
+ details = details.clone().addClass('themedetaildiv').appendTo( theme ).hide();
+ }
+
+ details.toggle();
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -34,10 +42,10 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- $('#availablethemes').on( 'click', '.installable-theme', function( event ) {
</del><ins>+ $('#availablethemes').on( 'click', '.install-theme-preview', function( event ) {
</ins><span class="cx"> var src;
</span><span class="cx">
</span><del>- info.html( $(this).find('.install-theme-info').html() );
</del><ins>+ info.html( $(this).closest('.installable-theme').find('.install-theme-info').html() );
</ins><span class="cx"> src = info.find( '.theme-preview-url' ).val();
</span><span class="cx"> panel.html( '<iframe src="' + src + '" />');
</span><span class="cx"> preview.fadeIn( 200, function() {
</span></span></pre>
</div>
</div>
</body>
</html>