Ticket #35429: 35429.6.diff

src/wp-admin/css/themes.css

@@ -1056 +1056 @@
 .theme-install-php a.browse-themes {
         cursor: pointer;
 }
-.theme-install-php a.browse-themes,
-.theme-install-php.show-upload-theme a.upload {
+
+.upload-view-toggle .browse,
+.upload-view-toggle.upload-tab .upload,
+.show-upload-view .upload {
         display: none;
 }
-.theme-install-php.show-upload-theme a.browse-themes {
+
+.upload-view-toggle.upload-tab .browse,
+.show-upload-view .upload-view-toggle .browse {
         display: inline;
 }
+
 .upload-theme,
 .upload-plugin {
         -webkit-box-sizing: border-box;
@@ -1076 +1081 @@
         position: relative;
         top: 10px;
 }
-body.show-upload-theme .upload-theme,
-.upload-plugin {
+
+.show-upload-view .upload-theme,
+.show-upload-view .upload-plugin,
+.upload-tab .upload-plugin {
         display: block;
 }
+
 .upload-theme .wp-upload-form,
 .upload-plugin .wp-upload-form {
         background: #fafafa;

src/wp-admin/includes/admin-filters.php

@@ -64 +64 @@
 
 // Plugin Install hooks.
 add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
+// add_action( 'install_plugins_upload',                 'install_plugins_upload' );
 add_action( 'install_plugins_search',                 'display_plugins_table' );
 add_action( 'install_plugins_popular',                'display_plugins_table' );
 add_action( 'install_plugins_recommended',            'display_plugins_table' );

src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -579 +579 @@
                         $install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>';
                 } elseif ( $this->type == 'web' ) {
                         $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>';
+                } elseif ( 'upload' == $this->type && 'plugins' == $from ) {
+                        $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '">' . __( 'Return to Plugin Installer' ) . '</a>';
                 } else {
                         $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
                 }

src/wp-admin/includes/plugin-install.php

@@ -210 +210 @@
  */
 function install_dashboard() {
         ?>
-        <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
+        <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ), 'https://wordpress.org/plugins/' ); ?></p>
 
         <?php display_plugins_table(); ?>
 

src/wp-admin/js/plugin-install.js

@@ -1 +1 @@
 /* global plugininstallL10n, tb_click */
 
-/* Plugin Browser Thickbox related JS*/
+/**
+ * Functionality for the plugin install screens.
+ */
 var tb_position;
 jQuery( document ).ready( function( $ ) {
         tb_position = function() {
@@ -70 +72 @@
                 $( '#section-holder div.section' ).hide(); // Hide 'em all.
                 $( '#section-' + tab ).show();
         });
+
+        /*
+         * When a user presses the "Upload plugin" button, show the upload form in place
+         * rather than sending them to the devoted upload plugin page.
+         */
+        var uploadViewToggle = $( '.upload-view-toggle' ),
+                $body = $( document.body );
+        uploadViewToggle
+                .attr({
+                        'role': 'button',
+                        'aria-expanded': 'false'
+                });
+        uploadViewToggle.on( 'click', function( event ) {
+                event.preventDefault();
+                $body.toggleClass( 'show-upload-view' );
+                uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
+        });
 });

src/wp-admin/js/theme.js

@@ -1573 +1573 @@
         // in new location
         searchContainer: $( '.wp-filter .search-form' ),
 
+        /*
+         * When a user presses the "Upload theme" button, show the upload form in place
+         * rather than sending them to the devoted upload theme page.
+         */
         uploader: function() {
-                $( 'a.upload' ).on( 'click', function( event ) {
+                var uploadViewToggle = $( '.upload-view-toggle' ),
+                        $body = $( document.body );
+                uploadViewToggle
+                        .attr({
+                                'role': 'button',
+                                'aria-expanded': 'false'
+                        });
+                uploadViewToggle.on( 'click', function( event ) {
                         event.preventDefault();
-                        $( 'body' ).addClass( 'show-upload-theme' );
-                        themes.router.navigate( themes.router.baseUrl( '?upload' ), { replace: true } );
+                        $body.toggleClass( 'show-upload-view' );
+                        uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
                 });
-                $( 'a.browse-themes' ).on( 'click', function( event ) {
-                        event.preventDefault();
-                        $( 'body' ).removeClass( 'show-upload-theme' );
-                        themes.router.navigate( themes.router.baseUrl( '' ), { replace: true } );
-                });
         },
 
         // Toggle the full filters navigation

src/wp-admin/plugin-install.php

@@ -106 +106 @@
         if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
                 if ( $tab === 'upload' ) {
                         $href = self_admin_url( 'plugin-install.php' );
-                        $text = _x( 'Browse', 'plugins' );
+                        $upload_tab_class = ' upload-tab';
                 } else {
                         $href = self_admin_url( 'plugin-install.php?tab=upload' );
-                        $text = __( 'Upload Plugin' );
+                        $upload_tab_class = '';
                 }
-                echo ' <a href="' . $href . '" class="upload page-title-action">' . $text . '</a>';
+
+                printf( ' <a href="%s" class="upload-view-toggle page-title-action%s"><span class="upload">%s</span><span class="browse">%s</span></a>',
+                        $href,
+                        $upload_tab_class,
+                        __( 'Upload Plugin' ),
+                        _x( 'Browse', 'plugins' )
+                );
         }
         ?>
 </h1>
 
+<div class="upload-plugin-wrap<?php echo $upload_tab_class; ?>">
 <?php
+/*
+ * Output the upload plugin form on every plugin install screen, so it can be
+ * displayed via JavaScript rather then opening up the devoted upload plugin page.
+ */
+install_plugins_upload(); ?>
+</div>
+
+<?php
 if ( $tab !== 'upload' ) {
         $wp_list_table->views();
         echo '<br class="clear" />';

src/wp-admin/plugins.php

@@ -372 +372 @@
 'content'       =>
         '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
         '<p>' . sprintf(
-                /* translators: 1: Plugin Browser/Installer URL, 2: WordPress Plugin Directory URL 3: local plugin directory */
-                __( 'You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your %3$s directory. Once a plugin has been installed, you can activate it here.' ),
-                'plugin-install.php',
-                'https://wordpress.org/plugins/',
-                '<code>/wp-content/plugins</code>'
+                /* translators: %s: WordPress Plugin Directory URL */
+                __( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s" target="_blank">WordPress.org Plugin Directory</a>. Plugins in the WordPress.org Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
+                'https://wordpress.org/plugins/'
         ) . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(

src/wp-admin/theme-install.php

@@ -119 +119 @@
          */
         $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
         if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
-                echo ' <a href="#" class="upload page-title-action">' . __( 'Upload Theme' ) . '</a>';
-                echo ' <a href="#" class="browse-themes page-title-action">' . _x( 'Browse', 'themes' ) . '</a>';
+                echo ' <a href="#" class="upload-view-toggle page-title-action">' . '<span class="upload">' . __( 'Upload Theme' ) . '</span><span class="browse">' . __( 'Browse' ) . '</span></a>';
         }
         ?></h1>