Index: src/wp-admin/admin-ajax.php =================================================================== --- src/wp-admin/admin-ajax.php (revision 29136) +++ src/wp-admin/admin-ajax.php (working copy) @@ -60,7 +60,8 @@ 'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment', 'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor', 'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs', - 'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail' + 'save-user-color-scheme', 'update-widget', 'query-themes', 'query-plugins', 'parse-embed', + 'set-attachment-thumbnail' ); // Register core Ajax calls. @@ -73,6 +74,7 @@ add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 ); if ( is_user_logged_in() ) { + /** * Fires authenticated AJAX actions for logged-in users. * Index: src/wp-admin/css/colors/_admin.scss =================================================================== --- src/wp-admin/css/colors/_admin.scss (revision 29136) +++ src/wp-admin/css/colors/_admin.scss (working copy) @@ -434,31 +434,6 @@ background: $highlight-color; } -.theme-section.current, -.theme-filter.current { - border-bottom-color: $menu-background; -} - -body.more-filters-opened .more-filters { - color: $menu-text; - background-color: $menu-background; -} - -body.more-filters-opened .more-filters:before { - color: $menu-text; -} - -body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus { - background-color: $menu-highlight-background; - color: $menu-highlight-text; -} - -body.more-filters-opened .more-filters:hover:before, -body.more-filters-opened .more-filters:focus:before { - color: $menu-highlight-text; -} - .theme-install-overlay .close-full-overlay:hover, .theme-install-overlay .close-full-overlay:focus, .theme-install-overlay .previous-theme:hover, @@ -469,6 +444,31 @@ color: $menu-highlight-text; } +/* Filter */ + +.wp-filter-link.current { + border-bottom-color: $menu-background; +} + +body.show-filter-drawer { + .wp-filter-drawer-toggle { + background-color: $menu-background; + color: $menu-text; + } + .wp-filter-drawer-toggle:before { + color: $menu-text; + } + .wp-filter-drawer-toggle:hover, + .wp-filter-drawer-toggle:focus { + background-color: $menu-highlight-background; + color: $menu-highlight-text; + } + .wp-filter-drawer-toggle:hover:before, + .wp-filter-drawer-toggle:focus:before { + color: $menu-highlight-text; + } +} + /* Widgets */ .widgets-chooser li.widgets-chooser-selected { @@ -529,7 +529,8 @@ background: $menu-highlight-background; } -.star-rating .star { +.star-rating .star, +.rating span:before { color: $highlight-color; } Index: src/wp-admin/css/common.css =================================================================== --- src/wp-admin/css/common.css (revision 29136) +++ src/wp-admin/css/common.css (working copy) @@ -627,6 +627,21 @@ padding-right: 0; } +.wp-title-count { + display: inline; + padding: 4px 10px; + -webkit-border-radius: 30px; + border-radius: 30px; + background: #777; + font-size: 14px; + font-weight: 600; + color: #fff; + position: relative; + top: -3px; + margin-left: 5px; + margin-right: 20px; +} + .wp-dialog { background-color: #fff; } @@ -1800,6 +1815,65 @@ margin: 6px 0 0; } +.rating span:before { + content: "\f154"; + display: inline-block; + -webkit-font-smoothing: antialiased; + font: normal 20px/1 'dashicons'; + vertical-align: top; + color: #0074a2; +} +/* Half stars */ +.rating-10 span.one:before, +.rating-30 span.two:before, +.rating-50 span.three:before, +.rating-70 span.four:before, +.rating-90 span.five:before { + content: "\f459"; +} +/* Full stars */ +.rating-20 span.one:before { + content: "\f155"; +} +.rating-30 span.one:before, +.rating-40 span.one:before, +.rating-40 span.two:before { + content: "\f155"; +} +.rating-50 span.one:before, +.rating-50 span.two:before, +.rating-60 span.one:before, +.rating-60 span.two:before, +.rating-60 span.three:before { + content: "\f155"; +} +.rating-70 span.one:before, +.rating-70 span.two:before, +.rating-70 span.three:before, +.rating-80 span.one:before, +.rating-80 span.two:before, +.rating-80 span.three:before, +.rating-80 span.four:before { + content: "\f155"; +} +.rating-90 span.one:before, +.rating-90 span.two:before, +.rating-90 span.three:before, +.rating-90 span.four:before, +.rating-100 span.one:before, +.rating-100 span.two:before, +.rating-100 span.three:before, +.rating-100 span.four:before, +.rating-100 span.five:before { + content: "\f155"; +} +.rating .ratings { + display: inline; + margin-left: 10px; + line-height: 20px; + color: #999; +} + /* Plugin install thickbox */ #plugin-information { background: #fcfcfc; Index: src/wp-admin/css/forms.css =================================================================== --- src/wp-admin/css/forms.css (revision 29136) +++ src/wp-admin/css/forms.css (working copy) @@ -751,9 +751,70 @@ margin: -3px 3px; } +/*------------------------------------------------------------------------------ + 21.0 - Upload File +------------------------------------------------------------------------------*/ + +.wp-upload-container { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin: 0px 0 0; + padding: 0; + width: 100%; + overflow: hidden; + position: relative; + top: 10px; +} +.wp-upload-container-hidden { + display: none; +} +.wp-upload-container .wp-upload-form { + background: #fafafa; + border: 1px solid #e5e5e5; + padding: 30px; + margin: 30px auto; + max-width: 380px; +} +.wp-upload-container .install-help { + color: #999; + font-size: 18px; + font-style: normal; + margin: 0; + padding: 40px 0 0; + text-align: center; +} + +body.show-upload-container .hide-on-upload, +body.show-upload-container .wp-upload-show { + display: none; +} +body.show-upload-container .wp-upload-container-hidden { + display: block; +} + +.wp-upload-hide { + display: none; +} +body.show-upload-container .wp-upload-hide { + display: inline; +} + /* =Media Queries -------------------------------------------------------------- */ +@media only screen and (max-width: 1120px) { + .wp-upload-container .wp-upload-form { + margin: 20px 0; + max-width: 100%; + } + .wp-upload-container .install-help { + font-size: 15px; + padding: 20px 0 0; + text-align: left; + } +} + @media screen and ( max-width: 782px ) { /* Input Elements */ textarea { Index: src/wp-admin/css/list-tables.css =================================================================== --- src/wp-admin/css/list-tables.css (revision 29136) +++ src/wp-admin/css/list-tables.css (working copy) @@ -1212,6 +1212,12 @@ } /* Plugin card table view */ + +.plugin-browser .plugins { + clear: both; + padding: 0 0 100px; +} + .plugin-card { float: left; margin: 0 8px 16px; @@ -1219,12 +1225,26 @@ width: -webkit-calc( 50% - 8px ); width: calc( 50% - 8px ); background-color: #fff; - border: 1px solid #dedede; + border: 1px solid #e5e5e5; + -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); + box-shadow: 0 1px 1px rgba(0,0,0,0.04); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } +.plugin-card .column-hidden { + display: none; +} + +.plugin-card .column-visible { + display: block; +} + +.plugin-card a { + text-decoration: none; +} + @media screen and ( max-width: 782px ) { .plugin-card { margin-left: 0; @@ -1233,12 +1253,12 @@ } } -.plugin-card:nth-child(odd) { +.plugins .plugin:nth-child(odd) .plugin-card { clear: both; margin-left: 0; } -.plugin-card:nth-child(even) { +.plugins .plugin:nth-child(even) .plugin-card { margin-right: 0 } @@ -1276,13 +1296,17 @@ clear: both; padding: 12px 20px; background-color: #fafafa; - border-top: 1px solid #dedede; + border-top: 1px solid #e5e5e5; overflow: hidden; } -.plugin-card-bottom .star-rating { +.plugin-card-bottom .rating { display: inline; + margin-right: .35em; } +.plugin-card-bottom .rating span:before { + float: left; +} .plugin-card .column-rating { line-height: 23px; Index: src/wp-admin/css/themes.css =================================================================== --- src/wp-admin/css/themes.css (revision 29136) +++ src/wp-admin/css/themes.css (working copy) @@ -25,25 +25,6 @@ margin-left: 20px; } -.themes-php .wrap .theme-count, -.theme-navigation .theme-count { - color: #fff; - -webkit-border-radius: 30px; - border-radius: 30px; - background: #777; - font-size: 14px; - padding: 4px 10px; - font-weight: 600; - margin-left: 5px; - margin-right: 20px; - position: relative; - top: -3px; -} - -.theme-navigation a { - text-decoration:none; -} - /* Position admin messages */ .themes-php div.updated, .themes-php div.error { @@ -51,6 +32,20 @@ clear: both; } +/* + * The search form + */ +.themes-php .wp-filter-search { + position: relative; + top: -2px; + left: 20px; + font-size: 16px; + font-weight: 300; + line-height: 1.5; + width: 280px; + margin: 0; +} + .themes-php div.updated a { text-decoration: underline; } @@ -401,19 +396,6 @@ z-index: 2; } -/* - * The search form - */ -.themes-php .theme-search { - position: relative; - top: -2px; - left: 20px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} - /** * Theme Overlay * Shown when clicking a theme @@ -1024,8 +1006,8 @@ .themes-php .wrap h2 { width: 100%; } - - .themes-php .theme-search { + + .themes-php .wp-filter-search { float: none; clear: both; left: 0; @@ -1088,376 +1070,6 @@ display: none !important; } -.theme-navigation { - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,.1); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - color: #555; - display: inline-block; - font-size: 13px; - margin: 20px 0 30px; - padding: 0 20px; - position: relative; - width: 100%; -} -.theme-install-php a.upload, -.theme-install-php a.browse-themes { - cursor: pointer; -} -.theme-install-php a.browse-themes, -.theme-install-php.show-upload-theme a.upload { - display: none; -} -.theme-install-php.show-upload-theme a.browse-themes { - display: inline; -} -.upload-theme { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - display: none; - margin: 0px 0 0; - padding: 0; - width: 100%; - overflow: hidden; - position: relative; - top: 10px; -} -body.show-upload-theme .upload-theme { - display: block; -} -.upload-theme .wp-upload-form { - background: #fafafa; - border: 1px solid #e5e5e5; - padding: 30px; - margin: 30px auto; - max-width: 380px; -} -.upload-theme .install-help { - color: #999; - font-size: 18px; - font-style: normal; - margin: 0; - padding: 40px 0 0; - text-align: center; -} -body.show-upload-theme .upload-theme + .theme-navigation, -body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser { - display: none; -} -.theme-navigation .theme-count { - margin-left: 0; - position: absolute; - top: 12px; -} -.theme-count + .theme-section { - margin-left: 60px; -} -.theme-section, -.theme-filter { - border-bottom: 4px solid #fff; - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 15px 0; -} -.theme-section.current, -.theme-filter.current { - border-bottom: 4px solid #666; - color: #222; -} -.theme-top-filters { - display: inline-block; -} -.theme-navigation .more-filters { - color: #666; - cursor: pointer; - display: inline-block; - margin: 0 10px; - padding: 4px 6px; -} -body.more-filters-opened .more-filters { - background: #777; - -webkit-border-radius: 2px; - border-radius: 2px; - border: none; - color: #fff; -} - -body.more-filters-opened .more-filters:before { - color: #fff; -} - -body.more-filters-opened .more-filters:hover, -body.more-filters-opened .more-filters:focus { - background: rgb(46, 162, 204); -} - -.theme-install-php .theme-search { - position: absolute; - right: 10px; - top: 9px; - font-size: 16px; - font-weight: 300; - line-height: 1.5; - width: 280px; -} -.more-filters:before { - color: #777; - text-align: center; - margin: 0 5px 0 0; - content: "\f111"; - display: inline-block; - width: 16px; - height: 16px; - -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1; - font-family: "dashicons"; - text-decoration: inherit; - font-weight: normal; - font-style: normal; - vertical-align: top; - -webkit-transition: color .1s ease-in 0; - transition: color .1s ease-in 0; - text-align: center; -} -.more-filters.current:before { - color: #fff; -} -.more-filters-container { - display: none; - padding: 20px; - border-top: 1px solid #eee; - margin: 0 -20px; - background: #fafafa; -} -body.more-filters-opened .more-filters-container { - display: block; - overflow: hidden; -} -body.more-filters-opened .theme-section.current { - border-bottom: none; -} -body.more-filters-opened .theme-browser, -body.more-filters-opened.filters-applied.loading-themes .theme-browser { - display: none; -} -body.more-filters-opened.filters-applied .theme-browser { - display: block; -} -.more-filters-container .filters-group { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - float: left; - width: 19%; - background: #fff; - margin: 0 1% 0 0; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - padding: 10px; -} -.more-filters-container .wide-filters-group { - width: 38%; -} -.more-filters-container .feature-name { - margin: 0; - position: relative; -} -.more-filters-container ol { - list-style-type: none; - margin: 20px 0 0; - font-size: 12px; -} -.more-filters-container li { - display: inline-block; - vertical-align: top; - list-style-type: none; - margin: 5px 0; - padding-right: 25px; - width: 160px; -} -.theme-navigation .more-filters-container .apply-filters { - margin: 0 0 20px; -} -.theme-navigation .more-filters-container .clear-filters { - display: none; - margin: 0 0 20px 10px; -} -.more-filters-container .apply-filters span { - display: inline-block; - font-size: 12px; - text-indent: 10px; - opacity: 0.8; -} -.more-filters-container .filtering-by { - display: none; - margin: 0; -} -.more-filters-container .filtering-by > span { - font-weight: 600; -} -.more-filters-container .filtering-by .tags { - display: inline; -} -.more-filters-container .filtering-by .tag { - background: #fff; - border: 1px solid #e5e5e5; - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.04); - box-shadow: 0 1px 1px rgba(0,0,0,0.04); - font-size: 11px; - margin: 0 5px; - padding: 4px 8px; -} -.more-filters-container .filtering-by a { - margin-left: 10px; -} -body.filters-applied .more-filters-container .filters-group, -body.filters-applied .more-filters-container a.button, -body.filters-applied .more-filters-container br { - display: none !important; -} -body.filters-applied .more-filters-container .filtering-by { - display: block; -} -body.filters-applied .more-filters-container { - padding: 20px; -} -p.no-themes { - color: #999; - font-size: 18px; - font-style: normal; - margin: 0; - padding: 0; - text-align: center; - display: none; -} -body.no-results p.no-themes { - display: block; -} -body.show-upload-theme p.no-themes { - display: none !important; -} - - -.theme-install-php .add-new-theme { - display: none !important; -} - -@media only screen and (max-width: 1120px) { - .theme-install-php .theme-search { - margin: 20px 0; - position: static; - width: 100%; - } - .more-filters-container { - border-bottom: 1px solid #eee; - } - .upload-theme .wp-upload-form { - margin: 20px 0; - max-width: 100%; - } - .upload-theme .install-help { - font-size: 15px; - padding: 20px 0 0; - text-align: left; - } - .more-filters-container .filters-group { - margin-bottom: 0; - margin-top: 5px; - width: 100%; - } - .more-filters-container .filters-group li { - margin: 10px 0; - } -} - -@media only screen and (max-width: 782px) { - .more-filters-container .filters-group { - width: 100%; - } - .more-filters-container .filters-group li { - width: 100%; - } -} - -.rating { - margin: 30px 0; -} -.rating span:before { - color: #e6b800; - content: "\f154"; - display: inline-block; - -webkit-font-smoothing: antialiased; - font: normal 20px/1 'dashicons'; - vertical-align: top; -} -/* Half stars */ -.rating-10 span.one:before, -.rating-30 span.two:before, -.rating-50 span.three:before, -.rating-70 span.four:before, -.rating-90 span.five:before { - content: "\f459"; -} -/* Full stars */ -.rating-20 span.one:before { - content: "\f155"; -} -.rating-30 span.one:before, -.rating-40 span.one:before, -.rating-40 span.two:before { - content: "\f155"; -} -.rating-50 span.one:before, -.rating-50 span.two:before, -.rating-60 span.one:before, -.rating-60 span.two:before, -.rating-60 span.three:before { - content: "\f155"; -} -.rating-70 span.one:before, -.rating-70 span.two:before, -.rating-70 span.three:before, -.rating-80 span.one:before, -.rating-80 span.two:before, -.rating-80 span.three:before, -.rating-80 span.four:before { - content: "\f155"; -} -.rating-90 span.one:before, -.rating-90 span.two:before, -.rating-90 span.three:before, -.rating-90 span.four:before, -.rating-100 span.one:before, -.rating-100 span.two:before, -.rating-100 span.three:before, -.rating-100 span.four:before, -.rating-100 span.five:before { - content: "\f155"; -} -.rating .ratings { - display: inline; - margin-left: 10px; - line-height: 20px; - color: #999; -} -.loading-themes .theme-browser, -.error .theme-browser { - display: none; -} -.loading-themes .spinner { - display: block; - margin: 40px auto 0; - float: none; -} - /*------------------------------------------------------------------------------ 16.3 - Custom Header Screen ------------------------------------------------------------------------------*/ @@ -1618,6 +1230,14 @@ overflow: auto; } +.wp-full-overlay-sidebar .rating { + display: block; + margin: 30px 0; +} +.wp-full-overlay-sidebar .rating span:before { + color: #e6b800; +} + /* Close & Navigation Links */ .theme-install-overlay .wp-full-overlay-sidebar .wp-full-overlay-header { padding: 0; Index: src/wp-admin/css/wp-admin.css =================================================================== --- src/wp-admin/css/wp-admin.css (revision 29136) +++ src/wp-admin/css/wp-admin.css (working copy) @@ -12,3 +12,4 @@ @import url(nav-menus.css); @import url(widgets.css); @import url(l10n.css); +@import url(filter.css); Index: src/wp-admin/includes/ajax-actions.php =================================================================== --- src/wp-admin/includes/ajax-actions.php (revision 29136) +++ src/wp-admin/includes/ajax-actions.php (working copy) @@ -2605,6 +2605,113 @@ } /** + * Ajax handler for getting plugins from plugins_api(). + * + * @since 4.0.0 + */ +function wp_ajax_query_plugins() { + global $plugins_allowedtags, $plugins_field_defaults; + + if ( ! current_user_can( 'install_plugins' ) ) { + wp_send_json_error(); + } + $args = wp_parse_args( wp_unslash( $_REQUEST['request'] ), array( + 'per_page' => 20, + 'fields' => $plugins_field_defaults + ) ); + + $old_filter = isset( $args['browse'] ) ? $args['browse'] : 'search'; + + /** This filter is documented in wp-admin/includes/class-wp-theme-install-list-table.php */ + $args = apply_filters( 'install_plugins_table_api_args_' . $old_filter, $args ); + + require( ABSPATH . 'wp-admin/includes/plugin-install.php' ); // Needed for plugins_api + + $api = plugins_api( 'query_plugins', $args ); + + if ( is_wp_error( $api ) ) { + wp_send_json_error(); + } + + foreach ( $api->plugins as &$plugin ) { + + if ( version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin->tested ) ), $plugin->tested, '>' ) ) { + $plugin->compatibility = 'untested'; + } else if ( version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin->requires ) ), $plugin->requires, '<' ) ) { + $plugin->compatibility = 'incompatible'; + } else { + $plugin->compatibility = 'compatible'; + } + + $details_link = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin->slug . + '&TB_iframe=true&width=830&height=654' ); + + /** + * Filter the details link for a plugin. + * + * @since 4.0.0 + * + * @param string $details_link Link to view the current plugin's details. + * @param array $plugin The plugin currently being listed. + */ + $plugin->detail_url = apply_filters( 'plugin_install_details_link', $details_link, (array) $plugin ); + + $action_links = array(); + + $name = strip_tags( $plugin->name . ' ' . $plugin->version ); + + $status = install_plugin_install_status( $plugin ); + + switch ( $status['status'] ) { + case 'install': + if ( $status['url'] ) { + $action_links[] = '' . __( 'Install Now' ) . ''; + } + + break; + case 'update_available': + if ( $status['url'] ) { + $action_links[] = '' . __( 'Update Now' ) . ''; + } + + break; + case 'latest_installed': + case 'newer_installed': + $action_links[] = '' . _x( 'Installed', 'plugin' ) . ''; + break; + } + + $action_links[] = '' . __( 'More Details' ) . ''; + + /** + * Filter the install action links for a plugin. + * + * @since 2.7.0 + * + * @param array $action_links An array of plugin action hyperlinks. Defaults are links to Details and Install Now. + * @param array $plugin The plugin currently being listed. + */ + $plugin->action_links = apply_filters( 'plugin_install_action_links', $action_links, (array) $plugin ); + + $plugin->name = wp_kses( strip_tags( $plugin->name ), $plugins_allowedtags ); + $plugin->author = wp_kses( $plugin->author, $plugins_allowedtags ); + $plugin->slug = wp_kses( $plugin->slug, $plugins_allowedtags ); + $plugin->version = wp_kses( $plugin->version, $plugins_allowedtags ); + $plugin->description = strip_tags( $plugin->description ); + $plugin->short_description = strip_tags( $plugin->short_description ); + $plugin->rating = wp_kses( $plugin->rating, $plugins_allowedtags ); + $plugin->ratings = wp_kses( $plugin->ratings, $plugins_allowedtags ); + $plugin->num_ratings = $plugin->num_ratings; + $plugin->num_ratings_formatted = number_format_i18n( $plugin->num_ratings ); + $plugin->downloaded = number_format_i18n( $plugin->downloaded ); + $plugin->last_updated = sprintf( __( '%s ago' ), human_time_diff( strtotime( $plugin->last_updated ) ) ); + } + + wp_send_json_success( $api ); +} + +/** * Apply [embed] handlers to a string. * * @since 4.0.0 Index: src/wp-admin/includes/class-wp-plugin-install-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-plugin-install-list-table.php (revision 29136) +++ src/wp-admin/includes/class-wp-plugin-install-list-table.php (working copy) @@ -27,9 +27,9 @@ // These are the tabs which are shown on the page $tabs = array(); $tabs['dashboard'] = __( 'Search' ); - if ( 'search' == $tab ) + if ( 'search' == $tab ) { $tabs['search'] = __( 'Search Results' ); - $tabs['upload'] = __( 'Upload' ); + } $tabs['featured'] = _x( 'Featured', 'Plugin Installer' ); $tabs['popular'] = _x( 'Popular', 'Plugin Installer' ); $tabs['new'] = _x( 'Newest', 'Plugin Installer' ); @@ -40,14 +40,7 @@ $nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item. - /** - * Filter the tabs shown on the Plugin Install screen. - * - * @since 2.7.0 - * - * @param array $tabs The tabs shown on the Plugin Install screen. Defaults are 'dashboard', 'search', - * 'upload', 'featured', 'popular', 'new', and 'favorites'. - */ + /** This filter is documented in wp-admin/plugin-install.php */ $tabs = apply_filters( 'install_plugins_tabs', $tabs ); /** @@ -112,7 +105,7 @@ * Filter API request arguments for each Plugin Install screen tab. * * The dynamic portion of the hook name, $tab, refers to the plugin install tabs. - * Default tabs are 'dashboard', 'search', 'upload', 'featured', 'popular', 'new', + * Default tabs are 'dashboard', 'search', 'featured', 'popular', 'new', * and 'favorites'. * * @since 3.7.0 Index: src/wp-admin/includes/plugin-install.php =================================================================== --- src/wp-admin/includes/plugin-install.php (revision 29136) +++ src/wp-admin/includes/plugin-install.php (working copy) @@ -126,7 +126,7 @@ function install_dashboard() { ?> -

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

