Ticket #30685: 30685.4.patch
File 30685.4.patch, 4.7 KB (added by , 5 years ago) |
---|
-
src/wp-admin/css/login.css
14 14 color: #444; 15 15 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; 16 16 font-size: 13px; 17 line-height: 1.4 em;17 line-height: 1.4; 18 18 } 19 19 20 20 a { … … 64 64 box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); 65 65 } 66 66 67 .login .login-error-list { 68 list-style: none; 69 margin: 0; 70 padding: 0; 71 } 72 67 73 .login #login_error { 68 74 border-left-color: #dc3232; 69 75 } 70 76 77 #login_error, 78 .login .notice-info { 79 margin: 20px 0; 80 padding: 0; 81 } 82 71 83 #loginform p.submit, 72 84 .login-action-lostpassword p.submit { 73 85 border: none; -
src/wp-login.php
192 192 if ( 'message' == $severity ) 193 193 $messages .= ' ' . $error_message . "<br />\n"; 194 194 else 195 $errors .= ' ' . $error_message . "<br />\n";195 $errors .= '<li>' . $error_message . '</li>'; 196 196 } 197 197 } 198 198 if ( ! empty( $errors ) ) { … … 203 203 * 204 204 * @param string $errors Login error message. 205 205 */ 206 echo '<div id="login_error"> ' . apply_filters( 'login_errors', $errors ) . "</div>\n";206 echo '<div id="login_error"><ul class="login-error-list">' . apply_filters( 'login_errors', $errors ) . "</ul></div>\n"; 207 207 } 208 208 if ( ! empty( $messages ) ) { 209 209 /** … … 213 213 * 214 214 * @param string $messages Login messages. 215 215 */ 216 echo '< p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";216 echo '<div class="notice-info"><p class="message">' . apply_filters( 'login_messages', $messages ) . "</p></div>\n"; 217 217 } 218 218 } 219 219 } // End of login_header() … … 533 533 */ 534 534 do_action( 'lost_password' ); 535 535 536 login_header( __('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);536 login_header( __( 'Lost Password' ), '<div class="notice-info"><p class="message">' . __( 'Please enter your username or email address. You will receive a link to create a new password via email.' ) . '</p></div>', $errors ); 537 537 538 538 $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : ''; 539 539 … … 619 619 if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) { 620 620 reset_password($user, $_POST['pass1']); 621 621 setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); 622 login_header( __( 'Password Reset' ), '< p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );622 login_header( __( 'Password Reset' ), '<div class="notice-info"><p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p></div>' ); 623 623 login_footer(); 624 624 exit; 625 625 } … … 627 627 wp_enqueue_script('utils'); 628 628 wp_enqueue_script('user-profile'); 629 629 630 login_header(__('Reset Password'), '< p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );630 login_header(__('Reset Password'), '<div class="notice-info"><p class="message reset-pass">' . __('Enter your new password below.') . '</p></div>', $errors ); 631 631 632 632 ?> 633 633 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off"> … … 724 724 * @param string $registration_redirect The redirect destination URL. 725 725 */ 726 726 $redirect_to = apply_filters( 'registration_redirect', $registration_redirect ); 727 login_header(__('Registration Form'), '< p class="message register">' . __('Register For This Site') . '</p>', $errors);727 login_header(__('Registration Form'), '<div class="notice-info"><p class="message register">' . __('Register For This Site') . '</p></div>', $errors); 728 728 ?> 729 729 <form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate"> 730 730 <p> … … 820 820 821 821 if ( !is_wp_error($user) && !$reauth ) { 822 822 if ( $interim_login ) { 823 $message = '< p class="message">' . __('You have logged in successfully.') . '</p>';823 $message = '<div class="notice-info"><p class="message">' . __('You have logged in successfully.') . '</p></div>'; 824 824 $interim_login = 'success'; 825 825 login_header( '', $message ); ?> 826 826 </div>