Ticket #9813: 9813C.patch
File 9813C.patch, 5.5 KB (added by , 16 years ago) |
---|
-
user-edit.php
248 248 <table class="form-table"> 249 249 <tr> 250 250 <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> 252 252 </tr> 253 253 254 254 <?php if ( !$is_profile_page ): ?> … … 284 284 285 285 <tr> 286 286 <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> 288 288 </tr> 289 289 290 290 <tr> 291 <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>291 <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th> 292 292 <td> 293 293 <select name="display_name" id="display_name"> 294 294 <?php 295 295 $public_display = array(); 296 296 $public_display['display_nickname'] = $profileuser->nickname; 297 297 $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 } 301 306 if ( !in_array( $profileuser->display_name, $public_display ) )// Only add this if it isn't duplicated elsewhere 302 307 $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display; 303 308 $public_display = array_map( 'trim', $public_display ); … … 317 322 <table class="form-table"> 318 323 <tr> 319 324 <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> 321 326 </tr> 322 327 323 328 <tr> … … 346 351 <table class="form-table"> 347 352 <tr> 348 353 <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> 350 358 </tr> 351 359 352 360 <?php … … 355 363 ?> 356 364 <tr id="password"> 357 365 <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 /> 360 369 <?php if ( $is_profile_page ): ?> 361 370 <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 ! " ? $ % ^ & ).'); ?></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 ! " ? $ % ^ & ).'); ?></p> 363 372 <?php endif; ?> 364 373 </td> 365 374 </tr> -
wp-admin.css
2136 2136 text-decoration: none; 2137 2137 } 2138 2138 2139 .indicator-hint { 2140 padding-top: 8px; 2141 } 2142 2139 2143 .tablenav .delete { 2140 2144 margin-right: 20px; 2141 2145 }