WordPress.org
Get WordPress

Make WordPress Core

Ticket #13045: 13045.2.diff

File 13045.2.diff, 5.9 KB (added by nacin, 15 years ago)

From FJK.

  • wp-login.php

     
    6262        <title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
    6363        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
    6464<?php
    65         wp_admin_css( 'login', true );
    66         wp_admin_css( 'colors-fresh', true );
     65        wp_admin_css( 'login', true ); <!-- change -->
    6766
    6867        if ( $is_iphone ) { ?>
    6968        <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" />
    … …  
    110109                        }
    111110                }
    112111                if ( !empty($errors) )
    113                         echo '<div id="login_error">' . apply_filters('login_errors', $errors) . "</div>\n";
     112                        echo '<div class="login_error"><p>' . apply_filters('login_errors', $errors) . "</p></div>\n"; /* change */
    114113                if ( !empty($messages) )
    115                         echo '<p class="message">' . apply_filters('login_messages', $messages) . "</p>\n";
     114                        echo '<div class="message"><p>' . apply_filters('login_messages', $messages) . "</p></div>\n"; /* change */
    116115        }
    117116} // End of login_header()
    118117function wp_shake_js() {
    … …  
    376375        $redirect_to = apply_filters( 'lostpassword_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
    377376
    378377        do_action('lost_password');
    379         login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or e-mail address. You will receive a new password via e-mail.') . '</p>', $errors);
     378        login_header(__('Lost Password'), '<div class="message"><p>' . __('Please enter your username or e-mail address. You will receive a new password via e-mail.') . '<p></div>', $errors); /* change */
    380379
    381380        $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';
    382381
    … …  
    392391        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Get New Password'); ?>" tabindex="100" /></p>
    393392</form>
    394393
    395 <p id="nav">
     394<div id="nav"><p> <!-- change -->
    396395<?php if (get_option('users_can_register')) : ?>
    397396<a href="<?php echo site_url('wp-login.php', 'login') ?>"><?php _e('Log in') ?></a> |
    398397<a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a>
    399398<?php else : ?>
    400399<a href="<?php echo site_url('wp-login.php', 'login') ?>"><?php _e('Log in') ?></a>
    401400<?php endif; ?>
    402 </p>
     401</p></div> <!-- change -->
    403402
    404403</div>
    405404
    406 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
     405<div id="backtoblog"><p><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p></div> <!-- change -->
    407406
    408407<script type="text/javascript">
    409408try{document.getElementById('user_login').focus();}catch(e){}
    … …  
    456455        }
    457456
    458457        $redirect_to = apply_filters( 'registration_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
    459         login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
     458        login_header(__('Registration Form'), '<div class="message register">' . __('Register For This Site') . '</div>', $errors);
    460459?>
    461460
    462461<form name="registerform" id="registerform" action="<?php echo site_url('wp-login.php?action=register', 'login_post') ?>" method="post">
    … …  
    475474        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Register'); ?>" tabindex="100" /></p>
    476475</form>
    477476
    478 <p id="nav">
     477<div id="nav"><p>  <!-- change -->
    479478<a href="<?php echo site_url('wp-login.php', 'login') ?>"><?php _e('Log in') ?></a> |
    480479<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
    481 </p>
     480</p></div> <!-- change -->
    482481
    483482</div>
    484483
    485 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
     484<div id="backtoblog"><p><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?><p></a></div> <!-- change -->
    486485
    487486<script type="text/javascript">
    488487try{document.getElementById('user_login').focus();}catch(e){}
    … …  
    530529
    531530        if ( !is_wp_error($user) ) {
    532531                if ( $interim_login ) {
    533                         $message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
     532                        $message = '<div class="message"><p>' . __('You have logged in successfully.') . '</p></div>'; /* change */
    534533                        login_header( '', $message ); ?>
    535534                        <script type="text/javascript">setTimeout( function(){window.close()}, 8000);</script>
    536535                        <p class="alignright">
    … …  
    597596</form>
    598597
    599598<?php if ( !$interim_login ) { ?>
    600 <p id="nav">
     599<div id="nav"><p> <!-- change -->
    601600<?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
    602601<?php elseif ( get_option('users_can_register') ) : ?>
    603602<a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
    … …  
    605604<?php else : ?>
    606605<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
    607606<?php endif; ?>
    608 </p>
     607</p></div> <!-- change -->
    609608
    610 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
     609<div id="backtoblog"><p><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a><p></div> <!-- change -->
    611610<?php } ?>
    612611</div>
    613612