+

WordPress Plugin Directory or upload a plugin in .zip format.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?upload' ) ); ?>

@@ -187,14 +187,15 @@ */ function install_plugins_upload( $page = 1 ) { ?> -

-

-
- - - - -
+
+

+
+ + + + +
+
-

-
- - - -
- +

+
+ + + +
+ +' ); }, @@ -105,12 +105,12 @@ // Render and append after screen title view.render(); this.searchContainer - .append( $.parseHTML( '' ) ) + .append( $.parseHTML( '' ) ) .append( view.el ); }, // Checks when the user gets close to the bottom - // of the mage and triggers a theme:scroll event + // of the page and triggers a theme:scroll event scroller: function() { var self = this, bottom, threshold; @@ -342,7 +342,7 @@ beforeSend: function() { if ( ! paginated ) { // Spin it - $( 'body' ).addClass( 'loading-themes' ).removeClass( 'no-results' ); + $( 'body' ).addClass( 'loading-content' ).removeClass( 'no-results' ); } } }); @@ -1080,8 +1080,8 @@ themes.view.Search = wp.Backbone.View.extend({ tagName: 'input', - className: 'theme-search', - id: 'theme-search-input', + className: 'wp-filter-search', + id: 'wp-filter-search-input', searching: false, attributes: { @@ -1110,7 +1110,7 @@ // Runs a search on the theme collection. search: function( event ) { var options = {}; - + // Clear on escape. if ( event.type === 'keyup' && event.which === 27 ) { event.target.value = ''; @@ -1168,11 +1168,11 @@ }, search: function( query ) { - $( '.theme-search' ).val( query ); + $( '.wp-filter-search' ).val( query ); }, themes: function() { - $( '.theme-search' ).val( '' ); + $( '.wp-filter-search' ).val( '' ); }, navigate: function() { @@ -1229,7 +1229,7 @@ // Handles search route event themes.router.on( 'route:search', function() { - $( '.theme-search' ).trigger( 'keyup' ); + $( '.wp-filter-search' ).trigger( 'keyup' ); }); this.extraRoutes(); @@ -1288,8 +1288,8 @@ request.tag = [ value.slice( 4 ) ]; } - $( '.theme-section.current' ).removeClass( 'current' ); - $( 'body' ).removeClass( 'more-filters-opened filters-applied' ); + $( '.wp-filter-link.current' ).removeClass( 'current' ); + $( 'body' ).removeClass( 'show-filter-drawer filters-applied' ); // Get the themes by sending Ajax POST request to api.wordpress.org/themes // or searching the local cache @@ -1304,16 +1304,16 @@ el: '#wpbody-content .wrap', - // Register events for sorting and filters in theme-navigation + // Register events for sorting and filters in wp-filter events: { - 'click .theme-section': 'onSort', + 'click .wp-filter-link': 'onSort', 'click .theme-filter': 'onFilter', - 'click .more-filters': 'moreFilters', - 'click .apply-filters': 'applyFilters', - 'click [type="checkbox"]': 'addFilter', - 'click .clear-filters': 'clearFilters', - 'click .feature-name': 'filterSection', - 'click .filtering-by a': 'backToFilters' + 'click .wp-filter-drawer-toggle': 'moreFilters', + 'click .wp-filter-drawer-apply': 'applyFilters', + 'click .wp-filter-group [type="checkbox"]': 'addFilter', + 'click .wp-filter-drawer-clear': 'clearFilters', + 'click .wp-filter-group-title': 'filterSection', + 'click .wp-filter-by a': 'backToFilters' }, // Initial render method @@ -1343,12 +1343,12 @@ }); this.listenTo( this.collection, 'query:success', function() { - $( 'body' ).removeClass( 'loading-themes' ); + $( 'body' ).removeClass( 'loading-content' ); $( '.theme-browser' ).find( 'div.error' ).remove(); }); this.listenTo( this.collection, 'query:fail', function() { - $( 'body' ).removeClass( 'loading-themes' ); + $( 'body' ).removeClass( 'loading-content' ); $( '.theme-browser' ).find( 'div.error' ).remove(); $( '.theme-browser' ).find( 'div.themes' ).before( '

' + l10n.error + '

' ); }); @@ -1386,7 +1386,7 @@ event.preventDefault(); - $( 'body' ).removeClass( 'filters-applied more-filters-opened' ); + $( 'body' ).removeClass( 'filters-applied show-filter-drawer' ); // Bail if this is already active if ( $el.hasClass( this.activeClass ) ) { @@ -1395,7 +1395,7 @@ this.sort( sort ); - // Trigger a router.naviagte update + // Trigger a router.navigate update themes.router.navigate( themes.router.baseUrl( '?browse=' + sort ) ); }, @@ -1402,7 +1402,7 @@ sort: function( sort ) { this.clearSearch(); - $( '.theme-section, .theme-filter' ).removeClass( this.activeClass ); + $( '.wp-filter-link, .theme-filter' ).removeClass( this.activeClass ); $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass ); this.browse( sort ); @@ -1419,7 +1419,7 @@ return; } - $( '.theme-filter, .theme-section' ).removeClass( this.activeClass ); + $( '.wp-filter-link, .theme-filter' ).removeClass( this.activeClass ); $el.addClass( this.activeClass ); if ( ! filter ) { @@ -1446,7 +1446,7 @@ var name, tags = this.filtersChecked(), request = { tag: tags }, - filteringBy = $( '.filtering-by .tags' ); + filteringBy = $( '.wp-filter-by .tags' ); if ( event ) { event.preventDefault(); @@ -1453,11 +1453,11 @@ } $( 'body' ).addClass( 'filters-applied' ); - $( '.theme-section.current' ).removeClass( 'current' ); + $( '.wp-filter-link.current' ).removeClass( 'current' ); filteringBy.empty(); _.each( tags, function( tag ) { - name = $( 'label[for="feature-id-' + tag + '"]' ).text(); + name = $( 'label[for="filter-id-' + tag + '"]' ).text(); filteringBy.append( '' + name + '' ); }); @@ -1469,7 +1469,7 @@ // Get the checked filters // @return {array} of tags or false filtersChecked: function() { - var items = $( '.feature-group' ).find( ':checkbox' ), + var items = $( '.wp-filter-group' ).find( ':checkbox' ), tags = []; _.each( items.filter( ':checked' ), function( item ) { @@ -1478,14 +1478,14 @@ // When no filters are checked, restore initial state and return if ( tags.length === 0 ) { - $( '.apply-filters' ).find( 'span' ).text( '' ); - $( '.clear-filters' ).hide(); + $( '.wp-filter-drawer-apply' ).find( 'span' ).text( '' ); + $( '.wp-filter-drawer-clear' ).hide(); $( 'body' ).removeClass( 'filters-applied' ); return false; } - $( '.apply-filters' ).find( 'span' ).text( tags.length ); - $( '.clear-filters' ).css( 'display', 'inline-block' ); + $( '.wp-filter-drawer-apply' ).find( 'span' ).text( tags.length ); + $( '.wp-filter-drawer-clear' ).css( 'display', 'inline-block' ); return tags; }, @@ -1494,17 +1494,17 @@ // Overwrite search container class to append search // in new location - searchContainer: $( '.theme-navigation' ), + searchContainer: $( '.wp-filter' ), uploader: function() { - $( 'a.upload' ).on( 'click', function( event ) { + $( '.wp-upload-show' ).on( 'click', function( event ) { event.preventDefault(); - $( 'body' ).addClass( 'show-upload-theme' ); + $( 'body' ).addClass( 'show-upload-container' ); themes.router.navigate( themes.router.baseUrl( '?upload' ), { replace: true } ); }); - $( 'a.browse-themes' ).on( 'click', function( event ) { + $( '.wp-upload-hide' ).on( 'click', function( event ) { event.preventDefault(); - $( 'body' ).removeClass( 'show-upload-theme' ); + $( 'body' ).removeClass( 'show-upload-container' ); themes.router.navigate( themes.router.baseUrl( '' ), { replace: true } ); }); }, @@ -1519,7 +1519,7 @@ // If the filters section is opened and filters are checked // run the relevant query collapsing to filtered-by state - if ( $( 'body' ).hasClass( 'more-filters-opened' ) && this.filtersChecked() ) { + if ( $( 'body' ).hasClass( 'show-filter-drawer' ) && this.filtersChecked() ) { return this.addFilter(); } @@ -1526,7 +1526,7 @@ this.clearSearch(); themes.router.navigate( themes.router.baseUrl( '' ) ); - $( 'body' ).toggleClass( 'more-filters-opened' ); + $( 'body' ).toggleClass( 'show-filter-drawer' ); }, // Expand/collapse each individual filter section @@ -1537,7 +1537,7 @@ // Clears all the checked filters // @uses filtersChecked() clearFilters: function( event ) { - var items = $( '.feature-group' ).find( ':checkbox' ), + var items = $( '.wp-filter-group' ).find( ':checkbox' ), self = this; event.preventDefault(); @@ -1557,7 +1557,7 @@ }, clearSearch: function() { - $( '#theme-search-input').val( '' ); + $( '#wp-filter-search-input' ).val( '' ); } }); @@ -1575,7 +1575,7 @@ }, search: function( query ) { - $( '.theme-search' ).val( query ); + $( '.wp-filter-search' ).val( query ); }, navigate: function() { @@ -1642,12 +1642,12 @@ // Support the `upload` route by going straight to upload section themes.router.on( 'route:upload', function() { - $( 'a.upload' ).trigger( 'click' ); + $( '.wp-upload-show' ).trigger( 'click' ); }); // The `search` route event. The router populates the input field. themes.router.on( 'route:search', function() { - $( '.theme-search' ).focus().trigger( 'keyup' ); + $( '.wp-filter-search' ).focus().trigger( 'keyup' ); }); this.extraRoutes(); Index: src/wp-admin/plugin-install.php =================================================================== --- src/wp-admin/plugin-install.php (revision 29136) +++ src/wp-admin/plugin-install.php (working copy) @@ -6,16 +6,21 @@ * @subpackage Administration */ // TODO route this pages via a specific iframe handler instead of the do_action below -if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) +if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) { define( 'IFRAME_REQUEST', true ); +} /** * WordPress Administration Bootstrap. */ require_once( dirname( __FILE__ ) . '/admin.php' ); +require( ABSPATH . 'wp-admin/includes/plugin-install.php' ); -if ( ! current_user_can('install_plugins') ) +wp_reset_vars( array( 'tab' ) ); + +if ( ! current_user_can('install_plugins') ) { wp_die(__('You do not have sufficient permissions to install plugins on this site.')); +} if ( is_multisite() && ! is_network_admin() ) { wp_redirect( network_admin_url( 'plugin-install.php' ) ); @@ -22,16 +27,49 @@ exit(); } -$wp_list_table = _get_list_table('WP_Plugin_Install_List_Table'); -$pagenum = $wp_list_table->get_pagenum(); -$wp_list_table->prepare_items(); - $title = __('Install Plugins'); $parent_file = 'plugins.php'; -wp_enqueue_script( 'plugin-install' ); -if ( 'plugin-information' != $tab ) +$tabs = array( + 'upload' => __( 'Upload Plugin' ), + 'browse-plugins' => _x( 'Browse', 'plugins' ), +); + +$sections = array( + 'featured' => _x( 'Featured', 'plugins' ), + 'popular' => _x( 'Popular', 'plugins' ), + 'new' => _x( 'Latest', 'plugins' ), +); +if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) { + $sections['beta'] = _x( 'Beta Testing', 'plugins' ); +} + +wp_localize_script( 'plugin', '_wpPluginSettings', array( + 'plugins' => false, + 'settings' => array( + 'isInstall' => true, + 'canInstall' => current_user_can( 'install_plugins' ), + 'installURI' => current_user_can( 'install_plugins' ) ? self_admin_url( 'plugin-install.php' ) : null, + 'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ) + ), + 'l10n' => array( + 'search' => __( 'Search Plugins' ), + 'searchPlaceholder' => __( 'Search plugins...' ), // placeholder (no ellipsis) + 'upload' => __( 'Upload Plugin' ), + 'error' => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), + 'pluginInformation' => __('Plugin Information:'), + 'ays' => __('Are you sure you want to install this plugin?'), + ), + 'browse' => array( + 'sections' => $sections, + ), +) ); + +wp_enqueue_script( 'plugin' ); + +if ( 'plugin-information' != $tab ) { add_thickbox(); +} $body_id = $tab; @@ -43,8 +81,21 @@ * * @since 2.7.0 */ -do_action( "install_plugins_pre_$tab" ); +if ( $tab ) { + do_action( "install_plugins_pre_$tab" ); +} +add_screen_option( 'misc_screen_options', array( 'option' => 'manageplugin-installplugin-cardcolumnshidden', 'id' => 'plugin-card' ) ); + +$screen_options = array( + 'description' => 'Description', + 'rating' => 'Rating', + 'extra_details' => 'Extra Details' +); +foreach ( $screen_options as $id => $label ) { + add_screen_option( $id, array( 'label' => __( $label ) ) ); +} + get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), @@ -73,27 +124,156 @@ include(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

+

+ + $tab_name ) { + $visibility = $tab_slug == 'upload' ? ' wp-upload-show' : ' wp-upload-hide'; + + echo '' . $tab_name . ''; + } + ?> +

