Ticket #42888: 42888.8.diff
| File 42888.8.diff, 6.3 KB (added by , 5 years ago) |
|---|
-
src/wp-login.php
825 825 ?> 826 826 827 827 <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post"> 828 829 <label for="user_login"><?php _e( 'Username or Email Address' ); ?></label> 830 <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /> 828 <p> 829 <label for="user_login"><?php _e( 'Username or Email Address' ); ?></label> 830 <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /> 831 </p> 831 832 <?php 832 833 833 834 /** … … 839 840 840 841 ?> 841 842 <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" /> 842 < divclass="submit">843 <p class="submit"> 843 844 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Get New Password' ); ?>" /> 844 </ div>845 </p> 845 846 </form> 846 847 847 < divid="nav">848 <p id="nav"> 848 849 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> 849 850 <?php 850 851 … … 858 859 } 859 860 860 861 ?> 861 </ div>862 </p> 862 863 <?php 863 864 864 865 login_footer( 'user_login' ); … … 935 936 <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" /> 936 937 937 938 <div class="user-pass1-wrap"> 939 <p> 940 <label for="pass1"><?php _e( 'New password' ); ?></label> 941 </p> 938 942 939 <label for="pass1"><?php _e( 'New password' ); ?></label>940 941 943 <div class="wp-pwd"> 942 944 <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" /> 943 945 … … 952 954 </div> 953 955 </div> 954 956 955 < divclass="user-pass2-wrap">957 <p class="user-pass2-wrap"> 956 958 <label for="pass2"><?php _e( 'Confirm new password' ); ?></label> 957 959 <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" /> 958 </ div>960 </p> 959 961 960 962 <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p> 961 963 <br class="clear" /> … … 973 975 974 976 ?> 975 977 <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" /> 976 < divclass="submit">978 <p class="submit"> 977 979 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Reset Password' ); ?>" /> 978 </ div>980 </p> 979 981 </form> 980 982 981 < divid="nav">983 <p id="nav"> 982 984 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> 983 985 <?php 984 986 … … 992 994 } 993 995 994 996 ?> 995 </ div>997 </p> 996 998 <?php 997 999 998 1000 login_footer( 'user_pass' ); … … 1052 1054 1053 1055 ?> 1054 1056 <form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate"> 1055 < div>1057 <p> 1056 1058 <label for="user_login"><?php _e( 'Username' ); ?></label> 1057 1059 <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" /> 1058 </ div>1059 < div>1060 </p> 1061 <p> 1060 1062 <label for="user_email"><?php _e( 'Email' ); ?></label> 1061 1063 <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /> 1062 </ div>1064 </p> 1063 1065 <?php 1064 1066 1065 1067 /** … … 1075 1077 </p> 1076 1078 <br class="clear" /> 1077 1079 <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" /> 1078 < divclass="submit">1080 <p class="submit"> 1079 1081 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Register' ); ?>" /> 1080 </ div>1082 </p> 1081 1083 </form> 1082 1084 1083 < divid="nav">1085 <p id="nav"> 1084 1086 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> 1085 1087 <?php echo esc_html( $login_link_separator ); ?> 1086 1088 <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a> 1087 </ div>1089 </p> 1088 1090 <?php 1089 1091 1090 1092 login_footer( 'user_login' ); … … 1335 1337 ?> 1336 1338 1337 1339 <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post"> 1338 <label for="user_login"><?php _e( 'Username or Email Address' ); ?></label> 1339 <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /> 1340 <p> 1341 <label for="user_login"><?php _e( 'Username or Email Address' ); ?></label> 1342 <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /> 1343 </p> 1340 1344 1341 1345 <div class="user-pass-wrap"> 1342 1346 <label for="user_pass"><?php _e( 'Password' ); ?></label> … … 1357 1361 do_action( 'login_form' ); 1358 1362 1359 1363 ?> 1360 < div class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <label for="rememberme"><?php esc_html_e( 'Remember Me' ); ?></label></div>1361 < divclass="submit">1364 <p class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <label for="rememberme"><?php esc_html_e( 'Remember Me' ); ?></label></p> 1365 <p class="submit"> 1362 1366 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Log In' ); ?>" /> 1363 1367 <?php 1364 1368 … … 1380 1384 1381 1385 ?> 1382 1386 <input type="hidden" name="testcookie" value="1" /> 1383 </ div>1387 </p> 1384 1388 </form> 1385 1389 1386 1390 <?php … … 1387 1391 1388 1392 if ( ! $interim_login ) { 1389 1393 ?> 1390 < divid="nav">1394 <p id="nav"> 1391 1395 <?php 1392 1396 1393 1397 if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ), true ) ) { … … 1406 1410 } 1407 1411 1408 1412 ?> 1409 </ div>1413 </p> 1410 1414 <?php 1411 1415 } 1412 1416