Changeset 35527

Timestamp:

11/04/2015 09:48:43 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Themes: Add a Favorites tab to the Add Themes screen.

You can now browse and install your wordpress.org theme favorites from the theme installer, just like with plugins.

Props swissspidy.
Fixes #34206.

Location:

trunk/src/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• css/common.css (modified) (1 diff)
• includes/ajax-actions.php (modified) (2 diffs)
• js/theme.js (modified) (3 diffs)
• theme-install.php (modified) (2 diffs)

trunk/src/wp-admin/admin-ajax.php

@@ -63 +63 @@
     'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
     'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
-    'press-this-add-category', 'crop-image', 'generate-password',
+    'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username',
 );
 

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

@@ -1084 +1084 @@
 .wp-filter .drawer-toggle.current:before {
     color: #fff;
+}
+
+.wp-filter .favorites-form {
+    display: none;
+    margin: 0 -20px;
+    padding: 20px;
+    border-top: 1px solid #eee;
+    background: #fafafa;
+    overflow: hidden;
+    width: 100%;
+}
+
+.show-favorites-form .wp-filter .favorites-form {
+    display: block;
 }
 

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2822 +2822 @@
     ) );
 
+    if ( 'favorites' === $args['browse'] && ! isset( $args['user'] ) ) {
+        $user = get_user_option( 'wporg_favorites' );
+        if ( $user ) {
+            $args['user'] = $user;
+        }
+    }
+
     $old_filter = isset( $args['browse'] ) ? $args['browse'] : 'search';
 
@@ -3291 +3298 @@
     wp_send_json_success( wp_generate_password( 24 ) );
 }
+
+/**
+ * Ajax handler for saving the user's WordPress.org username.
+ *
+ * @since 4.4.0
+ */
+function wp_ajax_save_wporg_username() {
+    if ( ! current_user_can( 'install_themes' ) && ! current_user_can( 'install_plugins' ) ) {
+        wp_send_json_error();
+    }
+
+    $username = isset( $_REQUEST['username'] ) ? wp_unslash( $_REQUEST['username'] ) : false;
+
+    if ( ! $username ) {
+        wp_send_json_error();
+    }
+
+    wp_send_json_success( update_user_meta( get_current_user_id(), 'wporg_favorites', $username ) );
+}

trunk/src/wp-admin/js/theme.js

@@ -1357 +1357 @@
         'click .filter-group [type="checkbox"]': 'addFilter',
         'click .filter-drawer .clear-filters': 'clearFilters',
-        'click .filtered-by': 'backToFilters'
+        'click .filtered-by': 'backToFilters',
+        'click .favorites-form-submit' : 'saveUsername',
+        'keyup #wporg-username-input': 'saveUsername',
     },
 
@@ -1448 +1450 @@
         $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
         $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
+
+        if ( 'favorites' === sort ) {
+            $ ( 'body' ).addClass( 'show-favorites-form' );
+        } else {
+            $ ( 'body' ).removeClass( 'show-favorites-form' );
+        }
 
         this.browse( sort );
@@ -1508 +1516 @@
         // or searching the local cache
         this.collection.query( request );
+    },
+
+    // Save the user's WordPress.org username and get his favorite themes.
+    saveUsername: function ( event ) {
+        var username = $( '#wporg-username-input' ).val(),
+            request = { browse: 'favorites', user: username },
+            that = this;
+
+        if ( event ) {
+            event.preventDefault();
+        }
+
+        // save username on enter
+        if ( event.type === 'keyup' && event.which !== 13 ) {
+            return;
+        }
+
+        return wp.ajax.send( 'save-wporg-username', {
+            data: {
+                username: username
+            },
+            success: function () {
+                // Get the themes by sending Ajax POST request to api.wordpress.org/themes
+                // or searching the local cache
+                that.collection.query( request );
+            }
+        } );
     },
 

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

@@ -140 +140 @@
             <li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
             <li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
+            <li><a href="#" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></a></li>
         </ul>
 
@@ -145 +146 @@
 
         <div class="search-form"></div>
+
+        <div class="favorites-form">
+            <?php
+            $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+            update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+            ?>
+            <p class="install-help"><?php _e( 'If you have marked themes as favorites on WordPress.org, you can browse them here.' ); ?></p>
+
+            <p>
+                <label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
+                <input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
+                <input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+            </p>
+        </div>
 
         <div class="filter-drawer">