<!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>[20414] trunk/wp-admin: Theme browsing UX improvements.</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/20414">20414</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-10 00:15:13 +0000 (Tue, 10 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme browsing UX improvements. see <a href="http://core.trac.wordpress.org/ticket/20403">#20403</a>.
* On manage/install themes pages, moved author under theme name.
* On manage themes page, moved version number to details.</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="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-list-table.php</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 (20413 => 20414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-04-09 23:58:24 UTC (rev 20413)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-04-10 00:15:13 UTC (rev 20414)
</span><span class="lines">@@ -4304,9 +4304,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .available-theme h3 {
</span><del>- margin: 15px 0 5px;
</del><ins>+ margin: 15px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.available-theme .theme-author {
+ line-height: 18px;
+}
+
+.available-theme .action-links {
+ margin-top: 10px;
+}
+
</ins><span class="cx"> #current-theme {
</span><span class="cx"> padding: 0 0 .5em;
</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 (20413 => 20414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-04-09 23:58:24 UTC (rev 20413)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-04-10 00:15:13 UTC (rev 20414)
</span><span class="lines">@@ -197,10 +197,8 @@
</span><span class="cx"> <img src='<?php echo esc_url( $theme->screenshot_url ); ?>' width='150' />
</span><span class="cx"> </a>
</span><span class="cx">
</span><del>- <h3><?php
- /* translators: 1: theme name, 2: author name */
- printf( __( '%1$s <span>by %2$s</span>' ), $name, $author );
- ?></h3>
</del><ins>+ <h3><?php echo $name; ?></h3>
+ <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $this->install_theme_info( $theme );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (20413 => 20414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-04-09 23:58:24 UTC (rev 20413)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-04-10 00:15:13 UTC (rev 20414)
</span><span class="lines">@@ -116,17 +116,17 @@
</span><span class="cx"> function display_rows() {
</span><span class="cx"> $themes = $this->items;
</span><span class="cx">
</span><del>- foreach ( $themes as $theme ) {
- echo '<div class="available-theme">';
</del><ins>+ foreach ( $themes as $theme ):
+ ?><div class="available-theme"><?php
</ins><span class="cx">
</span><del>- $template = $theme->get_template();
</del><ins>+ $template = $theme->get_template();
</ins><span class="cx"> $stylesheet = $theme->get_stylesheet();
</span><ins>+ $title = $theme->display('Name');
+ $version = $theme->display('Version');
+ $author = $theme->display('Author');
</ins><span class="cx">
</span><del>- $title = $theme->display('Name');
- $version = $theme->display('Version');
- $author = $theme->display('Author');
</del><ins>+ $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $template );
</ins><span class="cx">
</span><del>- $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $template );
</del><span class="cx"> $preview_link = esc_url( add_query_arg(
</span><span class="cx"> array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => true, 'TB_iframe' => 'true' ),
</span><span class="cx"> home_url( '/' ) ) );
</span><span class="lines">@@ -154,28 +154,32 @@
</span><span class="cx"> <img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </a>
</span><del>- <h3><?php
- /* translators: 1: theme title, 2: theme version, 3: theme author */
- printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
</del><ins>+ <h3><?php echo $title; ?></h3>
+ <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
+ <div class="action-links">
+ <?php echo $actions; ?>
+ <span class="separator hide-if-no-js">| </span><a href="#" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
+ </div>
</ins><span class="cx">
</span><del>- <span class='action-links'><?php echo $actions ?></span>
- <span class="separator hide-if-no-js">| </span><a href="#" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
</del><span class="cx"> <div class="themedetaildiv hide-if-js">
</span><del>- <p><?php echo $theme->display('Description'); ?></p>
- <?php if ( current_user_can( 'edit_themes' ) && $theme->parent() ) :
- /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
- <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ),
- $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ), $title, $theme->parent()->display('Name') ); ?></p>
- <?php else :
- /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir */ ?>
- <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ),
- $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?></p>
- <?php endif; ?>
</del><ins>+ <p><strong><?php _e('Version: '); ?></strong><?php echo $version; ?></p>
+ <p><?php echo $theme->display('Description'); ?></p>
+ <?php if ( current_user_can( 'edit_themes' ) && $theme->parent() ) :
+ /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
+ <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ),
+ $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ), $title, $theme->parent()->display('Name') ); ?></p>
+ <?php else :
+ /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir */ ?>
+ <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ),
+ $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?></p>
+ <?php endif; ?>
</ins><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <?php theme_update_available( $theme ); ?>
</span><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><del>- }
</del><ins>+ endforeach;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function search_theme( $theme ) {
</span></span></pre>
</div>
</div>
</body>
</html>