Changeset 10883

Timestamp:

04/07/2009 09:44:41 AM (16 years ago)

Author:

azaozz

Message:

Theme install: replace 'popular tags' section with feature filter, props josephscott, see #8652

Location:

trunk/wp-admin

Files:

• css/colors-classic.css (modified) (1 diff)
• css/colors-fresh.css (modified) (1 diff)
• css/ie.css (modified) (1 diff)
• css/theme-install.css (modified) (1 diff)
• includes/theme-install.php (modified) (5 diffs)

trunk/wp-admin/css/colors-classic.css

@@ -1583 +1583 @@
 }
 
-p.popular-tags {
+.popular-tags,
+.feature-filter {
     background-color: #FFFFFF;
     border-color: #DFDFDF;

trunk/wp-admin/css/colors-fresh.css

@@ -1583 +1583 @@
 }
 
-p.popular-tags {
+.popular-tags,
+.feature-filter {
     background-color: #FFFFFF;
     border-color: #DFDFDF;

trunk/wp-admin/css/ie.css

@@ -349 +349 @@
     border: 1px solid #DFDFDF;
 }
+
+* html .feature-filter .feature-group li {
+    width: 145px;
+}

trunk/wp-admin/css/theme-install.css

@@ -112 +112 @@
 }
 
+.feature-filter {
+    -moz-border-radius: 8px;
+    -khtml-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    border-radius: 8px;
+    border-width: 1px;
+    border-style: solid;
+    padding: 8px 12px 0;
+    margin-bottom: 10px;
+}
 
+.feature-filter .feature-group {
+    float: left;
+    margin-bottom: 20px;
+    width: 725px;
+}
+
+.feature-filter .feature-name {
+    float: left;
+    text-align: right;
+    width: 65px;
+}
+
+.feature-filter .feature-group li {
+    display: inline;
+    float: left;
+    list-style-type: none;
+    padding-right: 25px;
+    min-width: 145px;
+}

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

@@ -67 +67 @@
 
 /**
- * Retrieve popular WordPress theme tags.
- *
- * @since 2.8.0
- *
- * @param array $args
+ * Retrive list of WordPress theme features (aka theme tags)
+ *
+ * @since 2.8.0
+ *
  * @return array
  */
-function install_themes_popular_tags( $args = array() ) {
-    global $theme_field_defaults;
-    if ( !$cache = get_option('wporg_theme_popular_tags') )
-        add_option('wporg_theme_popular_tags', array(), '', 'no'); ///No autoload.
-
-    if ( $cache && $cache->timeout + 3 * 60 * 60 > time() )
+function install_themes_feature_list( ) {
+    if ( !$cache = get_option( 'wporg_theme_feature_list' ) )
+        add_option( 'wporg_theme_feature_list', array( ), '', 'no' );
+
+    if ( $cache && $cache->timeout +3 * 60 * 60 > time( ) )
         return $cache->cached;
 
-    $args['fields'] = $theme_field_defaults;
-
-    $tags = themes_api('hot_tags', $args);
-
-    if ( is_wp_error($tags) )
-        return $tags;
-
-    $cache = (object) array('timeout' => time(), 'cached' => $tags);
-
-    update_option('wporg_theme_popular_tags', $cache);
-
-    return $tags;
+    $feature_list = themes_api( 'feature_list', array( ) );
+    if ( is_wp_error( $feature_list ) )
+        return $features;
+
+    $cache = (object) array( 'timeout' => time( ), 'cached' => $feature_list );
+    update_option( 'wporg_theme_feature_list', $cache );
+
+    return $feature_list;
 }
 
 add_action('install_themes_search', 'install_theme_search', 10, 1);
 /**
- * Display theme search results and display as tag cloud.
+ * Display theme search results
  *
  * @since 2.8.0
@@ -128 +122 @@
     $args['fields'] = $theme_field_defaults;
 
+    if ( !empty( $_POST['features'] ) ) {
+        $terms = $_POST['features'];
+        $terms = array_map( 'trim', $terms );
+        $terms = array_map( 'sanitize_title_with_dashes', $terms );
+        $args['tag'] = $terms;
+        $_REQUEST['s'] = implode( ',', $terms );
+        $_REQUEST['type'] = 'tag';
+    }
+
     $api = themes_api('query_themes', $args);
 
@@ -138 +141 @@
 }
 
-add_action('install_themes_dashboard', 'install_themes_dashboard');
-function install_themes_dashboard() {
+/**
+ * Display search form for searching themes.
+ *
+ * @since 2.8.0
+ */
+function install_theme_search_form() {
+    $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
+    $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
     ?>
 <p class="install-help"><?php _e('Search for themes by keyword, author, or tag.') ?></p>
 
-    <?php install_theme_search_form(); ?>
-
-<h4><?php _e('Popular tags') ?></h4>
-<p class="install-help"><?php _e('You may also browse based on the most popular tags in the Theme Directory:') ?></p>
+<form id="search-themes" method="post" action="<?php echo admin_url( 'theme-install.php?tab=search' ); ?>">
+    <select name="type" id="typeselector">
+    <option value="term" <?php selected('term', $type) ?>><?php _e('Term'); ?></option>
+    <option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
+    <option value="tag" <?php selected('tag', $type) ?>><?php _e('Tag'); ?></option>
+    </select>
+    <input type="text" name="s" class="search-input" size="30" value="<?php echo attribute_escape($term) ?>" />
+    <input type="submit" name="search" value="<?php echo attribute_escape(__('Search')); ?>" class="button" />
+</form>
+<?php
+}
+
+add_action('install_themes_dashboard', 'install_themes_dashboard');
+/**
+ * Display tags filter for themes.
+ *
+ * @since 2.8.0
+ */
+function install_themes_dashboard() {
+    install_theme_search_form();
+?>
+<h4><?php _e('Feature Filter') ?></h4>
+<form method="post" action="<?php echo admin_url( 'theme-install.php?tab=search' ); ?>">
+<p class="install-help"><?php _e('Find a theme based on specific features') ?></p>
     <?php
-
-    $api_tags = install_themes_popular_tags();
-
-    //Set up the tags in a way which can be interprated by wp_generate_tag_cloud()
-    $tags = array();
-    foreach ( (array)$api_tags as $tag ) {
-        $tags[ $tag['name'] ] = (object) array(
-                                'link' => clean_url( admin_url('theme-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ),
-                                'name' => $tag['name'],
-                                'id' => sanitize_title_with_dashes($tag['name']),
-                                'count' => $tag['count'] );
-    }
-    echo '<p class="popular-tags">';
-    echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d theme'), 'multiple_text' => __('%d themes') ) );
-    echo '</p><br class="clear" />';
-}
-
-/**
- * Display search form for searching themes.
- *
- * @since 2.8.0
- */
-function install_theme_search_form(){
-    $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
-    $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
-    ?>
-<form id="search-themes" method="post"
-    action="<?php echo admin_url('theme-install.php?tab=search') ?>"><select
-    name="type" id="typeselector">
-    <option value="term" <?php selected('term', $type) ?>><?php _e('Term') ?></option>
-    <option value="author" <?php selected('author', $type) ?>><?php _e('Author') ?></option>
-    <option value="tag" <?php selected('tag', $type) ?>><?php _e('Tag') ?></option>
-</select> <input type="text" name="s" class="search-input"
-    value="<?php echo attribute_escape($term) ?>" /> <input type="submit"
-    name="search" value="<?php echo attribute_escape(__('Search')) ?>"
-    class="button" /></form>
-    <?php
+    $feature_list = install_themes_feature_list( );
+    echo '<div class="feature-filter">';
+
+    foreach ( (array) $feature_list as $feature_name => $features ) {
+        $html_safe['feature_name'] = wp_specialchars( $feature_name );
+        echo '<div class="feature-name">' . $html_safe['feature_name'] . '</div>';
+
+        echo '<ol style="float: left; width: 725px;" class="feature-group">';
+        foreach ( $features as $feature ) {
+            $html_safe['feature'] = wp_specialchars( $feature );
+?>
+
+<li>
+    <input type="checkbox" name="features[<?php echo $html_safe['feature']; ?>]" id="feature-id-<?php echo $html_safe['feature']; ?>" value="<?php echo $html_safe['feature']; ?>">
+    <label for="feature-id-<?php echo $html_safe['feature']; ?>"><?php echo $html_safe['feature']; ?></label>
+</li>
+
+<?php   } ?>
+</ol>
+<br class="clear" />
+<?php
+    } ?>
+
+</div>
+<br class="clear" />
+<input type="submit" name="search" value="<?php echo attribute_escape(__('Find Themes')); ?>" class="button" />
+</form>
+<?php
 }
 
@@ -202 +221 @@
     if ( is_wp_error($api) )
         wp_die($api);
-    display_themes($api->themes, $api->info['page'], $api->info['pages']);
-}
-
-add_action('install_thems_popular', 'install_themes_popular', 10, 1);
-/**
- * Display popular themes.
- *
- * @since 2.8.0
- *
- * @param string $page
- */
-function install_themes_popular($page = 1) {
-    global $theme_field_defaults;
-    $args = array('browse' => 'popular', 'page' => $page, 'fields' => $theme_field_defaults);
-    $api = themes_api('query_themes', $args);
     display_themes($api->themes, $api->info['page'], $api->info['pages']);
 }
@@ -351 +355 @@
     ?>
 <div class="tablenav">
-<div class="alignleft actions"><?php do_action('install_themes_table_header'); ?>
-</div>
+<div class="alignleft actions"><?php do_action('install_themes_table_header'); ?></div>
     <?php
     $url = clean_url($_SERVER['REQUEST_URI']);