-views(); ?> + -
- - +
+
+ +
+ + + + + + + + + + +
+ + TODO - Favorites + +
+
+ + TODO - Tag Filter + +
+ +
+ +
+
+ +

+ +
+
+
+ + + __( 'Featured Themes' ), - 'popular' => __( 'Popular Themes' ), - 'new' => __( 'Newest Themes' ), + 'featured' => _x( 'Featured', 'themes' ), + 'popular' => _x( 'Popular', 'themes' ), + 'new' => _x( 'Latest', 'themes' ), ); $installed_themes = search_theme_directories(); @@ -125,79 +126,92 @@ */ $tabs = apply_filters( 'install_themes_tabs', $tabs ); foreach ( $tabs as $tab_slug => $tab_name ) { - echo '' . $tab_name . ''; + $visibility = $tab_slug == 'upload' ? ' wp-upload-show' : ' wp-upload-hide'; + + echo '' . $tab_name . ''; } ?> -
-
- -
- - - - -
- - + +
+
+
-
- - -
+ +
    + $section_text ) { ?> +
  • + + + +
    • + +
+ + + + + +
+
+ + +
$features ) { - if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack - echo '
'; - } else { - echo '
'; - } - $feature_name = esc_html( $feature_name ); - echo '

' . $feature_name . '

'; - echo '
    '; - foreach ( $features as $feature => $feature_name ) { - $feature = esc_attr( $feature ); - echo '
  1. '; - echo '
    2. '; - } - echo '
'; - echo '
'; - } - ?> -
+ if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack ?> +
+ +
+ +

+
    + $feature_name ) { + $feature = esc_attr( $feature ); ?> +
  1. + + +
    2. + +
+
+ +
+
-
-
- -

- - + +
+
+
+ +

+ +

- +