<!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>[28037] trunk/src/wp-admin: Theme Installer: Combine 'Layout' and 'Columns' filters so 'Features' can span two columns.</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/28037">28037</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-08 04:30:01 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Installer: Combine 'Layout' and 'Columns' filters so 'Features' can span two columns.
see <a href="http://core.trac.wordpress.org/ticket/27055">#27055</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/themes.css (28036 => 28037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/themes.css 2014-04-08 04:12:44 UTC (rev 28036)
+++ trunk/src/wp-admin/css/themes.css 2014-04-08 04:30:01 UTC (rev 28037)
</span><span class="lines">@@ -1269,6 +1269,9 @@
</span><span class="cx"> box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</span><span class="cx"> padding: 10px;
</span><span class="cx"> }
</span><ins>+.more-filters-container .wide-filters-group {
+ width: 38%;
+}
</ins><span class="cx"> .more-filters-container .feature-name {
</span><span class="cx"> margin: 0;
</span><span class="cx"> position: relative;
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/theme.php (28036 => 28037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/theme.php 2014-04-08 04:12:44 UTC (rev 28036)
+++ trunk/src/wp-admin/includes/theme.php 2014-04-08 04:30:01 UTC (rev 28037)
</span><span class="lines">@@ -192,7 +192,10 @@
</span><span class="cx"> 'light' => __( 'Light' ),
</span><span class="cx"> ),
</span><span class="cx">
</span><del>- __( 'Columns' ) => array(
</del><ins>+ __( 'Layout' ) => array(
+ 'fixed-layout' => __( 'Fixed Layout' ),
+ 'fluid-layout' => __( 'Fluid Layout' ),
+ 'responsive-layout' => __( 'Responsive Layout' ),
</ins><span class="cx"> 'one-column' => __( 'One Column' ),
</span><span class="cx"> 'two-columns' => __( 'Two Columns' ),
</span><span class="cx"> 'three-columns' => __( 'Three Columns' ),
</span><span class="lines">@@ -201,12 +204,6 @@
</span><span class="cx"> 'right-sidebar' => __( 'Right Sidebar' ),
</span><span class="cx"> ),
</span><span class="cx">
</span><del>- __( 'Layout' ) => array(
- 'fixed-layout' => __( 'Fixed Layout' ),
- 'fluid-layout' => __( 'Fluid Layout' ),
- 'responsive-layout' => __( 'Responsive Layout' ),
- ),
-
</del><span class="cx"> __( 'Features' ) => array(
</span><span class="cx"> 'accessibility-ready' => __( 'Accessibility Ready' ),
</span><span class="cx"> 'blavatar' => __( 'Blavatar' ),
</span><span class="lines">@@ -256,7 +253,6 @@
</span><span class="cx">
</span><span class="cx"> $category_translations = array(
</span><span class="cx"> 'Colors' => __( 'Colors' ),
</span><del>- 'Columns' => __( 'Columns' ),
</del><span class="cx"> 'Layout' => __( 'Layout' ),
</span><span class="cx"> 'Features' => __( 'Features' ),
</span><span class="cx"> 'Subject' => __( 'Subject' )
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/theme-install.php (28036 => 28037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/theme-install.php 2014-04-08 04:12:44 UTC (rev 28036)
+++ trunk/src/wp-admin/theme-install.php 2014-04-08 04:30:01 UTC (rev 28037)
</span><span class="lines">@@ -137,7 +137,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> $feature_list = get_theme_feature_list();
</span><span class="cx"> foreach ( $feature_list as $feature_name => $features ) {
</span><del>- echo '<div class="filters-group">';
</del><ins>+ if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack
+ echo '<div class="filters-group wide-filters-group">';
+ } else {
+ echo '<div class="filters-group">';
+ }
</ins><span class="cx"> $feature_name = esc_html( $feature_name );
</span><span class="cx"> echo '<h4 class="feature-name">' . $feature_name . '</h4>';
</span><span class="cx"> echo '<ol class="feature-group">';
</span></span></pre>
</div>
</div>
</body>
</html>