Ticket #25603: 25603.7.diff

wp-admin/about.php

@@ -13 +13 @@
 
 list( $display_version ) = explode( '-', $wp_version );
 
+wp_enqueue_script('about-animation');
+
 include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap about-wrap">
@@ -36 +38 @@
 <div class="changelog">
         <h3><?php _e( 'Background Updates' ); ?></h3>
 
-        <div class="feature-section col two-col">
+        <div class="feature-section col three-col about-updates">
                 <div>
                         <h4><?php _e( 'Updates While You Sleep' ); ?></h4>
                         <p><?php _e( 'With WordPress 3.7, you don&#8217;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>
-                        <?php
+                </div>
+                <div><img alt="" src="images/about-updates-2x.png" /></div>
+                <div class="last-feature">
+                        <h4><?php _e( 'More Reliable Than Ever' ); ?></h4>
+                        <p><?php _e( 'The update process has been made even more reliable and secure, with dozens of new checks and safeguards.' ); ?></p>
+                        <p><?php _e( 'You&#8217;ll still need to click &#8220;Update Now&#8221; once WordPress 3.8 is released, but we&#8217;ve never had more confidence in that beautiful blue button.' ); ?></p>
+                </div>
+                <?php
                         $can_auto_update = wp_http_supports( 'ssl' );
                         if ( $can_auto_update ) {
                                 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
@@ -57 +66 @@
                                 <p><?php _e( '&rarr; This site <strong>is</strong> able to apply these updates automatically. Cool!' ); ?></p>
                         <?php else : ?>
                                 <p><?php printf( __( '&rarr; This site <strong>is not</strong> able to apply these updates automatically. But we&#8217;ll email %s when there is a new security release.' ), esc_html( get_site_option( 'admin_email' ) ) ); ?></p>
-                        <?php endif; ?>
-                </div>
-                <div class="last-feature">
-                        <h4><?php _e( 'More Reliable Than Ever' ); ?></h4>
-                        <p><?php _e( 'The update process has been made even more reliable and secure, with dozens of new checks and safeguards.' ); ?></p>
-                        <p><?php _e( 'You&#8217;ll still need to click &#8220;Update Now&#8221; once WordPress 3.8 is released, but we&#8217;ve never had more confidence in that beautiful blue button.' ); ?></p>
-                </div>
+                <?php endif; ?>
         </div>
 </div>
 
-<div class="changelog">
+<div class="changelog about-passwords">
         <h3><?php _e( 'Create Stronger Passwords' ); ?></h3>
 
         <div class="feature-section col two-col">
                 <div>
                         <p><?php _e( 'Your password is your site&#8217;s first line of defense. It&#8217;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>
                 </div>
-                <div class="last-feature">
-                        (Actual password meter demo)
+                <div class="last-feature about-password-meter">
+                        <input type="password" id="pass1" size="25" value="" style="display: block;width: 100%;padding: 5px;font-size: 1.8em;"/>
+                        <p id="pass-strength-result" style="display:block;width: 100%;padding: 17px 0;margin-bottom: 15px;"><?php _e( 'Strength indicator' ); ?></p>
+                        <a href="<?php echo esc_url( self_admin_url() ); ?>profile.php"><?php
+                is_blog_admin() ? _e( 'Getting the urge to change your password now?' ) : _e( 'Getting the urge to change your password now?' ); ?></a>
                 </div>
         </div>
 </div>
@@ -84 +90 @@
         <div class="feature-section col two-col">
                 <div>
                         <h3><?php _e( 'Improved Search Results' ); ?></h3>
-                        <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>
+                        <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>
                 </div>
                 <div class="last-feature">
                         <h3><?php _e( 'Better Global Support' ); ?></h3>
-                        <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>
+                        <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>
                 </div>
         </div>
 </div>

wp-admin/css/colors-classic.css

@@ -2000 +2000 @@
         color: #464646;
 }
 
-.about-wrap .feature-section img {
-        background: #fff;
-        border: 1px #ccc solid;
-        -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
-        box-shadow:         0 1px 3px rgba( 0, 0, 0, 0.3 );
-}
-
 .about-wrap h4.wp-people-group {
         text-shadow: 1px 1px 1px #fff;
 }

wp-admin/css/colors-fresh.css

@@ -1889 +1889 @@
         color: #464646;
 }
 
-.about-wrap .feature-section img {
-        background: #fff;
-        border: 1px #ccc solid;
-        -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
-        box-shadow:         0 1px 3px rgba( 0, 0, 0, 0.3 );
-}
-
 .about-wrap h4.wp-people-group {
         text-shadow: 1px 1px 1px #fff;
 }

wp-admin/css/wp-admin.css

@@ -5766 +5766 @@
         display: none !important;
 }
 
+.about-wrap p.about-notice {
+        background-color: #ffffe0;
+        border: 1px solid #e6db55;
+        margin: 5px 0 15px;
+        padding: 0.4em 0.8em;
+        border-radius: 3px;
+        -webkit-border-radius: 3px;
+}
+
+.about-wrap .about-passwords {
+        margin: 20px 0;
+        padding: 1px 20px 10px;
+        background-color: #f9f9f9;
+}
+
+.about-wrap .about-password-meter input {
+        font-size: 250%;
+        width: 100%;
+}
+
+.about-wrap .about-password-meter #pass-strength-result {
+        width: 97.5%;
+        font-size: 150%;
+}
+
+.about-wrap #pass-strength-result {
+        font-weight: normal !important;
+}
+
+.about-wrap .feature-section img {
+        border: 0;
+        background: transparent;
+        box-shadow: none;
+        -webkit-box-shadow: none;
+        max-width: 20%;
+}
+
+.about-wrap .feature-section div p img {
+        float: right;
+        margin-left: 10px;
+}
+
 /* Typography */
 
 .about-wrap p {
@@ -5808 +5850 @@
         padding-bottom: 20px;
 }
 
+.about-wrap .feature-section 
+
 .about-wrap .feature-section h4 {
         margin-bottom: 0.6em;
 }
@@ -5960 +6004 @@
         float: left;
 }
 
+.about-wrap .three-col.about-updates div:nth-of-type(1),
+.about-wrap .three-col.about-updates div:nth-of-type(3) {
+        width: 37%;
+        margin: 0;
+}
+
+.about-wrap .three-col.about-updates div:nth-of-type(2) {
+        width: 16%;
+        margin: 0 5%;
+}
+
+.about-wrap .three-col.about-updates img {
+        margin: 0;
+}
+
 .about-wrap .three-col-images {
         text-align: center;
 }

wp-admin/js/password-strength-meter.js

@@ -14 +14 @@
                         if ( ! $.isArray( blacklist ) )
                                 blacklist = [ blacklist.toString() ];
 
-                        if (password1 != password2 && password2.length > 0)
+                        if (password1 != password2 && password2 && password2.length > 0)
                                 return 5;
 
                         var result = zxcvbn( password1, blacklist );

wp-includes/script-loader.php

@@ -327 +327 @@
                 'strong' => __('Strong'),
                 'mismatch' => __('Mismatch')
         ) );
+        $scripts->add( 'about-animation', "/wp-admin/js/about-animation$suffix.js", array( 'jquery', 'password-strength-meter'), false, 1);
 
         $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );