WordPress.org

Make WordPress Core

Ticket #31608: 31608.diff

File 31608.diff, 5.7 KB (added by ericlewis, 7 years ago)

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

     
    858858        display: none;
    859859}
    860860
    861 .request-filesystem-credentials-dialog .notification-dialog{
    862         top: 15%
     861.request-filesystem-credentials-dialog .notification-dialog {
     862        top: 15%;
    863863}
    864864
    865 .request-filesystem-credentials-dialog-content{
     865.request-filesystem-credentials-dialog-content {
    866866        margin: 25px;
    867867}
    868 .request-filesystem-credentials-dialog-content input[type="text"],
    869 .request-filesystem-credentials-dialog-content input[type="password"]{
    870         width:85%;
     868
     869.request-filesystem-credentials-form input[type="text"],
     870.request-filesystem-credentials-form input[type="password"] {
     871        display: block;
    871872}
    872873
     874.request-filesystem-credentials-dialog input[type="text"],
     875.request-filesystem-credentials-dialog input[type="password"] {
     876        width: 100%;
     877}
     878
     879.request-filesystem-credentials-form .field-title {
     880        font-weight: 600;
     881}
     882
     883.request-filesystem-credentials-dialog .ftp-username,
     884.request-filesystem-credentials-dialog .ftp-password {
     885        float: left;
     886        vertical-align: top;
     887        width: 48%;
     888}
     889
     890.request-filesystem-credentials-dialog .ftp-password {
     891        margin-left: 4%;
     892}
     893
    873894/* =Media Queries
    874895-------------------------------------------------------------- */
    875896

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

     
    11121112-->
    11131113</script>
    11141114<form action="<?php echo esc_url( $form_post ) ?>" method="post">
    1115 <div>
     1115<div class="request-filesystem-credentials-form">
    11161116<h3><?php _e('Connection Information') ?></h3>
    11171117<p><?php
    11181118        $label_user = __('Username');
    … …  
    11331133        }
    11341134        _e('If you do not remember your credentials, you should contact your web host.');
    11351135?></p>
    1136 <table class="form-table">
    1137 <tr>
    1138 <th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
    1139 <td><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> size="40" /></td>
    1140 </tr>
    1141 
    1142 <tr>
    1143 <th scope="row"><label for="username"><?php echo $label_user; ?></label></th>
    1144 <td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></td>
    1145 </tr>
    1146 
    1147 <tr>
    1148 <th scope="row"><label for="password"><?php echo $label_pass; ?></label></th>
    1149 <td><div><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></div>
    1150 <div><em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em></div></td>
    1151 </tr>
    1152 
     1136<label>
     1137        <span class="field-title"><?php _e( 'Hostname' ) ?></span>
     1138        <input name="hostname" type="text" id="hostname" class="code" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
     1139</label>
     1140<div class="ftp-username">
     1141        <label>
     1142                <span class="field-title"><?php echo $label_user; ?></span>
     1143                <input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> />
     1144        </label>
     1145</div>
     1146<div class="ftp-password">
     1147        <label>
     1148                <span class="field-title"><?php echo $label_pass; ?></span>
     1149                <input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
     1150                <em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
     1151        </label>
     1152</div>
    11531153<?php if ( isset($types['ssh']) ) : ?>
    1154 <tr id="ssh_keys" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">
    1155 <th scope="row"><?php _e('Authentication Keys') ?>
    1156 <div class="key-labels textright">
    1157 <label for="public_key"><?php _e('Public Key:') ?></label ><br />
    1158 <label for="private_key"><?php _e('Private Key:') ?></label>
    1159 </div></th>
    1160 <td><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> size="40" />
    1161         <br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> size="40" />
    1162 <div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td>
    1163 </tr>
     1154<h4><?php _e('Authentication Keys') ?></h4>
     1155<label>
     1156        <span class="field-title"><?php _e('Public Key:') ?></span>
     1157        <input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> />
     1158</label>
     1159<label>
     1160        <span class="field-title"><?php _e('Private Key:') ?></span>
     1161        <input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
     1162</label>
     1163<span><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></span>
    11641164<?php endif; ?>
    1165 
    1166 <tr>
    1167 <th scope="row"><?php _e('Connection Type') ?></th>
    1168 <td>
     1165<h4><?php _e('Connection Type') ?></h4>
    11691166<fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
    11701167<?php
    11711168        $disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );
    … …  
    11761173        </label>
    11771174        <?php endforeach; ?>
    11781175</fieldset>
    1179 </td>
    1180 </tr>
    1181 </table>
    1182 
    11831176<?php
    11841177foreach ( (array) $extra_fields as $field ) {
    11851178        if ( isset( $_POST[ $field ] ) )