Changeset 28037

Timestamp:

04/08/2014 04:30:01 AM (11 years ago)

Author:

nacin

Message:

Theme Installer: Combine 'Layout' and 'Columns' filters so 'Features' can span two columns.

see #27055.

Location:

trunk/src/wp-admin

Files:

• css/themes.css (modified) (1 diff)
• includes/theme.php (modified) (3 diffs)
• theme-install.php (modified) (1 diff)

trunk/src/wp-admin/css/themes.css

@@ -1270 +1270 @@
     padding: 10px;
 }
+.more-filters-container .wide-filters-group {
+    width: 38%;
+}
 .more-filters-container .feature-name {
     margin: 0;

trunk/src/wp-admin/includes/theme.php

@@ -193 +193 @@
             ),
 
-        __( 'Columns' ) => array(
+        __( 'Layout' ) => array(
+            'fixed-layout'      => __( 'Fixed Layout' ),
+            'fluid-layout'      => __( 'Fluid Layout' ),
+            'responsive-layout' => __( 'Responsive Layout' ),
             'one-column'    => __( 'One Column' ),
             'two-columns'   => __( 'Two Columns' ),
@@ -200 +203 @@
             'left-sidebar'  => __( 'Left Sidebar' ),
             'right-sidebar' => __( 'Right Sidebar' ),
-        ),
-
-        __( 'Layout' ) => array(
-            'fixed-layout'      => __( 'Fixed Layout' ),
-            'fluid-layout'      => __( 'Fluid Layout' ),
-            'responsive-layout' => __( 'Responsive Layout' ),
         ),
 
@@ -257 +254 @@
     $category_translations = array(
         'Colors'   => __( 'Colors' ),
-        'Columns'  => __( 'Columns' ),
         'Layout'   => __( 'Layout' ),
         'Features' => __( 'Features' ),

trunk/src/wp-admin/theme-install.php

@@ -138 +138 @@
         $feature_list = get_theme_feature_list();
         foreach ( $feature_list as $feature_name => $features ) {
-            echo '<div class="filters-group">';
+            if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack
+                echo '<div class="filters-group wide-filters-group">';
+            } else {
+                echo '<div class="filters-group">';
+            }
             $feature_name = esc_html( $feature_name );
             echo '<h4 class="feature-name">' . $feature_name . '</h4>';