Make WordPress Core

Ticket #9813: 9813C.patch

File 9813C.patch, 5.5 KB (added by Simek, 16 years ago)
  • user-edit.php

     
    248248<table class="form-table">
    249249        <tr>
    250250                <th><label for="user_login"><?php _e('Username'); ?></label></th>
    251                 <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <?php _e('Your username cannot be changed.'); ?></td>
     251                <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Your username cannot be changed.'); ?></span></td>
    252252        </tr>
    253253
    254254<?php if ( !$is_profile_page ): ?>
     
    284284
    285285<tr>
    286286        <th><label for="nickname"><?php _e('Nickname') ?></label></th>
    287         <td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
     287        <td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /> <span class="description"><?php _e('Required.');?></span></td>
    288288</tr>
    289289
    290290<tr>
    291         <th><label for="display_name"><?php _e('Display name publicly&nbsp;as') ?></label></th>
     291        <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>
    292292        <td>
    293293                <select name="display_name" id="display_name">
    294294                <?php
    295295                        $public_display = array();
    296296                        $public_display['display_nickname']  = $profileuser->nickname;
    297297                        $public_display['display_username']  = $profileuser->user_login;
    298                         $public_display['display_firstname'] = $profileuser->first_name;
    299                         $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
    300                         $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
     298                        if ( !$profileuser->first_name == '' )
     299                                $public_display['display_firstname'] = $profileuser->first_name;
     300                        if ( !$profileuser->last_name == '' )
     301                                $public_display['display_lastname'] = $profileuser->last_name;
     302                        if ( !$profileuser->first_name == '' && !$profileuser->last_name == '' ) {
     303                                $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
     304                                $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
     305                        }
    301306                        if ( !in_array( $profileuser->display_name, $public_display ) )// Only add this if it isn't duplicated elsewhere
    302307                                $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
    303308                        $public_display = array_map( 'trim', $public_display );
     
    317322<table class="form-table">
    318323<tr>
    319324        <th><label for="email"><?php _e('E-mail') ?></label></th>
    320         <td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" /> <?php _e('Required.');?></td>
     325        <td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" /> <span class="description"><?php _e('Required.');?></span></td>
    321326</tr>
    322327
    323328<tr>
     
    346351<table class="form-table">
    347352<tr>
    348353        <th><label for="description"><?php _e('Biographical Info'); ?></label></th>
    349         <td><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea><br /><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></td>
     354        <td>
     355                <textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea><br />
     356                <span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></span>
     357        </td>
    350358</tr>
    351359
    352360<?php
     
    355363?>
    356364<tr id="password">
    357365        <th><label for="pass1"><?php _e('New Password'); ?></label></th>
    358         <td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?><br />
    359                 <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <?php _e("Type your new password again."); ?><br />
     366        <td>
     367                <input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
     368                <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br />
    360369        <?php if ( $is_profile_page ): ?>
    361370                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
    362                 <p><?php _e('Hint: Your password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
     371                <p class="description indicator-hint"><?php _e('Hint: Your password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
    363372        <?php endif; ?>
    364373        </td>
    365374</tr>
  • wp-admin.css

     
    21362136        text-decoration: none;
    21372137}
    21382138
     2139.indicator-hint {
     2140        padding-top: 8px;
     2141}
     2142
    21392143.tablenav .delete {
    21402144        margin-right: 20px;
    21412145}