WordPress 4.4.1-scripts

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

diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 92fd53ccb1389af85175612b6ff5fb3690f41db6..289f3954c3c2e56efefde8320a0d880e262adfa0 100644 (file)
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -128,6 +128,8 @@ include(ABSPATH . 'wp-admin/admin-header.php');
        <?php install_themes_upload(); ?>
        </div>
 
        <?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>


@@ -137,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>


@@ -151,17 +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 ) {

-                       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">


@@ -171,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>
 


@@ -239,14 +257,12 @@ if ( $tab ) {
 
                                <div class="theme-details">
                                        <# if ( data.rating ) { #>
 
                                <div class="theme-details">
                                        <# if ( data.rating ) { #>

-                                               <div class="star-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>
-                                                       <small class="ratings">{{ data.num_ratings }}</small>
+                                               <div class="theme-rating">
+                                                       {{{ data.stars }}}
+                                                       <span class="num-ratings">({{ data.num_ratings }})</span>

                                                </div>
                                        <# } else { #>
                                                </div>
                                        <# } else { #>

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

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