<!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>[20455] trunk/wp-admin: Theme list table style 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/20455">20455</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-12 21:10:40 +0000 (Thu, 12 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme list table style improvements. Make 'delete' link red and separate from other actions. New action separators. see <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="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-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 (20454 => 20455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-04-12 21:02:24 UTC (rev 20454)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-04-12 21:10:40 UTC (rev 20455)
</span><span class="lines">@@ -4312,8 +4312,42 @@
</span><span class="cx">
</span><span class="cx"> .available-theme .action-links {
</span><span class="cx"> margin-top: 10px;
</span><ins>+ overflow: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.available-theme .action-links li {
+ float: left;
+ padding-right: 10px;
+ margin-right: 10px;
+ border-right: 1px solid #dfdfdf;
+}
+
+.available-theme .action-links li:last-child {
+ padding-right: 0;
+ margin-right: 0;
+ border-right: 0;
+}
+
+.available-theme .action-links .delete-theme {
+ float: right;
+ margin-right: 0;
+}
+
+.available-theme .action-links .delete-theme a {
+ color: red;
+ padding: 2px;
+}
+
+.available-theme .action-links .delete-theme a:hover {
+ background: red;
+ color: #fff;
+ text-decoration: none;
+}
+
+.available-theme .action-links p {
+ float: left;
+}
+
</ins><span class="cx"> #current-theme {
</span><span class="cx"> margin: 20px 0 10px;
</span><span class="cx"> padding: 0 0 20px;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (20454 => 20455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-04-12 21:02:24 UTC (rev 20454)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-04-12 21:10:40 UTC (rev 20455)
</span><span class="lines">@@ -141,13 +141,14 @@
</span><span class="cx"> . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Preview' ) . '</a>'
</span><span class="cx"> . '<a href="#" class="load-customize hide-if-no-js" ' . $customize_attributes . '>' . __( 'Customize' ) . '</a>';
</span><span class="cx"> if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
</span><del>- $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet )
</del><ins>+ $actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet )
</ins><span class="cx"> . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $title ) )
</span><span class="cx"> . "' );" . '">' . __( 'Delete' ) . '</a>';
</span><span class="cx">
</span><del>- $actions = apply_filters( 'theme_action_links', $actions, $theme );
</del><ins>+ $actions = apply_filters( 'theme_action_links', $actions, $theme );
+ $delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
+ unset( $actions['delete'] );
</ins><span class="cx">
</span><del>- $actions = implode ( ' | ', $actions );
</del><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo $preview_link; ?>" class="load-customize screenshot" <?php echo $customize_attributes; ?>>
</span><span class="cx"> <?php if ( $screenshot = $theme->get_screenshot() ) : ?>
</span><span class="lines">@@ -157,8 +158,15 @@
</span><span class="cx"> <h3><?php echo $title; ?></h3>
</span><span class="cx"> <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
</span><span class="cx"> <div class="action-links">
</span><del>- <?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>
</del><ins>+ <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>
+ <?php echo $delete_action; ?>
+
+ <?php theme_update_available( $theme ); ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="themedetaildiv hide-if-js">
</span><span class="lines">@@ -175,8 +183,6 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php theme_update_available( $theme ); ?>
-
</del><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> endforeach;
</span></span></pre></div>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (20454 => 20455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2012-04-12 21:02:24 UTC (rev 20454)
+++ trunk/wp-admin/js/theme.dev.js 2012-04-12 21:10:40 UTC (rev 20455)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> */
</span><span class="cx"> jQuery( function($) {
</span><span class="cx"> $('#availablethemes').on( 'click', '.theme-detail', function (event) {
</span><del>- $(this).parent().siblings('.themedetaildiv').toggle();
</del><ins>+ $(this).parents('.action-links').siblings('.themedetaildiv').toggle();
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>