Changeset 4952

Timestamp:

02/19/2017 10:21:18 PM (10 years ago)

Author:

ocean90

Message:

Login: On the post-register page show the email address to give users a hint whether they entered the correct email.

See #148.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login

Files:

• js/registration.js (modified) (1 diff)
• register-profile.php (modified) (2 diffs)
• register.php (modified) (2 diffs)
• stylesheets/login.css (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/js/registration.js

@@ -26 +26 @@
                                                 $this.addClass( 'error' );
                                                 $this.parents( 'p' ).after(
-                                                        "<div class='message error'><p>" +
+                                                        '<div class="message error' + ( datas.avatar ? ' with-avatar' : '' ) +  '"><p>' +
                                                         ( datas.avatar ? datas.avatar : '' ) + '<span>' +
                                                         datas.error +
-                                                        "</span></p></div>"
+                                                        '</span></p></div>'
                                                 );
                                         } else {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register-profile.php

@@ -31 +31 @@
 get_header();
 ?>
-<div class="message info"><p><?php _e( "Please check your email for a confirmation link to set your password.", 'wporg-login' ); ?></p></div>
+<div class="message info">
+        <p><?php
+                printf(
+                        /* translators: %s Email address */
+                        __( 'Please check your email %s for a confirmation link to set your password.', 'wporg-login' ),
+                        '<code>' . esc_html( wp_get_current_user()->user_email ) . '</code>'
+                );
+        ?></p>
+</div>
 
 <p class="intro">
@@ -48 +56 @@
 
 <p id="nav">
-        <a href="https://wordpress.org/"><?php _e( 'WordPress.org', 'wporg-login' ); ?></a>     
+        <a href="https://wordpress.org/"><?php _e( 'WordPress.org', 'wporg-login' ); ?></a>
 </p>
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php

@@ -51 +51 @@
         <?php
         if ( $error_user_login ) {
-                echo '<div class="message error"><p>' . $error_user_login->get_data()['avatar'] . '<span>' . $error_user_login->get_data()['error'] . '</span></p></div>';
+                printf(
+                        '<div class="message error%s"><p>%s<span>%s</span></p></div>',
+                        $error_user_login->get_data()['avatar'] ? ' with-avatar' : '',
+                        $error_user_login->get_data()['avatar'],
+                        $error_user_login->get_data()['error']
+                );
         }
         ?>
@@ -62 +67 @@
         <?php
         if ( $error_user_email ) {
-                echo '<div class="message error"><p>' . $error_user_email->get_data()['avatar'] . '<span>' . $error_user_email->get_data()['error'] . '</span></p></div>';
+                printf(
+                        '<div class="message error%s"><p>%s<span>%s</span></p></div>',
+                        $error_user_email->get_data()['avatar'] ? ' with-avatar' : '',
+                        $error_user_email->get_data()['avatar'],
+                        $error_user_email->get_data()['error']
+                );
         }
         ?>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/stylesheets/login.css

@@ -367 +367 @@
 body.route-register-confirm #login .message p {
         margin: 0;
+}
+
+body.route-register #login .message.with-avatar p,
+body.route-register-profile #login .message.with-avatar p,
+body.route-register-confirm #login .message.with-avatar p {
         display: -webkit-box;
         display: -ms-flexbox;