Changeset 37467

Timestamp:

05/19/2016 10:58:55 PM (10 years ago)

Author:

afercia

Message:

Refine the FTP credentials form interaction.

Properly toggle SSH2 Authentication Keys fieldset visibility.
JavaScript and CSS clean-up.

Props Mte90.
Fixes #34376.

Location:

trunk/src/wp-admin

Files:

• css/forms.css (modified) (2 diffs)
• includes/file.php (modified) (3 diffs)
• js/updates.js (modified) (2 diffs)

trunk/src/wp-admin/css/forms.css

@@ -971 +971 @@
 
 .request-filesystem-credentials-dialog .notification-dialog {
-        top: 15%;
+        top: 10%;
         max-height: 85%;
 }
@@ -1027 +1027 @@
 .request-filesystem-credentials-dialog label[for="ftp"] {
         margin-right: 10px;
+}
+
+.request-filesystem-credentials-dialog #auth-keys-desc {
+        margin-bottom: 0;
 }
 

trunk/src/wp-admin/includes/file.php

@@ -1167 +1167 @@
 
 ?>
-<script type="text/javascript">
-<!--
-jQuery(function($){
-        jQuery("#ssh").click(function () {
-                jQuery("#ssh_keys").show();
-        });
-        jQuery("#ftp, #ftps").click(function () {
-                jQuery("#ssh_keys").hide();
-        });
-        jQuery('#request-filesystem-credentials-form input[value=""]:first').focus();
-});
--->
-</script>
 <form action="<?php echo esc_url( $form_post ) ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
@@ -1226 +1213 @@
         </label>
 </div>
-<?php if ( isset($types['ssh']) ) : ?>
 <fieldset>
+<legend><?php _e( 'Connection Type' ); ?></legend>
+<?php
+        $disabled = disabled( ( defined( 'FTP_SSL' ) && FTP_SSL ) || ( defined( 'FTP_SSH' ) && FTP_SSH ), true, false );
+        foreach ( $types as $name => $text ) : ?>
+        <label for="<?php echo esc_attr( $name ) ?>">
+                <input type="radio" name="connection_type" id="<?php echo esc_attr( $name ) ?>" value="<?php echo esc_attr( $name ) ?>"<?php checked( $name, $connection_type ); echo $disabled; ?> />
+                <?php echo $text; ?>
+        </label>
+<?php
+        endforeach;
+?>
+</fieldset>
+<?php
+if ( isset( $types['ssh'] ) ) {
+        $hidden_class = '';
+        if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
+                $hidden_class = ' class="hidden"';
+        }
+?>
+<fieldset id="ssh-keys"<?php echo $hidden_class; ?>">
 <legend><?php _e( 'Authentication Keys' ); ?></legend>
 <label for="public_key">
@@ -1237 +1243 @@
         <input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
 </label>
-</fieldset>
-<span id="auth-keys-desc"><?php _e('Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.') ?></span>
-<?php endif; ?>
-<fieldset>
-<legend><?php _e( 'Connection Type' ); ?></legend>
-<?php
-        $disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );
-        foreach ( $types as $name => $text ) : ?>
-        <label for="<?php echo esc_attr($name) ?>">
-                <input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> />
-                <?php echo $text ?>
-        </label>
-        <?php endforeach; ?>
+<p id="auth-keys-desc"><?php _e( 'Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.' ) ?></p>
 </fieldset>
 <?php
+}
+
 foreach ( (array) $extra_fields as $field ) {
         if ( isset( $_POST[ $field ] ) )

trunk/src/wp-admin/js/updates.js

@@ -472 +472 @@
 
         $( document ).ready( function() {
+                // Set initial focus on the first empty form field.
+                $( '#request-filesystem-credentials-form input[value=""]:first' ).focus();
+
                 /*
                  * Check whether a user needs to submit filesystem credentials based on whether
@@ -504 +507 @@
                 });
 
-                // Hide SSH fields when not selected
-                $( '#request-filesystem-credentials-dialog input[name="connection_type"]' ).on( 'change', function() {
-                        $( this ).parents( 'form' ).find( '#private_key, #public_key' ).parents( 'label' ).toggle( ( 'ssh' == $( this ).val() ) );
-                }).change();
+                // Hide SSH fields when not selected.
+                $( '#request-filesystem-credentials-form input[name="connection_type"]' ).on( 'change', function() {
+                        $( '#ssh-keys' ).toggleClass( 'hidden', ( 'ssh' !== $( this ).val() ) );
+                });
 
                 // Click handler for plugin updates in List Table view.