Ticket #20855: 20855.8.diff

wp-admin/includes/plugin-install.php

@@ -142 +142 @@
  */
 function install_plugins_upload( $page = 1 ) {
 ?>
-        <h4><?php _e('Install a plugin in .zip format') ?></h4>
-        <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.') ?></p>
-        <form method="post" enctype="multipart/form-data" action="<?php echo self_admin_url('update.php?action=upload-plugin') ?>">
-                <?php wp_nonce_field( 'plugin-upload') ?>
+        <h4><?php _e('Install a plugin in .zip format'); ?></h4>
+        <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
+        <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
+                <?php wp_nonce_field( 'plugin-upload'); ?>
                 <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
                 <input type="file" id="pluginzip" name="pluginzip" />
-                <input type="submit" class="button" value="<?php esc_attr_e('Install Now') ?>" />
+                <?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
         </form>
 <?php
 }

wp-admin/includes/theme-install.php

@@ -134 +134 @@
 
 function install_themes_upload($page = 1) {
 ?>
-<h4><?php _e('Install a theme in .zip format') ?></h4>
-<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.') ?></p>
-<form method="post" enctype="multipart/form-data" action="<?php echo self_admin_url('update.php?action=upload-theme') ?>">
-        <?php wp_nonce_field( 'theme-upload') ?>
+<h4><?php _e('Install a theme in .zip format'); ?></h4>
+<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.'); ?></p>
+<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-theme'); ?>">
+        <?php wp_nonce_field( 'theme-upload'); ?>
         <input type="file" name="themezip" />
         <?php submit_button( __( 'Install Now' ), 'button', 'install-theme-submit', false ); ?>
 </form>

wp-admin/includes/template.php

@@ -787 +787 @@
                 <p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
         else :
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
 <p>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
 <input type="file" id="upload" name="import" size="25" />

wp-admin/js/common.js

@@ -161 +161 @@
 
 $(document).ready( function() {
         var lastClicked = false, checks, first, last, checked, menu = $('#adminmenu'),
-                pageInput = $('input.current-page'), currentPage = pageInput.val();
+                pageInput = $('input.current-page'), currentPage = pageInput.val(),
+                uploadButton = $('.wp-upload-form input[type="submit"]'),
+                fileInput = uploadButton.closest('form').find('input[type="file"]');
 
         // when the menu is folded, make the fly-out submenu header clickable
         menu.on('click.wp-submenu-head', '.wp-submenu-head', function(e){
@@ -369 +371 @@
         $(document).on('click.wp-accessibility-blur', 'a', function() {
                 $(this).blur();
         });
+
+        // Disable submit button if no file was selected.
+        toggleUploadButton = function() {
+                uploadButton.prop( 'disabled', '' === fileInput.val() );
+        };
+        toggleUploadButton();
+        fileInput.on( 'change', toggleUploadButton );
 });
 
 // internal use

wp-admin/custom-header.php

@@ -525 +525 @@
                         printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
         }
         ?></p>
-        <form enctype="multipart/form-data" id="upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
+        <form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
         <p>
                 <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
                 <input type="file" id="upload" name="import" />

wp-admin/custom-background.php

@@ -254 +254 @@
 <?php endif; ?>
 <tr valign="top">
 <th scope="row"><?php _e('Select Image'); ?></th>
-<td><form enctype="multipart/form-data" id="upload-form" method="post" action="">
+<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="">
         <p>
                 <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
                 <input type="file" id="upload" name="import" />