WordPress 4.4

[autoinstalls/wordpress.git] / wp-admin / theme-install.php

diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index fd8847c547d3b130b3aa1b3ef853d3ee9625df35..289f3954c3c2e56efefde8320a0d880e262adfa0 100644 (file)
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -27,12 +27,6 @@ if ( ! is_network_admin() ) {
        $submenu_file = 'themes.php';
 }
 
        $submenu_file = 'themes.php';
 }
 

-$sections = array(
-       'featured' => __( 'Featured Themes' ),
-       'popular'  => __( 'Popular Themes' ),
-       'new'      => __( 'Newest Themes' ),
-);
-

 $installed_themes = search_theme_directories();
 foreach ( $installed_themes as $k => $v ) {
        if ( false !== strpos( $k, '/' ) ) {
 $installed_themes = search_theme_directories();
 foreach ( $installed_themes as $k => $v ) {
        if ( false !== strpos( $k, '/' ) ) {


@@ -50,36 +44,38 @@ wp_localize_script( 'theme', '_wpThemeSettings', array(
        ),
        'l10n' => array(
                'addNew' => __( 'Add New Theme' ),
        ),
        'l10n' => array(
                'addNew' => __( 'Add New Theme' ),

-               'search'  => __( 'Search Themes' ),
+               'search' => __( 'Search Themes' ),

                'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
                'upload' => __( 'Upload Theme' ),
                'back'   => __( 'Back' ),
                'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
                'upload' => __( 'Upload Theme' ),
                'back'   => __( 'Back' ),

-               'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' )
+               'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
+               'themesFound'   => __( 'Number of Themes found: %d' ),
+               'noThemesFound' => __( 'No themes found. Try a different search.' ),
+               'collapseSidebar'    => __( 'Collapse Sidebar' ),
+               'expandSidebar'      => __( 'Expand Sidebar' ),

        ),
        'installedThemes' => array_keys( $installed_themes ),
        ),
        'installedThemes' => array_keys( $installed_themes ),

-       'browse' => array(
-               'sections' => $sections,
-       ),

 ) );
 
 wp_enqueue_script( 'theme' );
 
 ) );
 
 wp_enqueue_script( 'theme' );
 

-/**
- * Fires before each of the tabs are rendered on the Install Themes page.
- *
- * The dynamic portion of the hook name, $tab, refers to the current
- * theme install tab. Possible values are 'dashboard', 'search', 'upload',
- * 'featured', 'new', or 'updated'.
- *
- * @since 2.8.0
- */

 if ( $tab ) {
 if ( $tab ) {

+       /**
+        * Fires before each of the tabs are rendered on the Install Themes page.
+        *
+        * The dynamic portion of the hook name, `$tab`, refers to the current
+        * theme install tab. Possible values are 'dashboard', 'search', 'upload',
+        * 'featured', 'new', or 'updated'.
+        *
+        * @since 2.8.0
+        */

        do_action( "install_themes_pre_{$tab}" );
 }
 
 $help_overview =
        '<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/') . '</p>' .
        do_action( "install_themes_pre_{$tab}" );
 }
 
 $help_overview =
        '<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/') . '</p>' .

