--- a/wp/wp-admin/includes/class-wp-theme-install-list-table.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-theme-install-list-table.php Tue Jun 09 03:35:32 2015 +0200
@@ -9,13 +9,13 @@
*/
class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
- var $features = array();
+ public $features = array();
- function ajax_user_can() {
+ public function ajax_user_can() {
return current_user_can( 'install_themes' );
}
- function prepare_items() {
+ public function prepare_items() {
include( ABSPATH . 'wp-admin/includes/theme-install.php' );
global $tabs, $tab, $paged, $type, $theme_field_defaults;
@@ -41,14 +41,24 @@
if ( 'search' == $tab )
$tabs['search'] = __( 'Search Results' );
$tabs['upload'] = __( 'Upload' );
- $tabs['featured'] = _x( 'Featured','Theme Installer' );
- //$tabs['popular'] = _x( 'Popular','Theme Installer' );
- $tabs['new'] = _x( 'Newest','Theme Installer' );
- $tabs['updated'] = _x( 'Recently Updated','Theme Installer' );
+ $tabs['featured'] = _x( 'Featured', 'themes' );
+ //$tabs['popular'] = _x( 'Popular', 'themes' );
+ $tabs['new'] = _x( 'Latest', 'themes' );
+ $tabs['updated'] = _x( 'Recently Updated', 'themes' );
$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
+ /** This filter is documented in wp-admin/theme-install.php */
$tabs = apply_filters( 'install_themes_tabs', $tabs );
+
+ /**
+ * Filter tabs not associated with a menu item on the Install Themes screen.
+ *
+ * @since 2.8.0
+ *
+ * @param array $nonmenu_tabs The tabs that don't have a menu item on
+ * the Install Themes screen.
+ */
$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
// If a non-valid menu tab has been selected, And it's not a non-menu action.
@@ -82,7 +92,7 @@
break;
case 'featured':
- //case 'popular':
+ // case 'popular':
case 'new':
case 'updated':
$args['browse'] = $tab;
@@ -93,6 +103,17 @@
break;
}
+ /**
+ * Filter API request arguments for each Install Themes screen tab.
+ *
+ * The dynamic portion of the hook name, `$tab`, refers to the theme install
+ * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
+ * 'new', and 'updated'.
+ *
+ * @since 3.7.0
+ *
+ * @param array $args An array of themes API arguments.
+ */
$args = apply_filters( 'install_themes_table_api_args_' . $tab, $args );
if ( ! $args )
@@ -107,16 +128,16 @@
$this->set_pagination_args( array(
'total_items' => $api->info['results'],
- 'per_page' => $per_page,
+ 'per_page' => $args['per_page'],
'infinite_scroll' => true,
) );
}
- function no_items() {
+ public function no_items() {
_e( 'No themes match your request.' );
}
- function get_views() {
+ protected function get_views() {
global $tabs, $tab;
$display_tabs = array();
@@ -129,12 +150,19 @@
return $display_tabs;
}
- function display() {
+ public function display() {
wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
?>
<div class="tablenav top themes">
<div class="alignleft actions">
- <?php do_action( 'install_themes_table_header' ); ?>
+ <?php
+ /**
+ * Fires in the Install Themes list table header.
+ *
+ * @since 2.8.0
+ */
+ do_action( 'install_themes_table_header' );
+ ?>
</div>
<?php $this->pagination( 'top' ); ?>
<br class="clear" />
@@ -145,10 +173,10 @@
</div>
<?php
- parent::tablenav( 'bottom' );
+ $this->tablenav( 'bottom' );
}
- function display_rows() {
+ public function display_rows() {
$themes = $this->items;
foreach ( $themes as $theme ) {
?>
@@ -160,7 +188,7 @@
$this->theme_installer();
}
- /*
+ /**
* Prints a theme from the WordPress.org API.
*
* @param object $theme An object that contains theme data returned by the WordPress.org API.
@@ -179,7 +207,7 @@
* public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
* public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
*/
- function single_row( $theme ) {
+ public function single_row( $theme ) {
global $themes_allowedtags;
if ( empty( $theme ) )
@@ -192,7 +220,7 @@
$preview_url = add_query_arg( array(
'tab' => 'theme-information',
'theme' => $theme->slug,
- ) );
+ ), self_admin_url( 'theme-install.php' ) );
$actions = array();
@@ -209,10 +237,6 @@
$status = $this->_get_theme_status( $theme );
switch ( $status ) {
- default:
- case 'install':
- $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
- break;
case 'update_available':
$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
break;
@@ -220,15 +244,28 @@
case 'latest_installed':
$actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
break;
+ case 'install':
+ default:
+ $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+ break;
}
$actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
+ /**
+ * Filter the install action links for a theme in the Install Themes list table.
+ *
+ * @since 3.4.0
+ *
+ * @param array $actions An array of theme action hyperlinks. Defaults are
+ * links to Install Now, Preview, and Details.
+ * @param WP_Theme $theme Theme object.
+ */
$actions = apply_filters( 'theme_install_actions', $actions, $theme );
?>
<a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
- <img src='<?php echo esc_url( $theme->screenshot_url ); ?>' width='150' />
+ <img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" />
</a>
<h3><?php echo $name; ?></h3>
@@ -247,21 +284,22 @@
$this->install_theme_info( $theme );
}
- /*
+ /**
* Prints the wrapper for the theme installer.
*/
- function theme_installer() {
+ public function theme_installer() {
?>
<div id="theme-installer" class="wp-full-overlay expanded">
<div class="wp-full-overlay-sidebar">
<div class="wp-full-overlay-header">
- <a href="#" class="close-full-overlay"><?php _e( '← Close' ); ?></a>
+ <a href="#" class="close-full-overlay button-secondary"><?php _e( 'Close' ); ?></a>
+ <span class="theme-install"></span>
</div>
<div class="wp-full-overlay-sidebar-content">
<div class="install-theme-info"></div>
</div>
<div class="wp-full-overlay-footer">
- <a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
+ <a href="#" class="collapse-sidebar" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
<span class="collapse-sidebar-arrow"></span>
</a>
@@ -272,13 +310,13 @@
<?php
}
- /*
+ /**
* Prints the wrapper for the theme installer with a provided theme's data.
* Used to make the theme installer work for no-js.
*
* @param object $theme - A WordPress.org Theme API object.
*/
- function theme_installer_single( $theme ) {
+ public function theme_installer_single( $theme ) {
?>
<div id="theme-installer" class="wp-full-overlay single-theme">
<div class="wp-full-overlay-sidebar">
@@ -291,12 +329,12 @@
<?php
}
- /*
+ /**
* Prints the info for a theme (to be used in the theme installer modal).
*
* @param object $theme - A WordPress.org Theme API object.
*/
- function install_theme_info( $theme ) {
+ public function install_theme_info( $theme ) {
global $themes_allowedtags;
if ( empty( $theme ) )
@@ -305,8 +343,6 @@
$name = wp_kses( $theme->name, $themes_allowedtags );
$author = wp_kses( $theme->author, $themes_allowedtags );
- $num_ratings = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
-
$install_url = add_query_arg( array(
'action' => 'install-theme',
'theme' => $theme->slug,
@@ -322,10 +358,6 @@
?>
<div class="install-theme-info"><?php
switch ( $status ) {
- default:
- case 'install':
- echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
- break;
case 'update_available':
echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
break;
@@ -333,6 +365,10 @@
case 'latest_installed':
echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
break;
+ case 'install':
+ default:
+ echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+ break;
} ?>
<h3 class="theme-name"><?php echo $name; ?></h3>
<span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
@@ -340,9 +376,7 @@
<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" />
<?php endif; ?>
<div class="theme-details">
- <div class="star-holder" title="<?php echo esc_attr( $num_ratings ); ?>">
- <div class="star-rating" style="width:<?php echo esc_attr( intval( $theme->rating ) . 'px' ); ?>;"></div>
- </div>
+ <?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
<div class="theme-version">
<strong><?php _e('Version:') ?> </strong>
<?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
@@ -359,13 +393,13 @@
/**
* Send required variables to JavaScript land
*
- * @since 3.4
- * @access private
+ * @since 3.4.0
+ * @access public
*
* @uses $tab Global; current tab within Themes->Install screen
* @uses $type Global; type of search.
*/
- function _js_vars( $extra_args = array() ) {
+ public function _js_vars( $extra_args = array() ) {
global $tab, $type;
parent::_js_vars( compact( 'tab', 'type' ) );
}
@@ -373,7 +407,7 @@
/**
* Check to see if the theme is already installed.
*
- * @since 3.4
+ * @since 3.4.0
* @access private
*
* @param object $theme - A WordPress.org Theme API object.