Ticket #3136: RTL.r4347.diff

File RTL.r4347.diff, 4.4 kB (added by Sewar, 2 years ago)

Add RTL support in wp-login.php and wp_die()

  • wp-login.php

    old new  
    2323 
    2424// Rather than duplicating this HTML all over the place, we'll stick it in function 
    2525function login_header($title = 'Login', $message = '') { 
    26         global $errors, $error; 
     26        global $errors, $error, $wp_locale; 
    2727 
    2828        ?> 
    2929<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    30 <html xmlns="http://www.w3.org/1999/xhtml"> 
     30<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> 
    3131<head> 
    3232        <title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title> 
    3333        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> 
    3434        <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" /> 
     35<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?> 
     36        <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" /> 
     37<?php endif; ?> 
    3538        <!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! --> 
    3639        <script type="text/javascript"> 
    3740                function focusit() { 
    …… 
    4346</head> 
    4447<body> 
    4548 
    46 <div id="login"> 
    47 <h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> 
     49<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> 
    4850<?php 
    4951        if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n"; 
    5052 

  • wp-includes/functions.php

    old new  
    10951095} 
    10961096 
    10971097function wp_die($message, $title = '') { 
     1098        global $wp_locale; 
     1099 
    10981100        header('Content-Type: text/html; charset=utf-8'); 
    10991101 
    11001102        if ( empty($title) ) 
    11011103                $title = __('WordPress &rsaquo; Error'); 
    11021104 
    11031105        if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') ) 
    1104                 $logo_src = 'images/wordpress-logo.png'; 
     1106                $admin_dir = ''; 
    11051107        else 
    1106                 $logo_src = 'wp-admin/images/wordpress-logo.png'; 
     1108                $admin_dir = 'wp-admin/'; 
    11071109 
    11081110?> 
    11091111<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    1110 <html xmlns="http://www.w3.org/1999/xhtml"> 
     1112<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> 
    11111113<head> 
    11121114        <title><?php echo $title ?></title> 
    11131115        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    1114         <style media="screen" type="text/css"> 
    1115         <!-- 
    1116         html { 
    1117                 background: #eee; 
    1118         } 
    1119         body { 
    1120                 background: #fff; 
    1121                 color: #000; 
    1122                 font-family: Georgia, "Times New Roman", Times, serif; 
    1123                 margin-left: 25%; 
    1124                 margin-right: 25%; 
    1125                 padding: .2em 2em; 
    1126         } 
    1127  
    1128         h1 { 
    1129                 color: #006; 
    1130                 font-size: 18px; 
    1131                 font-weight: lighter; 
    1132         } 
    1133  
    1134         h2 { 
    1135                 font-size: 16px; 
    1136         } 
    1137  
    1138         p, li, dt { 
    1139                 line-height: 140%; 
    1140                 padding-bottom: 2px; 
    1141         } 
    1142  
    1143         ul, ol { 
    1144                 padding: 5px 5px 5px 20px; 
    1145         } 
    1146         #logo { 
    1147                 margin-bottom: 2em; 
    1148         } 
    1149         --> 
    1150         </style> 
     1116        <link rel="stylesheet" href="<?php echo $admin_dir; ?>install.css" type="text/css" /> 
     1117<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?> 
     1118        <link rel="stylesheet" href="<?php echo $admin_dir; ?>install-rtl.css" type="text/css" /> 
     1119<?php endif; ?> 
    11511120</head> 
    11521121<body> 
    1153         <h1 id="logo"><img alt="WordPress" src="<?php echo $logo_src; ?>" /></h1> 
     1122        <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1> 
    11541123        <p><?php echo $message; ?></p> 
    11551124</body> 
    11561125</html> 

  • wp-admin/rtl.css

    old new  
    66        float: left; 
    77} 
    88 
    9 #login, #send, .widefat th { 
     9#login #send, .widefat th { 
    1010        text-align: right 
    1111} 
    1212 
    …… 
    101101        padding-left: 8px; 
    102102} 
    103103 
    104 #login h1 { 
    105         left: auto; 
    106         right: 137px; 
    107 } 
    108  
    109 #login h1 a { 
    110         display: none; 
    111 } 
    112  
    113104#searchform { 
    114105        float: right; 
    115106        margin-right: auto;