WordPress.org

Make WordPress Core

Changeset 11330


Ignore:
Timestamp:
05/14/09 17:01:04 (6 years ago)
Author:
azaozz
Message:

Don't display empty values in the user display name drop-down, props Simek, fix js to add newly entered First Name and Last Name, fixes #9813

Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/js/common.dev.js

    r11162 r11330  
    248248    } else { 
    249249        try { 
    250             gf = new ActiveXObject('Gears.Factory'); 
    251             if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 ) 
    252                 gf.privateSetGlobalObject(this); 
    253         } catch (e) { 
    254             if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) { 
     250            if ( window.ActiveXObject ) { 
     251                gf = new ActiveXObject('Gears.Factory'); 
     252                if ( gf && gf.getBuildInfo().indexOf('ie_mobile') != -1 ) 
     253                    gf.privateSetGlobalObject(this); 
     254            } else if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) { 
    255255                gf = document.createElement("object"); 
    256256                gf.style.display = "none"; 
     
    260260                document.documentElement.appendChild(gf); 
    261261            } 
    262         } 
     262        } catch(e){} 
    263263    } 
    264264    if ( gf && gf.hasPermission ) 
  • trunk/wp-admin/js/common.js

    r11165 r11330  
    1 var showNotice,adminMenu,columns;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});a("#adminmenu li.menu-top .wp-menu-image").click(function(){window.location=a(this).siblings("a.menu-top")[0].href});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}else{this.restoreMenuState()}},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(i){var c=a(this).find(".wp-submenu"),f=i.clientY,d=a(window).height(),g=c.height(),j;if((f+g+10)>d){j=(f+g+10)-d;c.css({marginTop:"-"+j+"px"})}else{if(c.css("marginTop")){c.css({marginTop:""})}}c.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()})})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").addClass("invisible")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").removeClass("invisible");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").addClass("invisible")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").removeClass("invisible");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});(function(){if("undefined"!=typeof google&&google.gears){return}var a=false;if("undefined"!=typeof GearsFactory){a=new GearsFactory()}else{try{a=new ActiveXObject("Gears.Factory");if(factory.getBuildInfo().indexOf("ie_mobile")!=-1){a.privateSetGlobalObject(this)}}catch(b){if(("undefined"!=typeof navigator.mimeTypes)&&navigator.mimeTypes["application/x-googlegears"]){a=document.createElement("object");a.style.display="none";a.width=0;a.height=0;a.type="application/x-googlegears";document.documentElement.appendChild(a)}}}if(a&&a.hasPermission){return}jQuery(".turbo-nag").show()})(); 
     1var showNotice,adminMenu,columns;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});a("#adminmenu li.menu-top .wp-menu-image").click(function(){window.location=a(this).siblings("a.menu-top")[0].href});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}else{this.restoreMenuState()}},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(i){var c=a(this).find(".wp-submenu"),f=i.clientY,d=a(window).height(),g=c.height(),j;if((f+g+10)>d){j=(f+g+10)-d;c.css({marginTop:"-"+j+"px"})}else{if(c.css("marginTop")){c.css({marginTop:""})}}c.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()})})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").addClass("invisible")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").removeClass("invisible");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").addClass("invisible")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").removeClass("invisible");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});(function(){if("undefined"!=typeof google&&google.gears){return}var a=false;if("undefined"!=typeof GearsFactory){a=new GearsFactory()}else{try{if(window.ActiveXObject){a=new ActiveXObject("Gears.Factory");if(a&&a.getBuildInfo().indexOf("ie_mobile")!=-1){a.privateSetGlobalObject(this)}}else{if(("undefined"!=typeof navigator.mimeTypes)&&navigator.mimeTypes["application/x-googlegears"]){a=document.createElement("object");a.style.display="none";a.width=0;a.height=0;a.type="application/x-googlegears";document.documentElement.appendChild(a)}}}catch(b){}}if(a&&a.hasPermission){return}jQuery(".turbo-nag").show()})(); 
  • trunk/wp-admin/user-edit.php

    r11312 r11330  
    1515    $is_profile_page = false; 
    1616 
    17 /** 
    18  * Display JavaScript for profile page. 
    19  * 
    20  * @since 2.5.0 
    21  */ 
    22 function profile_js ( ) { 
    23 ?> 
    24 <script type="text/javascript"> 
    25 (function($){ 
    26  
    27     function check_pass_strength () { 
    28  
    29         var pass = $('#pass1').val(); 
    30         var user = $('#user_login').val(); 
    31  
    32         $('#pass-strength-result').removeClass('short bad good strong'); 
    33         if ( ! pass ) { 
    34             $('#pass-strength-result').html( pwsL10n.empty ); 
    35             return; 
    36         } 
    37  
    38         var strength = passwordStrength(pass, user); 
    39  
    40         if ( 2 == strength ) 
    41             $('#pass-strength-result').addClass('bad').html( pwsL10n.bad ); 
    42         else if ( 3 == strength ) 
    43             $('#pass-strength-result').addClass('good').html( pwsL10n.good ); 
    44         else if ( 4 == strength ) 
    45             $('#pass-strength-result').addClass('strong').html( pwsL10n.strong ); 
    46         else 
    47             // this catches 'Too short' and the off chance anything else comes along 
    48             $('#pass-strength-result').addClass('short').html( pwsL10n.short ); 
    49  
    50     } 
    51  
    52     $(document).ready( function() { 
    53         $('#pass1').val('').keyup( check_pass_strength ); 
    54         $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')}); 
    55         $('#nickname').change(function(){ 
    56             $('#display_name').fadeOut('normal',function(){ 
    57                 $(this).fadeIn(); 
    58                 $('#display_nickname').html($('#nickname').val()).val($('#nickname').val()); 
    59             }); 
    60         }); 
    61         $('#first_name').change(function(){ 
    62             $('#display_name').fadeOut('normal',function(){ 
    63                 $('#display_firstname').html($('#first_name').val()).val($('#first_name').val()); 
    64                 $('#display_firstlast').html($('#first_name').val()+' '+$('#last_name').val()).val($('#first_name').val()+' '+$('#last_name').val()); 
    65                 $('#display_lastfirst').html($('#last_name').val()+' '+$('#first_name').val()).val($('#last_name').val()+' '+$('#first_name').val()); 
    66                 $(this).fadeIn(); 
    67             }); 
    68         }); 
    69         $('#last_name').change(function(){ 
    70             $('#display_name').fadeOut('normal',function(){ 
    71                 $('#display_firstlast').html($('#first_name').val()+' '+$('#last_name').val()).val($('#first_name').val()+' '+$('#last_name').val()); 
    72                 $('#display_lastfirst').html($('#last_name').val()+' '+$('#first_name').val()).val($('#last_name').val()+' '+$('#first_name').val()); 
    73                 $(this).fadeIn(); 
    74             }); 
    75         }); 
    76     }); 
    77 })(jQuery); 
    78 </script> 
    79 <?php 
    80 } 
    81  
    8217if ( $is_profile_page ) { 
    83     add_action('admin_head', 'profile_js'); 
    84     wp_enqueue_script('jquery'); 
     18    wp_enqueue_script('user-profile'); 
    8519    wp_enqueue_script('password-strength-meter'); 
    8620} 
     
    249183    <tr> 
    250184        <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> 
     185        <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> 
    252186    </tr> 
    253187 
     
    284218 
    285219<tr> 
    286     <th><label for="nickname"><?php _e('Nickname') ?></label></th> 
     220    <th><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th> 
    287221    <td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td> 
    288222</tr> 
    289223 
    290224<tr> 
    291     <th><label for="display_name"><?php _e('Display name publicly&nbsp;as') ?></label></th> 
     225    <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th> 
    292226    <td> 
    293227        <select name="display_name" id="display_name"> 
     
    296230            $public_display['display_nickname']  = $profileuser->nickname; 
    297231            $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; 
     232            if ( !empty($profileuser->first_name) ) 
     233                $public_display['display_firstname'] = $profileuser->first_name; 
     234            if ( !empty($profileuser->last_name) ) 
     235                $public_display['display_lastname'] = $profileuser->last_name; 
     236            if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) { 
     237                $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name; 
     238                $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name; 
     239            } 
    301240            if ( !in_array( $profileuser->display_name, $public_display ) )// Only add this if it isn't duplicated elsewhere 
    302241                $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display; 
     
    317256<table class="form-table"> 
    318257<tr> 
    319     <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> 
     258    <th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th> 
     259    <td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" /></td> 
    321260</tr> 
    322261 
     
    347286<tr> 
    348287    <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> 
     288    <td><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea><br /> 
     289    <span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></span></td> 
    350290</tr> 
    351291 
     
    356296<tr id="password"> 
    357297    <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 /> 
     298    <td><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 /> 
     299        <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br /> 
    360300    <?php if ( $is_profile_page ): ?> 
    361301        <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> 
    363     <?php endif; ?> 
    364     </td> 
     302        <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> 
     303    <?php endif; ?></td> 
    365304</tr> 
    366305<?php endif; ?> 
  • trunk/wp-admin/user-new.php

    r11319 r11330  
    9292<table class="form-table"> 
    9393    <tr class="form-field form-required"> 
    94         <th scope="row"><label for="user_login"><?php _e('Username (required)') ?></label><input name="action" type="hidden" id="action" value="adduser" /></th> 
    95         <td ><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td> 
     94        <th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label> 
     95        <input name="action" type="hidden" id="action" value="adduser" /></th> 
     96        <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td> 
    9697    </tr> 
    9798    <tr class="form-field"> 
     
    104105    </tr> 
    105106    <tr class="form-field form-required"> 
    106         <th scope="row"><label for="email"><?php _e('E-mail (required)') ?></label></th> 
     107        <th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th> 
    107108        <td><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td> 
    108109    </tr> 
     
    114115<?php if ( apply_filters('show_password_fields', true) ) : ?> 
    115116    <tr class="form-field form-required"> 
    116         <th scope="row"><label for="pass1"><?php _e('Password (twice)') ?> </label></th> 
     117        <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php _e('(twice, required)'); ?></span></label></th> 
    117118        <td><input name="pass1" type="password" id="pass1" autocomplete="off" /> 
    118119        <br /> 
  • trunk/wp-admin/wp-admin.css

    r11312 r11330  
    13721372.form-wrap p { 
    13731373    margin: 2px 0 5px; 
    1374     font-size: 11px; 
    13751374} 
    13761375 
     
    13781377.description, 
    13791378.form-wrap p { 
     1379    font-size: 12px; 
    13801380    font-style: italic; 
    13811381    font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; 
     
    21372137} 
    21382138 
     2139.indicator-hint { 
     2140    padding-top: 8px; 
     2141} 
     2142 
     2143#display_name { 
     2144    width: 15em; 
     2145} 
     2146 
    21392147.tablenav .delete { 
    21402148    margin-right: 20px; 
  • trunk/wp-includes/script-loader.php

    r11327 r11330  
    6161    $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' ); 
    6262 
    63     $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090428' ); 
     63    $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090514' ); 
    6464    $scripts->add_data( 'common', 'group', 1 ); 
    6565    $scripts->localize( 'common', 'commonL10n', array( 
     
    238238            'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};' 
    239239        ) ); 
     240 
     241        $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20090514' ); 
     242        $scripts->add_data( 'user-profile', 'group', 1 ); 
    240243 
    241244        $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20090209' ); 
Note: See TracChangeset for help on using the changeset viewer.