WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
10/05/2011 11:42:11 PM (14 years ago)
Author:
nacin
Message:

Revert [18817]. Adding the new HTML to setup-config would make translation files stale, and I'd rather i18n that file first (see #18180). fixes #18865, see #16413.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/install.php

    r18817 r18897  
    9393<?php } ?>
    9494<form id="setup" method="post" action="install.php?step=2">
    95     <div class="form-fields">
    96         <div class="field-row">
    97             <div class="field-label"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></div>
    98             <div class="field-input"><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></div>
    99         </div>
    100         <div class="field-row">
    101             <div class="field-label"><label for="user_name"><?php _e('Username'); ?></label></div>
    102             <div class="field-input">
     95    <table class="form-table">
     96        <tr>
     97            <th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
     98            <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
     99        </tr>
     100        <tr>
     101            <th scope="row"><label for="user_name"><?php _e('Username'); ?></label></th>
     102            <td>
    103103            <?php
    104104            if ( $user_table ) {
    … …  
    109109            <?php
    110110            } ?>
    111             </div>
    112         </div>
     111            </td>
     112        </tr>
    113113        <?php if ( ! $user_table ) : ?>
    114         <div class="field-row">
    115             <div class="field-label">
     114        <tr>
     115            <th scope="row">
    116116                <label for="admin_password"><?php _e('Password, twice'); ?></label>
    117117                <p><?php _e('A password will be automatically generated for you if you leave this blank.'); ?></p>
    118             </div>
    119             <div class="field-input">
     118            </th>
     119            <td>
    120120                <input name="admin_password" type="password" id="pass1" size="25" value="" />
    121121                <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
    122122                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
    123123                <p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
    124             </div>
    125         </div>
     124            </td>
     125        </tr>
    126126        <?php endif; ?>
    127         <div class="field-row">
    128             <div class="field-label"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></div>
    129             <div class="field-input"><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
    130             <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></div>
    131         </div>
    132         <div class="field-row">
    133             <div class="field-input field-full"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></div>
    134         </div>
    135     </div>
     127        <tr>
     128            <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
     129            <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
     130            <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
     131        </tr>
     132        <tr>
     133            <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td>
     134        </tr>
     135    </table>
    136136    <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
    137137</form>
    … …  
    221221<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>
    222222
    223 <div class="form-fields">
    224     <div class="field-row">
    225         <div class="field-label"><?php _e( 'Username' ); ?></div>
    226         <div class="field-input"><code><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></code></div>
    227     </div>
    228     <div class="field-row">
    229         <div class="field-label"><?php _e( 'Password' ); ?></div>
    230         <div class="field-input"><?php
     223<table class="form-table">
     224    <tr>
     225        <th><?php _e( 'Username' ); ?></th>
     226        <td><code><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></code></td>
     227    </tr>
     228    <tr>
     229        <th><?php _e( 'Password' ); ?></th>
     230        <td><?php
    231231        if ( ! empty( $password ) && empty($admin_password_check) )
    232232            echo '<code>'. esc_html($password) .'</code><br />';
    233233        echo "<p>$password_message</p>"; ?>
    234         </div>
    235     </div>
    236 </div>
     234        </td>
     235    </tr>
     236</table>
    237237
    238238<p class="step"><a href="../wp-login.php" class="button"><?php _e( 'Log In' ); ?></a></p>
Note: See TracChangeset for help on using the changeset viewer.