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.
Built from https://develop.svn.wordpress.org/trunk@35527


git-svn-id: http://core.svn.wordpress.org/trunk@35491 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-11-04 21:49:26 +00:00
parent d8b65d5582
commit a41e5d0270
10 changed files with 110 additions and 6 deletions

View File

@ -62,7 +62,7 @@ $core_actions_post = array(
'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
'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',
);
// Deprecated

View File

@ -1085,6 +1085,20 @@ th.action-links {
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;
}
.filter-drawer {
display: none;
margin: 0 -20px;

View File

@ -1085,6 +1085,20 @@ th.action-links {
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;
}
.filter-drawer {
display: none;
margin: 0 -20px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2821,6 +2821,13 @@ function wp_ajax_query_themes() {
'fields' => $theme_field_defaults
) );
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';
/** This filter is documented in wp-admin/includes/class-wp-theme-install-list-table.php */
@ -3290,3 +3297,22 @@ function wp_ajax_crop_image() {
function wp_ajax_generate_password() {
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 ) );
}

View File

@ -1356,7 +1356,9 @@ themes.view.Installer = themes.view.Appearance.extend({
'click .filter-drawer .apply-filters': 'applyFilters',
'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',
},
// Initial render method
@ -1448,6 +1450,12 @@ themes.view.Installer = themes.view.Appearance.extend({
$( '.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 );
},
@ -1509,6 +1517,33 @@ themes.view.Installer = themes.view.Appearance.extend({
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 );
}
} );
},
// Get the checked filters
// @return {array} of tags or false
filtersChecked: function() {

File diff suppressed because one or more lines are too long

View File

@ -139,12 +139,27 @@ include(ABSPATH . 'wp-admin/admin-header.php');
<li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
<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>
<a class="drawer-toggle" href="#"><?php _e( 'Feature Filter' ); ?></a>
<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">
<div class="buttons">
<a class="apply-filters button button-secondary" href="#"><?php _e( 'Apply Filters' ); ?><span></span></a>

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-beta3-35526';
$wp_version = '4.4-beta3-35527';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.