-       '<p>' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.') . '</p>' .
+       '<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
+       '<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .

        '<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
 
 get_current_screen()->add_help_tab( array(
        '<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
 
 get_current_screen()->add_help_tab( array(


@@ -100,7 +96,7 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</a>') . '</p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</a>') . '</p>' .

        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 


@@ -108,29 +104,32 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
 
 ?>
 <div class="wrap">

-       <h2><?php
+       <h1><?php

        echo esc_html( $title );
 
        /**
         * Filter the tabs shown on the Add Themes screen.
         *
        echo esc_html( $title );
 
        /**
         * Filter the tabs shown on the Add Themes screen.
         *

-        * This filter is for backwards compatibility only,
-        * for the suppression of the upload tab.
+        * This filter is for backwards compatibility only, for the suppression
+        * of the upload tab.

         *
         * @since 2.8.0
         *
         * @since 2.8.0

+        *

         * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
         */
        $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
        if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
         * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
         */
        $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
        if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {

-               echo ' <a href="#" class="upload add-new-h2">' . __( 'Upload Theme' ) . '</a>';
-               echo ' <a href="#" class="browse-themes add-new-h2">' . _x( 'Browse', 'themes' ) . '</a>';
+               echo ' <a href="#" class="upload page-title-action">' . __( 'Upload Theme' ) . '</a>';
+               echo ' <a href="#" class="browse-themes page-title-action">' . _x( 'Browse', 'themes' ) . '</a>';

        }
        }

-       ?></h2>
+       ?></h1>

 
        <div class="upload-theme">
        <?php install_themes_upload(); ?>
        </div>
 
 
        <div class="upload-theme">
        <?php install_themes_upload(); ?>
        </div>
 

+       <h2 class="screen-reader-text"><?php _e( 'Filter themes list' ); ?></h2>
+

        <div class="wp-filter">
                <div class="filter-count">
                        <span class="count theme-count"></span>
        <div class="wp-filter">
                <div class="filter-count">
                        <span class="count theme-count"></span>


@@ -140,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="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>
 
                </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>
                <div class="filter-drawer">
                        <div class="buttons">
                                <a class="apply-filters button button-secondary" href="#"><?php _e( 'Apply Filters' ); ?><span></span></a>


@@ -154,21 +168,17 @@ include(ABSPATH . 'wp-admin/admin-header.php');
                <?php
                $feature_list = get_theme_feature_list();
                foreach ( $feature_list as $feature_name => $features ) {
                <?php
                $feature_list = get_theme_feature_list();
                foreach ( $feature_list as $feature_name => $features ) {

-                       if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) { // hack hack hack
-                               echo '<div class="filter-group wide">';
-                       } else {
-                               echo '<div class="filter-group">';
-                       }
+                       echo '<fieldset class="filter-group">';

                        $feature_name = esc_html( $feature_name );
                        $feature_name = esc_html( $feature_name );

-                       echo '<h4>' . $feature_name . '</h4>';
-                       echo '<ol class="feature-group">';
+                       echo '<legend>' . $feature_name . '</legend>';
+                       echo '<div class="filter-group-feature">';

                        foreach ( $features as $feature => $feature_name ) {
                                $feature = esc_attr( $feature );
                        foreach ( $features as $feature => $feature_name ) {
                                $feature = esc_attr( $feature );

-                               echo '<li><input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-                               echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label></li>';
+                               echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
+                               echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';

                        }
                        }

-                       echo '</ol>';

                        echo '</div>';
                        echo '</div>';

+                       echo '</fieldset>';

                }
                ?>
                        <div class="filtered-by">
                }
                ?>
                        <div class="filtered-by">


@@ -178,6 +188,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
                        </div>
                </div>
        </div>
                        </div>
                </div>
        </div>

+       <h2 class="screen-reader-text"><?php _e( 'Themes list' ); ?></h2>

        <div class="theme-browser content-filterable"></div>
        <div class="theme-install-overlay wp-full-overlay expanded"></div>
 
        <div class="theme-browser content-filterable"></div>
        <div class="theme-install-overlay wp-full-overlay expanded"></div>
 


@@ -186,18 +197,18 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 
        <br class="clear" />
 <?php
 
        <br class="clear" />
 <?php

-/**
- * Fires at the top of each of the tabs on the Install Themes page.
- *
- * The dynamic portion of the hook name, $tab, refers to the current
- * theme install tab. Possible values are 'dashboard', 'search', 'upload',
- * 'featured', 'new', or 'updated'.
- *
- * @since 2.8.0
- *
- * @param int $paged Number of the current page of results being viewed.
- */

 if ( $tab ) {
 if ( $tab ) {

+       /**
+        * Fires at the top of each of the tabs on the Install Themes page.
+        *
+        * The dynamic portion of the hook name, `$tab`, refers to the current
+        * theme install tab. Possible values are 'dashboard', 'search', 'upload',
+        * 'featured', 'new', or 'updated'.
+        *
+        * @since 2.8.0
+        *
+        * @param int $paged Number of the current page of results being viewed.
+        */

        do_action( "install_themes_{$tab}", $paged );
 }
 ?>
        do_action( "install_themes_{$tab}", $paged );
 }
 ?>


@@ -245,32 +256,28 @@ if ( $tab ) {
                                <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
 
                                <div class="theme-details">
                                <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
 
                                <div class="theme-details">

-                                       <div class="rating rating-{{ Math.round( data.rating / 10 ) * 10 }}">
-                                               <span class="one"></span>
-                                               <span class="two"></span>
-                                               <span class="three"></span>
-                                               <span class="four"></span>
-                                               <span class="five"></span>
-                                       <# if ( data.num_ratings ) { #>
-                                               <p class="ratings">{{ data.num_ratings }}</p>
+                                       <# if ( data.rating ) { #>
+                                               <div class="theme-rating">
+                                                       {{{ data.stars }}}
+                                                       <span class="num-ratings">({{ data.num_ratings }})</span>
+                                               </div>

                                        <# } else { #>
                                        <# } else { #>

-                                               <p class="ratings"><?php _e( 'No ratings.' ); ?></p>
+                                               <span class="no-rating"><?php _e( 'This theme has not been rated yet.' ); ?></span>

                                        <# } #>
                                        <# } #>

-                                       </div>

                                        <div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div>
                                        <div class="theme-description">{{{ data.description }}}</div>
                                </div>
                        </div>
                </div>
                <div class="wp-full-overlay-footer">
                                        <div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div>
                                        <div class="theme-description">{{{ data.description }}}</div>
                                </div>
                        </div>
                </div>
                <div class="wp-full-overlay-footer">

-                       <a href="#" class="collapse-sidebar" title="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
-                               <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                       <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">

                                <span class="collapse-sidebar-arrow"></span>
                                <span class="collapse-sidebar-arrow"></span>

-                       </a>
+                               <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                       </button>

                </div>
        </div>
        <div class="wp-full-overlay-main">
                </div>
        </div>
        <div class="wp-full-overlay-main">

-               <iframe src="{{ data.preview_url }}" />
+               <iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>" />

        </div>
 </script>
 
        </div>
 </script>