Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add support for RTL in install.php, upgrade.php and inline-uploading.…

…php. Props Sewar. #3136

git-svn-id: http://svn.automattic.com/wordpress/trunk@4259 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
commit c0580ed6f7ac776ba0346dff96fdc3266a2c186e 1 parent 43f36aa
ryan authored
View
71 readme.html
@@ -1,52 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>WordPress &rsaquo; ReadMe</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<style type="text/css" media="screen">
- <!--
- html {
- background: #eee;
- }
- 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;
- }
- -->
- </style>
+ <title>WordPress &rsaquo; ReadMe</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" href="wp-admin/install.css" type="text/css" />
</head>
<body>
-<h1 style="text-align: center"><img alt="WordPress" src="http://wordpress.org/images/wordpress.gif" /> <br />
- Version 2.0</h1>
-<p style="text-align: center"> Semantic Personal Publishing Platform </p>
+<h1 id="logo" style="text-align: center">
+ <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
+ <br /> Version 2.1-ALPHA
+</h1>
+<p style="text-align: center">Semantic Personal Publishing Platform</p>
+
<h1>First Things First</h1>
<p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.</p>
<p style="text-align: right;">&#8212; Matt Mullenweg </p>
-<h1 id="installation">Installation: Famous 5-minute install</h1>
+<h1>Installation: Famous 5-minute install</h1>
<ol>
<li>Unzip the package in an empty directory</li>
<li>Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details</li>
@@ -68,22 +38,23 @@ <h1 id="installation">Installation: Famous 5-minute install</h1>
</ol>
<h2>Template Changes</h2>
<p>If you have customized your templates you will probably have to make some changes to them. If you're converting your 1.2 or earlier templates, <a href="http://codex.wordpress.org/Upgrade_1.2_to_1.5">we've created a special guide for you</a>. </p>
+
<h1>Online Resources</h1>
<p>If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:</p>
<dl>
<dt><a href="http://codex.wordpress.org/">The WordPress Codex </a></dt>
- <dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available. </dd>
+ <dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available. </dd>
<dt><a href="http://wordpress.org/development/">The Development Blog</a></dt>
- <dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often. </dd>
+ <dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often. </dd>
<dt><a href="http://planet.wordpress.org/">WordPress Planet </a></dt>
- <dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web. </dd>
+ <dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web. </dd>
<dt><a href="http://wordpress.org/support/">WordPress Support Forums</a></dt>
- <dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible. </dd>
+ <dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible. </dd>
<dt><a href="http://codex.wordpress.org/IRC">WordPress IRC Channel</a></dt>
- <dd>Finally, there is an online chat channel that is used for discussion amoung people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpresss) </dd>
+ <dd>Finally, there is an online chat channel that is used for discussion amoung people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpresss) </dd>
</dl>
-<h1 id="requirements">System Recommendations</h1>
+<h1>System Recommendations</h1>
<ul>
<li>PHP version <strong>4.1</strong> or higher</li>
<li>MySQL version <strong>3.23.23</strong> or higher</li>
@@ -94,14 +65,14 @@ <h1 id="requirements">System Recommendations</h1>
<h1>Upgrading from another system</h1>
<p>WordPress can <a href="http://codex.wordpress.org/Importing_from_other_blogging_software">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>
-<h1 id="templates">XML-RPC Interface</h1>
+<h1>XML-RPC Interface</h1>
<p>You can now post to your WordPress blog with tools like <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://blogbuddy.sourceforge.net">BlogBuddy</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://www.ubique.ch/wapblogger/">WapBlogger</a> (post from your Wap cellphone!), <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.zempt.com/">Zempt</a>, <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>
<h1>Post via Email</h1>
-<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL. </p>
-<p> Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address dicrete. The script will <i>delete</i> emails that are successfully posted. </p>
-<h1 id="roles">User Roles </h1>
+<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL.</p>
+<p>Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address dicrete. The script will <i>delete</i> emails that are successfully posted.</p>
+<h1>User Roles</h1>
<p>We've eliminated user levels in order to make way for the much more flexible roles system introduced in 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities">read more about Roles and Capabilities on the Codex</a>.</p>
<h1> Final notes</h1>
View
12 wp-admin/admin-footer.php
@@ -1,10 +1,10 @@
-<div id="footer"><p><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
-<p>
-<a href="http://codex.wordpress.org/"><?php _e('Documentation'); ?></a> &#8212; <a href="http://wordpress.org/support/"><?php _e('Support Forums'); ?></a> <br />
-<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), number_format(timer_stop(), 2)); ?>
-</p>
-
+<div id="footer">
+ <p><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
+ <p>
+ <?php _e('<a href="http://codex.wordpress.org/">Documentation</a>'); ?> &#8212; <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?> <br />
+ <?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), number_format(timer_stop(), 2)); ?>
+ </p>
</div>
<?php do_action('admin_footer', ''); ?>
<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
View
606 wp-admin/inline-uploading.php
@@ -1,8 +1,6 @@
<?php
-
require_once('admin.php');
-
-header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
if (!current_user_can('upload_files'))
wp_die(__('You do not have permission to upload files.'));
@@ -276,12 +274,12 @@
break;
default:
-wp_die(__('This script was not meant to be called directly.'));
+ wp_die(__('This script was not meant to be called directly.'));
}
?>
<!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>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
<title></title>
@@ -427,280 +425,338 @@ function sendToEditor(n) {
// ]]>
</script>
<style type="text/css">
-<?php if ( $action == 'links' ) : ?>
-* html { overflow-x: hidden; }
-<?php else : ?>
-* html { overflow-y: hidden; }
-<?php endif; ?>
-body {
- font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
- border: none;
- margin: 0px;
- height: 150px;
- background: #dfe8f1;
-}
-form {
- margin: 3px 2px 0px 6px;
-}
-#wrap {
- clear: both;
- padding: 0px;
- width: 100%;
-}
-#images {
- position: absolute;
- clear: both;
- margin: 0px;
- padding: 15px 15px;
- width: <?php echo $images_width; ?>px;
-}
-#images img {
- background-color: rgb(209, 226, 239);
-}
-<?php echo $style; ?>
-.attwrap, .attwrap * {
- margin: 0px;
- padding: 0px;
- border: 0px;
-}
-.imagewrap {
- margin-right: 5px;
- overflow: hidden;
- width: 128px;
-}
-.otherwrap {
- margin-right: 5px;
- overflow: hidden;
- background-color: #f9fcfe;
-}
-.otherwrap a {
- display: block;
-}
-.otherwrap a, .otherwrap a:hover, .otherwrap a:active, .otherwrap a:visited {
- color: blue;
-}
-.usingicon {
- padding: 0px;
- height: 96px;
- text-align: center;
- width: 128px;
-}
-.usingtext {
- padding: 3px;
- height: 90px;
- text-align: left;
- width: 122px;
-}
-.filetype {
- font-size: 80%;
- border-bottom: 3px double #89a
-}
-.imagewrap, .imagewrap img, .imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img {
- text-decoration: none;
-}
-#upload-menu {
- background: #fff;
- margin: 0px;
- padding: 0;
- list-style: none;
- height: 2em;
- border-bottom: 1px solid #448abd;
- width: 100%;
-}
-#upload-menu li {
- float: left;
- margin: 0 0 0 .75em;
-}
-#upload-menu a {
- display: block;
- padding: 5px;
- text-decoration: none;
- color: #000;
- border-top: 3px solid #fff;
-}
-#upload-menu .current a {
- background: #dfe8f1;
- border-right: 2px solid #448abd;
-}
-#upload-menu a:hover {
- background: #dfe8f1;
- color: #000;
-}
-.tip {
- color: rgb(68, 138, 189);
- padding: 2px 1em;
-}
-.inactive {
- color: #fff;
- padding: 1px 3px;
-}
-.left {
- float: left;
-}
-.right {
- float: right;
-}
-.center {
- text-align: center;
-}
-#upload-menu li.spacer {
- margin-left: 40px;
-}
-#title, #descr {
- width: 99%;
- margin-top: 1px;
-}
-th {
- width: 4.5em;
-}
-#descr {
- height: 36px;
-}
-#buttons {
- margin-top: 2px;
- text-align: right;
-}
-.popup {
- margin: 4px 4px;
- padding: 1px;
- position: absolute;
- width: 114px;
- display: none;
- background-color: rgb(240, 240, 238);
- border-top: 2px solid #fff;
- border-right: 2px solid #ddd;
- border-bottom: 2px solid #ddd;
- border-left: 2px solid #fff;
- text-align: center;
-}
-.imagewrap .popup {
- opacity: .90;
- filter:alpha(opacity=90);
-}
-.otherwrap .popup {
- padding-top: 20px;
-}
-.popup a, .popup a:visited, .popup a:active {
- background-color: transparent;
- display: block;
- width: 100%;
- text-decoration: none;
- color: #246;
-}
-.popup a:hover {
- background-color: #fff;
- color: #000;
-}
-.caption {
- text-align: center;
-}
-#submit {
- margin: 1px;
- width: 99%;
-}
-#submit input, #submit input:focus {
- background: url( images/fade-butt.png );
- border: 3px double #999;
- border-left-color: #ccc;
- border-top-color: #ccc;
- color: #333;
- padding: 0.25em;
-}
-#submit input:active {
- background: #f4f4f4;
- border: 3px double #ccc;
- border-left-color: #999;
- border-top-color: #999;
-}
-.zerosize {
- width: 0px;
- height: 0px;
- overflow: hidden;
- position: absolute;
-}
-#links {
- margin: 3px 8px;
- line-height: 2em;
-}
-#links textarea {
- width: 95%;
- height: 4.5em;
-}
+ <?php if ( $action == 'links' ) : ?>
+ * html { overflow-x: hidden; }
+ <?php else : ?>
+ * html { overflow-y: hidden; }
+ <?php endif; ?>
+
+ body {
+ font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
+ border: none;
+ margin: 0px;
+ height: 150px;
+ background: #dfe8f1;
+ }
+
+ form { margin: 3px 2px 0px 6px; }
+
+ #wrap {
+ clear: both;
+ padding: 0px;
+ width: 100%;
+ }
+
+ #images {
+ position: absolute;
+ clear: both;
+ margin: 0px;
+ padding: 15px 15px;
+ width: <?php echo $images_width; ?>px;
+ }
+
+ #images img { background-color: rgb(209, 226, 239); }
+
+ <?php echo $style; ?>
+
+ .attwrap, .attwrap * {
+ margin: 0px;
+ padding: 0px;
+ border: 0px;
+ }
+
+ .imagewrap {
+ margin-right: 5px;
+ overflow: hidden;
+ width: 128px;
+ }
+
+ .otherwrap {
+ margin-right: 5px;
+ overflow: hidden;
+ background-color: #f9fcfe;
+ }
+
+ .otherwrap a { display: block; }
+
+ .otherwrap a, .otherwrap a:hover, .otherwrap a:active, .otherwrap a:visited { color: blue; }
+
+ .usingicon {
+ padding: 0px;
+ height: 96px;
+ text-align: center;
+ width: 128px;
+ }
+
+ .usingtext {
+ padding: 3px;
+ height: 90px;
+ text-align: left;
+ width: 122px;
+ }
+
+ .filetype {
+ font-size: 80%;
+ border-bottom: 3px double #89a;
+ }
+
+ .imagewrap, .imagewrap img, .imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img { text-decoration: none; }
+
+ #upload-menu {
+ background: #fff;
+ margin: 0px;
+ padding: 0;
+ list-style: none;
+ height: 2em;
+ border-bottom: 1px solid #448abd;
+ width: 100%;
+ }
+
+ #upload-menu li {
+ float: left;
+ margin: 0 0 0 .75em;
+ }
+
+ #upload-menu a {
+ display: block;
+ padding: 5px;
+ text-decoration: none;
+ color: #000;
+ border-top: 3px solid #fff;
+ }
+
+ #upload-menu .current a {
+ background: #dfe8f1;
+ border-right: 2px solid #448abd;
+ }
+
+ #upload-menu a:hover {
+ background: #dfe8f1;
+ color: #000;
+ }
+
+ .tip {
+ color: rgb(68, 138, 189);
+ padding: 2px 1em;
+ }
+
+ .inactive {
+ color: #fff;
+ padding: 1px 3px;
+ }
+
+ .left { float: left; }
+
+ .right { float: right; }
+
+ .center { text-align: center; }
+
+ #upload-menu li.spacer { margin-left: 40px; }
+
+ #title, #descr {
+ width: 99%;
+ margin-top: 1px;
+ }
+
+ th {
+ text-align: right;
+ width: 4.5em;
+ }
+
+ #descr { height: 36px; }
+
+ #buttons {
+ margin-top: 2px;
+ text-align: right;
+ }
+
+ .popup {
+ margin: 4px 4px;
+ padding: 1px;
+ position: absolute;
+ width: 114px;
+ display: none;
+ background-color: rgb(240, 240, 238);
+ border-top: 2px solid #fff;
+ border-right: 2px solid #ddd;
+ border-bottom: 2px solid #ddd;
+ border-left: 2px solid #fff;
+ text-align: center;
+ }
+
+ .imagewrap .popup {
+ opacity: .90;
+ filter:alpha(opacity=90);
+ }
+
+ .otherwrap .popup { padding-top: 20px; }
+
+ .popup a, .popup a:visited, .popup a:active {
+ background-color: transparent;
+ display: block;
+ width: 100%;
+ text-decoration: none;
+ color: #246;
+ }
+
+ .popup a:hover {
+ background-color: #fff;
+ color: #000;
+ }
+
+ .caption { text-align: center; }
+
+ #submit {
+ margin: 1px;
+ width: 99%;
+ }
+
+ #submit input, #submit input:focus {
+ background: url( images/fade-butt.png );
+ border: 3px double #999;
+ border-left-color: #ccc;
+ border-top-color: #ccc;
+ color: #333;
+ padding: 0.25em;
+ }
+
+ #submit input:active {
+ background: #f4f4f4;
+ border: 3px double #ccc;
+ border-left-color: #999;
+ border-top-color: #999;
+ }
+
+ .zerosize {
+ width: 0px;
+ height: 0px;
+ overflow: hidden;
+ position: absolute;
+ }
+
+ #links {
+ margin: 3px 8px;
+ line-height: 2em;
+ }
+
+ #links textarea {
+ width: 95%;
+ height: 4.5em;
+ }
+</style>
+<?php if ( ('rtl' == $wp_locale->text_direction) ): ?>
+<style type="text/css">
+ body { font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; }
+
+ .usingtext { text-align: right; }
+
+ th { text-align: left; }
+
+ .left, #upload-menu li { float: right; }
+
+ .right { float: left; }
+
+ .popup {
+ border-right: 2px solid #fff;
+ border-left: 2px solid #ddd;
+ }
+
+ #upload-menu .current a {
+ border-right: 0;
+ border-left: 2px solid #448abd;
+ }
+
+ #submit input, #submit input:focus {
+ border-left: 0;
+ border-right-color: #ccc;
+ }
+
+ #submit input:active {
+ border-left: 0;
+ border-right-color: #999;
+ }
</style>
+<?php endif; ?>
</head>
<body>
<ul id="upload-menu">
-<li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__) . "?action=upload&amp;post=$post&amp;all=$all&amp;start=$start"; ?>"><?php _e('Upload'); ?></a></li>
-<?php if ( $attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$post'") ) { ?>
-<li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__) . "?action=view&amp;post=$post&amp;all=false"; ?>"><?php _e('Browse'); ?></a></li>
-<?php } ?>
-<?php if ($wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = 'attachment'")) { ?>
-<li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__) . "?action=view&amp;post=$post&amp;all=true"; ?>"><?php _e('Browse All'); ?></a></li>
-<?php } ?>
-<li> </li>
-<?php if ( $action == 'view' ) { ?>
-<?php if ( false !== $back ) : ?>
-<li class="spacer"><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=0"; ?>" title="<?php _e('First'); ?>">|&laquo;</a></li>
-<li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=$back"; ?>">&laquo; <?php _e('Back'); ?></a></li>
-<?php else : ?>
-<li class="inactive spacer">|&laquo;</li>
-<li class="inactive">&laquo; <?php _e('Back'); ?></li>
-<?php endif; ?>
-<?php if ( false !== $next ) : ?>
-<li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=$next"; ?>"><?php _e('Next &raquo;'); ?></a></li>
-<li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;last=true"; ?>" title="<?php _e('Last'); ?>">&raquo;|</a></li>
-<?php else : ?>
-<li class="inactive"><?php _e('Next &raquo;'); ?></li>
-<li class="inactive">&raquo;|</li>
-<?php endif; ?>
-<?php } // endif not upload?>
+ <li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__) . "?action=upload&amp;post=$post&amp;all=$all&amp;start=$start"; ?>"><?php _e('Upload'); ?></a></li>
+
+ <?php if ( $attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$post'") ): ?>
+ <li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__) . "?action=view&amp;post=$post&amp;all=false"; ?>"><?php _e('Browse'); ?></a></li>
+ <?php endif; ?>
+
+ <?php if ($wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = 'attachment'")): ?>
+ <li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__) . "?action=view&amp;post=$post&amp;all=true"; ?>"><?php _e('Browse All'); ?></a></li>
+ <?php endif; ?>
+
+ <li> </li>
+
+ <?php if ( $action == 'view' ): ?>
+ <?php if ( false !== $back ): ?>
+ <li class="spacer"><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=0"; ?>" title="<?php _e('First'); ?>">|&laquo;</a></li>
+ <li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=$back"; ?>">&laquo; <?php _e('Back'); ?></a></li>
+ <?php else: ?>
+ <li class="inactive spacer">|&laquo;</li>
+ <li class="inactive">&laquo; <?php _e('Back'); ?></li>
+ <?php endif; ?>
+
+ <?php if ( false !== $next ): ?>
+ <li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=$next"; ?>"><?php _e('Next &raquo;'); ?></a></li>
+ <li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;last=true"; ?>" title="<?php _e('Last'); ?>">&raquo;|</a></li>
+ <?php else: ?>
+ <li class="inactive"><?php _e('Next &raquo;'); ?></li>
+ <li class="inactive">&raquo;|</li>
+ <?php endif; ?>
+ <?php endif; ?>
</ul>
-<?php if ( $action == 'view' ) : ?>
-<div id="wrap">
-<!--<div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div>-->
-<div id="images">
-<?php echo $html; ?>
-<?php echo $popups; ?>
-</div>
-</div>
-<?php elseif ( $action == 'upload' ) : ?>
-<div class="tip"></div>
-<form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo basename(__FILE__); ?>">
-<table style="width:99%;">
-<tr>
-<th scope="row" align="right"><label for="upload"><?php _e('File:'); ?></label></th>
-<td><input type="file" id="upload" name="image" /></td>
-</tr>
-<tr>
-<th scope="row" align="right"><label for="title"><?php _e('Title:'); ?></label></th>
-<td><input type="text" id="title" name="imgtitle" /></td>
-</tr>
-<tr>
-<th scope="row" align="right"><label for="descr"><?php _e('Description:'); ?></label></th>
-<td><input type="textarea" name="descr" id="descr" value="" /></td>
-</tr>
-<tr id="buttons">
-<th></th>
-<td>
-<input type="hidden" name="action" value="save" />
-<input type="hidden" name="post" value="<?php echo $post; ?>" />
-<input type="hidden" name="all" value="<?php echo $all; ?>" />
-<input type="hidden" name="start" value="<?php echo $start; ?>" />
-<?php wp_nonce_field( 'inlineuploading' ); ?>
-<div id="submit">
-<input type="submit" value="<?php _e('Upload'); ?>" />
-<?php if ( !empty($all) ) : ?>
-<input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
-<?php endif; ?>
-</div>
-</td>
-</tr>
-</table>
-</form>
-<?php elseif ( $action == 'links' ) : ?>
-<div id="links">
-<?php the_attachment_links($attachment); ?>
-</div>
+
+<?php if ( $action == 'view' ): ?>
+ <div id="wrap">
+ <!--<div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div>-->
+ <div id="images">
+ <?php echo $html; ?>
+ <?php echo $popups; ?>
+ </div>
+ </div>
+<?php elseif ( $action == 'upload' ): ?>
+ <div class="tip"></div>
+ <form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo basename(__FILE__); ?>">
+ <table style="width: 99%">
+ <tr>
+ <th scope="row"><label for="upload"><?php _e('File:'); ?></label></th>
+ <td><input type="file" id="upload" name="image" /></td>
+ </tr>
+ <tr>
+ <th scope="row"><label for="title"><?php _e('Title:'); ?></label></th>
+ <td><input type="text" id="title" name="imgtitle" /></td>
+ </tr>
+ <tr>
+ <th scope="row"><label for="descr"><?php _e('Description:'); ?></label></th>
+ <td><input type="textarea" name="descr" id="descr" value="" /></td>
+ </tr>
+ <tr id="buttons">
+ <th></th>
+ <td>
+ <input type="hidden" name="action" value="save" />
+ <input type="hidden" name="post" value="<?php echo $post; ?>" />
+ <input type="hidden" name="all" value="<?php echo $all; ?>" />
+ <input type="hidden" name="start" value="<?php echo $start; ?>" />
+ <?php wp_nonce_field( 'inlineuploading' ); ?>
+ <div id="submit">
+ <input type="submit" value="<?php _e('Upload'); ?>" />
+ <?php if ( !empty($all) ): ?>
+ <input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
+ <?php endif; ?>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+<?php elseif ( $action == 'links' ): ?>
+ <div id="links">
+ <?php the_attachment_links($attachment); ?>
+ </div>
<?php endif; ?>
</body>
-</html>
+</html>
View
1  wp-admin/install-rtl.css
@@ -0,0 +1 @@
+body { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; }
View
40 wp-admin/install.css
@@ -0,0 +1,40 @@
+html { background: #eee; }
+
+body {
+ background: #fff;
+ color: #000;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ margin-left: 20%;
+ margin-right: 20%;
+ 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; }
+
+.step a, .step input { font-size: 2em; }
+
+td input { font-size: 1.5em; }
+
+.step, th { text-align: right; }
+
+#footer {
+ text-align: center;
+ border-top: 1px solid #ccc;
+ padding-top: 1em;
+ font-style: italic;
+}
View
151 wp-admin/install.php
@@ -1,7 +1,7 @@
<?php
define('WP_INSTALLING', true);
if (!file_exists('../wp-config.php'))
- die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+ die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
require_once('../wp-config.php');
require_once('./upgrade-functions.php');
@@ -13,62 +13,14 @@
header( 'Content-Type: text/html; charset=utf-8' );
?>
<!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>
- <title><?php _e('WordPress &rsaquo; Installation'); ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <style media="screen" type="text/css">
- <!--
- html {
- background: #eee;
- }
- body {
- background: #fff;
- color: #000;
- font-family: Georgia, "Times New Roman", Times, serif;
- margin-left: 20%;
- margin-right: 20%;
- 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;
- }
- .step a, .step input {
- font-size: 2em;
- }
- td input {
- font-size: 1.5em;
- }
- .step, th {
- text-align: right;
- }
- #footer {
- text-align: center;
- border-top: 1px solid #ccc;
- padding-top: 1em;
- font-style: italic;
- }
- -->
- </style>
+ <title><?php _e('WordPress &rsaquo; Installation'); ?></title>
+ <link rel="stylesheet" href="install.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+ <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+ <link rel="stylesheet" href="install-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+ <?php endif; ?>
</head>
<body>
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
@@ -77,55 +29,49 @@
if ( is_blog_installed() ) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
switch($step) {
-
case 0:
?>
<p><?php printf(__('Welcome to WordPress installation. We&#8217;re now going to go through a few steps to get you up and running with the latest in personal publishing platforms. You may want to peruse the <a href="%s">ReadMe documentation</a> at your leisure.'), '../readme.html'); ?></p>
- <h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>
+<h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>
<?php
- break;
-
+ break;
case 1:
-
?>
<h1><?php _e('First Step'); ?></h1>
<p><?php _e("Before we begin we need a little bit of information. Don't worry, you can always change these later."); ?></p>
<form id="setup" method="post" action="install.php?step=2">
-<table width="100%">
-<tr>
-<th width="33%"><?php _e('Weblog title:'); ?></th>
-<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
-</tr>
-<tr>
-<th><?php _e('Your e-mail:'); ?></th>
- <td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
-</tr>
-<tr>
-<th scope="row" valign="top"> <?php __('Privacy:'); ?></th>
-<td><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('I would like my blog to appear in search engines like Google and Technorati.'); ?></label></td>
-</tr>
-</table>
-<p><em><?php _e('Double-check that email address before continuing.'); ?></em></p>
-<h2 class="step">
-<input type="submit" name="Submit" value="<?php _e('Continue to Second Step &raquo;'); ?>" />
-</h2>
+ <table width="100%">
+ <tr>
+ <th width="33%"><?php _e('Weblog title:'); ?></th>
+ <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
+ </tr>
+ <tr>
+ <th><?php _e('Your e-mail:'); ?></th>
+ <td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
+ </tr>
+ <tr>
+ <th scope="row" valign="top"> <?php __('Privacy:'); ?></th>
+ <td><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('I would like my blog to appear in search engines like Google and Technorati.'); ?></label></td>
+ </tr>
+ </table>
+ <p><em><?php _e('Double-check that email address before continuing.'); ?></em></p>
+ <h2 class="step"><input type="submit" name="Submit" value="<?php _e('Continue to Second Step &raquo;'); ?>" /></h2>
</form>
<?php
- break;
+ break;
case 2:
-
-// Fill in the data we gathered
-$weblog_title = stripslashes($_POST['weblog_title']);
-$admin_email = stripslashes($_POST['admin_email']);
-$public = (int) $_POST['blog_public'];
-// check e-mail address
-if (empty($admin_email)) {
- die (__("<strong>ERROR</strong>: please type your e-mail address"));
-} else if (!is_email($admin_email)) {
- die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
-}
+ // Fill in the data we gathered
+ $weblog_title = stripslashes($_POST['weblog_title']);
+ $admin_email = stripslashes($_POST['admin_email']);
+ $public = (int) $_POST['blog_public'];
+ // check e-mail address
+ if (empty($admin_email)) {
+ die(__("<strong>ERROR</strong>: please type your e-mail address"));
+ } else if (!is_email($admin_email)) {
+ die(__("<strong>ERROR</strong>: the e-mail address isn't correct"));
+ }
?>
<h1><?php _e('Second Step'); ?></h1>
@@ -133,29 +79,30 @@
<?php
-
-$result = wp_install($weblog_title, __('admin'), $admin_email, $public);
-extract($result);
+ $result = wp_install($weblog_title, __('admin'), $admin_email, $public);
+ extract($result);
?>
<p><em><?php _e('Finished!'); ?></em></p>
<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $password); ?></p>
-<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>
-</p>
+<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?></p>
+
<dl>
-<dt><?php _e('Username'); ?></dt>
-<dd><code><?php _e('admin') ?></code></dd>
-<dt><?php _e('Password'); ?></dt>
-<dd><code><?php echo $password; ?></code></dd>
+ <dt><?php _e('Username'); ?></dt>
+ <dd><code><?php _e('admin') ?></code></dd>
+ <dt><?php _e('Password'); ?></dt>
+ <dd><code><?php echo $password; ?></code></dd>
<dt><?php _e('Login address'); ?></dt>
-<dd><a href="../wp-login.php">wp-login.php</a></dd>
+ <dd><a href="../wp-login.php">wp-login.php</a></dd>
</dl>
<p><?php _e('Were you expecting more steps? Sorry to disappoint. All done! :)'); ?></p>
+
<?php
- break;
+ break;
}
?>
+
<p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p>
</body>
-</html>
+</html>
View
90 wp-admin/upgrade.php
@@ -1,86 +1,46 @@
<?php
define('WP_INSTALLING', true);
-if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
+if (!file_exists('../wp-config.php'))
+ die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+
require('../wp-config.php');
timer_start();
require_once(ABSPATH . '/wp-admin/upgrade-functions.php');
-$step = $_GET['step'];
-if (!$step) $step = 0;
-header( 'Content-Type: text/html; charset=utf-8' );
+if (isset($_GET['step']))
+ $step = $_GET['step'];
+else
+ $step = 0;
+@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
?>
<!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>
- <title>WordPress &rsaquo; Upgrade</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <style media="screen" type="text/css">
- <!--
- html {
- background: #eee;
- }
- body {
- background: #fff;
- color: #000;
- font-family: Georgia, "Times New Roman", Times, serif;
- margin-left: 20%;
- margin-right: 20%;
- 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;
- }
-.step a, .step input {
- font-size: 2em;
-}
-.step, th {
- text-align: right;
-}
-#footer {
-text-align: center; border-top: 1px solid #ccc; padding-top: 1em; font-style: italic;
-}
- -->
- </style>
+ <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+ <title><?php _e('WordPress &rsaquo; Upgrade'); ?></title>
+ <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+ <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+ <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+ <?php endif; ?>
</head>
<body>
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
<?php
switch($step) {
-
case 0:
- $goback = wp_specialchars(wp_get_referer());
+ $goback = wp_specialchars(wp_get_referer());
?>
<p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p>
- <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
+<h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
<?php
- break;
-
+ break;
case 1:
- wp_upgrade();
+ wp_upgrade();
- if ( empty( $_GET['backto'] ) )
- $backto = __get_option('home');
- else
- $backto = wp_specialchars( $_GET['backto'] , 1 );
+ if ( empty( $_GET['backto'] ) )
+ $backto = __get_option('home');
+ else
+ $backto = wp_specialchars( $_GET['backto'] , 1 );
?>
<h2><?php _e('Step 1'); ?></h2>
<p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), $backto); ?></p>
@@ -94,8 +54,8 @@
-->
<?php
- break;
+ break;
}
?>
</body>
-</html>
+</html>
Please sign in to comment.
Something went wrong with that request. Please try again.