Ticket #25603: 25603.9.diff
| File 25603.9.diff, 10.7 KB (added by , 12 years ago) |
|---|
-
src/wp-includes/script-loader.php
327 327 'strong' => __('Strong'), 328 328 'mismatch' => __('Mismatch') 329 329 ) ); 330 $scripts->add( 'about', "/wp-admin/js/about$suffix.js", array( 'jquery', 'password-strength-meter'), false, 1); 330 331 331 332 $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 ); 332 333 -
src/wp-admin/js/password-strength-meter.js
14 14 if ( ! $.isArray( blacklist ) ) 15 15 blacklist = [ blacklist.toString() ]; 16 16 17 if (password1 != password2 && password2 .length > 0)17 if (password1 != password2 && password2 && password2.length > 0) 18 18 return 5; 19 19 20 20 var result = zxcvbn( password1, blacklist ); -
src/wp-admin/js/about.js
1 (function($){ 2 var password = 'Gosh, WordPress is grand.', 3 $input = $('#pass'), 4 shouldAnimate = true, 5 indicatorString = $('#pass-strength-result').text(); 6 7 function updateResult(){ 8 var strength = wp.passwordStrength.meter($input.val(), [], $input.val()); 9 10 $('#pass-strength-result').removeClass('short bad good strong'); 11 switch ( strength ) { 12 case 2: 13 $('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] ); 14 break; 15 case 3: 16 $('#pass-strength-result').addClass('good').html( pwsL10n['good'] ); 17 break; 18 case 4: 19 $('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] ); 20 break; 21 default: 22 $('#pass-strength-result').addClass('short').html( pwsL10n['short'] ); 23 } 24 } 25 26 function animate(){ 27 if (shouldAnimate === false) 28 return; 29 if ($input.val().length < password.length){ 30 $input.val( password.substr(0, $input.val().length + 1) ); 31 updateResult(); 32 } else { 33 $input.val(''); 34 $('#pass-strength-result').removeClass('short bad good strong'); 35 } 36 // Look like real typing by changing the speed new letters are added each time 37 setTimeout(animate, 220 + Math.floor(Math.random() * ( 800 - 220)) ); 38 } 39 // 40 function begin(){ 41 // we async load zxcvbn, so we need to make sure it's loaded before starting 42 if (typeof(zxcvbn) !== 'undefined') 43 animate(); 44 else 45 setTimeout(begin,800); 46 } 47 48 // Turn off the animation on focus 49 $input.on('focus', function(){ 50 shouldAnimate = false; 51 $('#pass-strength-result').removeClass('short bad good strong'); 52 $('#pass-strength-result').text(indicatorString); 53 $input.val('') 54 }); 55 56 // Act like a normal password strength meter 57 $input.on('keyup', function(){ 58 updateResult(); 59 }); 60 61 // Start the animation 62 begin(); 63 64 })(jQuery) -
src/wp-admin/css/wp-admin.css
5766 5766 display: none !important; 5767 5767 } 5768 5768 5769 .about-wrap p.about-notice { 5770 background-color: #ffffe0; 5771 border: 1px solid #e6db55; 5772 margin: 5px 0 15px; 5773 padding: 0.4em 0.8em; 5774 border-radius: 3px; 5775 -webkit-border-radius: 3px; 5776 } 5777 5778 .about-wrap .about-passwords { 5779 margin: 20px 0; 5780 padding: 1px 20px 10px; 5781 background-color: #f9f9f9; 5782 } 5783 5784 .about-wrap .about-password-meter input { 5785 font-size: 250%; 5786 width: 100%; 5787 display: block; 5788 width: 100%; 5789 padding: 5px; 5790 } 5791 5792 .about-wrap .about-password-meter #pass-strength-result { 5793 font-weight: normal !important; 5794 display:block !important; 5795 font-size: 150%; 5796 width: 100%; 5797 padding: 17px 0; 5798 margin-bottom: 15px; 5799 } 5800 5801 .about-wrap .feature-section img { 5802 border: 0; 5803 background: transparent; 5804 box-shadow: none; 5805 -webkit-box-shadow: none; 5806 max-width: 20%; 5807 } 5808 5809 .about-wrap .feature-section div p img { 5810 float: right; 5811 margin-left: 10px; 5812 } 5813 5769 5814 /* Typography */ 5770 5815 5771 5816 .about-wrap p { … … 5808 5853 padding-bottom: 20px; 5809 5854 } 5810 5855 5856 .about-wrap .feature-section 5857 5811 5858 .about-wrap .feature-section h4 { 5812 5859 margin-bottom: 0.6em; 5813 5860 } … … 5960 6007 float: left; 5961 6008 } 5962 6009 6010 .about-wrap .three-col.about-updates div:nth-of-type(1), 6011 .about-wrap .three-col.about-updates div:nth-of-type(3) { 6012 width: 37%; 6013 margin: 0; 6014 } 6015 6016 .about-wrap .three-col.about-updates div:nth-of-type(2) { 6017 width: 16%; 6018 margin: 0 5%; 6019 } 6020 6021 .about-wrap .three-col.about-updates img { 6022 margin: 0; 6023 } 6024 5963 6025 .about-wrap .three-col-images { 5964 6026 text-align: center; 5965 6027 } -
src/wp-admin/css/colors-classic.css
2000 2000 color: #464646; 2001 2001 } 2002 2002 2003 .about-wrap .feature-section img {2004 background: #fff;2005 border: 1px #ccc solid;2006 -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );2007 box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );2008 }2009 2010 2003 .about-wrap h4.wp-people-group { 2011 2004 text-shadow: 1px 1px 1px #fff; 2012 2005 } -
src/wp-admin/css/colors-fresh.css
1889 1889 color: #464646; 1890 1890 } 1891 1891 1892 .about-wrap .feature-section img {1893 background: #fff;1894 border: 1px #ccc solid;1895 -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );1896 box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );1897 }1898 1899 1892 .about-wrap h4.wp-people-group { 1900 1893 text-shadow: 1px 1px 1px #fff; 1901 1894 } -
src/wp-admin/about.php
13 13 14 14 list( $display_version ) = explode( '-', $wp_version ); 15 15 16 wp_enqueue_script('about'); 17 16 18 include( ABSPATH . 'wp-admin/admin-header.php' ); 17 19 ?> 18 20 <div class="wrap about-wrap"> … … 36 38 <div class="changelog"> 37 39 <h3><?php _e( 'Background Updates' ); ?></h3> 38 40 39 <div class="feature-section col t wo-col">41 <div class="feature-section col three-col about-updates"> 40 42 <div> 41 43 <h4><?php _e( 'Updates While You Sleep' ); ?></h4> 42 44 <p><?php _e( 'With WordPress 3.7, you don’t have to lift a finger to apply maintenance and security updates. Most sites are now able to automatically apply these updates in the background, though some configurations may not allow it.' ); ?></p> 43 <?php 45 </div> 46 <div><img alt="" src="images/about-updates-2x.png" /></div> 47 <div class="last-feature"> 48 <h4><?php _e( 'More Reliable Than Ever' ); ?></h4> 49 <p><?php _e( 'The update process has been made even more reliable and secure, with dozens of new checks and safeguards.' ); ?></p> 50 <p><?php _e( 'You’ll still need to click “Update Now” once WordPress 3.8 is released, but we’ve never had more confidence in that beautiful blue button.' ); ?></p> 51 </div> 52 <?php 44 53 $can_auto_update = wp_http_supports( 'ssl' ); 45 54 if ( $can_auto_update ) { 46 55 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; … … 57 66 <p><?php _e( '→ This site <strong>is</strong> able to apply these updates automatically. Cool!' ); ?></p> 58 67 <?php else : ?> 59 68 <p><?php printf( __( '→ This site <strong>is not</strong> able to apply these updates automatically. But we’ll email %s when there is a new security release.' ), esc_html( get_site_option( 'admin_email' ) ) ); ?></p> 60 <?php endif; ?> 61 </div> 62 <div class="last-feature"> 63 <h4><?php _e( 'More Reliable Than Ever' ); ?></h4> 64 <p><?php _e( 'The update process has been made even more reliable and secure, with dozens of new checks and safeguards.' ); ?></p> 65 <p><?php _e( 'You’ll still need to click “Update Now” once WordPress 3.8 is released, but we’ve never had more confidence in that beautiful blue button.' ); ?></p> 66 </div> 69 <?php endif; ?> 67 70 </div> 68 71 </div> 69 72 70 <div class="changelog ">73 <div class="changelog about-passwords"> 71 74 <h3><?php _e( 'Create Stronger Passwords' ); ?></h3> 72 75 73 76 <div class="feature-section col two-col"> 74 77 <div> 75 78 <p><?php _e( 'Your password is your site’s first line of defense. It’s best to create passwords that are complex, long, and unique. To that end, our password meter has been updated in WordPress 3.7 to recognize common mistakes that can weaken your password: dates, names, keyboard patterns (123456789), and even pop culture references.' ); ?> <?php _e( 'Try it out on the right.' ); ?></p> 76 79 </div> 77 <div class="last-feature"> 78 (Actual password meter demo) 80 <div class="last-feature about-password-meter"> 81 <input type="password" id="pass" size="25" value="" /> 82 <p id="pass-strength-result" ><?php _e( 'Strength indicator' ); ?></p> 83 <a href="<?php echo esc_url( self_admin_url() ); ?>profile.php"><?php _e( 'Getting the urge to change your password now?' ); ?></a> 79 84 </div> 80 85 </div> 81 86 </div> … … 84 89 <div class="feature-section col two-col"> 85 90 <div> 86 91 <h3><?php _e( 'Improved Search Results' ); ?></h3> 87 <p>< ?php _e( 'Search results are now ordered by how well the search query matches a post, instead of ordered only by date. For example, when your search terms match a post title, that result will be pushed to the top.' ); ?></p>92 <p><img alt="" src="images/about-search-2x.png" /><?php _e( 'Search results are now ordered by how well the search query matches a post, instead of ordered only by date. For example, when your search terms match a post title, that result will be pushed to the top.' ); ?></p> 88 93 </div> 89 94 <div class="last-feature"> 90 95 <h3><?php _e( 'Better Global Support' ); ?></h3> 91 <p>< ?php _e( 'Localized versions of WordPress will receive faster and more complete translations. WordPress 3.7 adds support for automatically installing the right language files and keeping them up to date.' ); ?></p>96 <p><img alt="" src="images/about-globe-2x.png" /><?php _e( 'Localized versions of WordPress will receive faster and more complete translations. WordPress 3.7 adds support for automatically installing the right language files and keeping them up to date.' ); ?></p> 92 97 </div> 93 98 </div> 94 99 </div>