WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RTL support for login sand wp_die() from Sewar. fixes #3136 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-10-07 19:12:33 +00:00
parent 8993263634
commit fce38c2c1f
2 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
wp-includes/functions.php
View File

@ -1095,62 +1095,31 @@ function wp_nonce_ays($action) {
} }
function wp_die($message, $title = '') { function wp_die($message, $title = '') {
global $wp_locale;
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
if ( empty($title) ) if ( empty($title) )
$title = __('WordPress › Error'); $title = __('WordPress › Error');
if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') ) if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
$logo_src = 'images/wordpress-logo.png'; $admin_dir = '';
else else
$logo_src = 'wp-admin/images/wordpress-logo.png'; $admin_dir = 'wp-admin/';
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head> <head>
<title><?php echo $title ?></title> <title><?php echo $title ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style media="screen" type="text/css"> <link rel="stylesheet" href="<?php echo $admin_dir; ?>install.css" type="text/css" />
<!-- <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
html { <link rel="stylesheet" href="<?php echo $admin_dir; ?>install-rtl.css" type="text/css" />
background: #eee; <?php endif; ?>
}
body {
background: #fff;
color: #000;
font-family: Georgia, "Times New Roman", Times, serif;
margin-left: 25%;
margin-right: 25%;
padding: .2em 2em;
}
h1 {
color: #006;
font-size: 18px;
font-weight: lighter;
}
h2 {
font-size: 16px;
}
p, li, dt {
line-height: 140%;
padding-bottom: 2px;
}
ul, ol {
padding: 5px 5px 5px 20px;
}
#logo {
margin-bottom: 2em;
}
-->
</style>
</head> </head>
<body> <body>
<h1 id="logo"><img alt="WordPress" src="<?php echo $logo_src; ?>" /></h1> <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1>
<p><?php echo $message; ?></p> <p><?php echo $message; ?></p>
</body> </body>
</html> </html>

10
wp-login.php
View File

@ -23,15 +23,18 @@ if ( defined('RELOCATE') ) { // Move flag is set
// Rather than duplicating this HTML all over the place, we'll stick it in function // Rather than duplicating this HTML all over the place, we'll stick it in function
function login_header($title = 'Login', $message = '') { function login_header($title = 'Login', $message = '') {
global $errors, $error; global $errors, $error, $wp_locale;
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head> <head>
<title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title> <title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
<link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" /> <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
<link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
<?php endif; ?>
<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! --> <!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! -->
<script type="text/javascript"> <script type="text/javascript">
function focusit() { function focusit() {
@ -43,8 +46,7 @@ function login_header($title = 'Login', $message = '') {
</head> </head>
<body> <body>
<div id="login"> <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>
<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>
<?php <?php
if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n"; if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n";