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

Style updates for install from mt. fixes #5946 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-02-21 23:55:11 +00:00
parent e6a1bade1c
commit 4a89a7ee40
5 changed files with 123 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
wp-admin/css/install.css
View File

@ -1,40 +1,111 @@
html { background: #eee; } html { background: #f1f1f1; }
body { body {
background: #fff; background: #fff;
color: #000; color: #333;
font-family: Georgia, "Times New Roman", Times, serif; font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
margin-left: 20%; margin: 2em auto 0 auto;
margin-right: 20%; width: 700px;
padding: .2em 2em; padding: 1em 2em;
-webkit-border-radius: 12px;
font-size: 62.5%;
} }
a { color: #2583ad; text-decoration: none; }
a:hover { color: #d54e21; }
h1 { h1 {
color: #006;
font-size: 18px; font-size: 18px;
font-weight: lighter; margin-bottom: 0;
} }
h2 { font-size: 16px; } h2 { font-size: 16px; }
p, li, dt { p, li {
line-height: 140%;
padding-bottom: 2px; padding-bottom: 2px;
font-size: 1.3em;
line-height: 1.8em;
} }
ul, ol { padding: 5px 5px 5px 20px; } code {
font-size: 1.3em;
}
#logo { margin-bottom: 2em; } ul, ol { padding: 5px 5px 5px 22px; }
#logo { margin: 6px 0 14px 0px; border-bottom: none;}
.step a, .step input { font-size: 2em; } .step a, .step input { font-size: 2em; }
td input { font-size: 1.5em; } td input { font-size: 1.5em; }
.step, th { text-align: right; } .step, th { text-align: left; padding: 0; }
#footer { .submit input, .button, .button-secondary {
text-align: center; font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
border-top: 1px solid #ccc; padding: 6px;
padding-top: 1em; border: none;
font-style: italic; margin-left: 0;
font-size: 13px !important;
-moz-border-radius: 2px;
-khtml-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
color: #246;
background: #e5e5e5;
}
.button-secondary {
background: #cee1ef;
}
.submit input:hover, .button:hover, .button-secondary:hover {
color: #d54e21;
}
.niceblue {
border-collapse: collapse;
margin-top: 1em;
width: 100%;
}
.niceblue td {
margin-bottom: 9px;
padding: 10px;
border-bottom: 8px solid #fff;
}
.niceblue th {
font-size: 12px;
text-align: left;
padding: 12px 10px 10px 10px;
border-bottom: 8px solid #fff;
width: 110px;
vertical-align: top;
}
.niceblue tr {
background: #eaf3fa;
}
.niceblue code {
line-height: 18px;
font-size: 18px;
}
.niceblue p {
margin: 4px 0 0 0;
font-size: 11px;
}
h1 {
border-bottom: 1px solid #dadada;
clear: both;
color: #666666;
font: 24px Georgia, "Times New Roman", Times, serif;
margin: 5px 0 0 -4px;
padding: 0;
padding-bottom: 7px;
} }

46
wp-admin/install.php
View File

@ -3,7 +3,7 @@ define('WP_INSTALLING', true);
if (!file_exists('../wp-config.php')) { if (!file_exists('../wp-config.php')) {
require_once('../wp-includes/compat.php'); require_once('../wp-includes/compat.php');
require_once('../wp-includes/functions.php'); require_once('../wp-includes/functions.php');
wp_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/Editing_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.", "WordPress &rsaquo; Error"); wp_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/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='setup-config.php' class='button'>Create a Configuration File</a>", "WordPress &rsaquo; Error");
} }
require_once('../wp-config.php'); require_once('../wp-config.php');
@ -45,22 +45,21 @@ switch($step) {
<p><?php _e("Please provide the following information. Don't worry, you can always change these settings later."); ?></p> <p><?php _e("Please provide the following information. Don't worry, you can always change these settings later."); ?></p>
<form id="setup" method="post" action="install.php?step=2"> <form id="setup" method="post" action="install.php?step=2">
<table width="100%"> <table class="niceblue">
<tr> <tr>
<th width="33%"><?php _e('Blog title:'); ?></th> <th scope="row"><?php _e('Blog Title'); ?></th>
<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td> <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
</tr> </tr>
<tr> <tr>
<th><?php _e('Your e-mail:'); ?></th> <th><?php _e('Your E-mail'); ?></th>
<td><input name="admin_email" type="text" id="admin_email" size="25" /></td> <td><input name="admin_email" type="text" id="admin_email" size="25" /><br />
<?php _e('Double-check your email address before continuing.'); ?>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('Allow my blog to appear in search engines like Google and Technorati.'); ?></label></td>
<td><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('Allow my blog to appear in search engines like Google and Technorati.'); ?></label></td>
</tr> </tr>
</table> </table>
<p><em><?php _e('Double-check your email address before continuing.'); ?></em></p> <input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" />
<h2 class="step"><input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" /></h2>
</form> </form>
<?php <?php
@ -77,7 +76,7 @@ switch($step) {
// check e-mail address // check e-mail address
if (empty($admin_email)) { if (empty($admin_email)) {
// TODO: poka-yoke // TODO: poka-yoke
die(__("<strong>ERROR</strong>: you must provide an e-mail address")); die(__("<p><strong>ERROR</strong>: you must provide an e-mail address.</p>"));
} else if (!is_email($admin_email)) { } else if (!is_email($admin_email)) {
// TODO: poka-yoke // TODO: poka-yoke
die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>')); die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>'));
@ -90,24 +89,25 @@ switch($step) {
<h1><?php _e('Success!'); ?></h1> <h1><?php _e('Success!'); ?></h1>
<p><?php printf(__('WordPress has been installed. 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 printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></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.'); ?></p>
<dl> <table class="niceblue">
<dt><?php _e('Username'); ?></dt> <tr>
<dd><code>admin</code></dd> <th><?php _e('Username'); ?></th>
<dt><?php _e('Password'); ?></dt> <td><code>admin</code></td>
<dd><code><?php echo $password; ?></code></dd> </tr>
<dt><?php _e('Login address'); ?></dt> <tr>
<dd><a href="../wp-login.php">wp-login.php</a></dd> <th><?php _e('Password'); ?></th>
</dl> <td><code><?php echo $password; ?></code><br />
<p><?php _e('Were you expecting more steps? Sorry to disappoint. :)'); ?></p> <?php _e('<p><strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.</p>'); ?></td>
</tr>
</table>
<p><a href="../wp-login.php" class="button">Log In</a>
<?php <?php
break; break;
} }
?> ?>
<p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p>
</body> </body>
</html> </html>

67
wp-admin/setup-config.php
View File

@ -33,59 +33,8 @@ function display_header(){
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>WordPress &rsaquo; Setup Configuration File</title> <title>WordPress &rsaquo; Setup Configuration File</title>
<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install.css" type="text/css" />
<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>
</head> </head>
<body> <body>
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
@ -106,17 +55,18 @@ switch($step) {
<li>Table prefix (if you want to run more than one WordPress in a single database) </li> <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
</ol> </ol>
<p><strong>If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>. </strong></p> <p><strong>If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>. </strong></p>
<p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready, <a href="setup-config.php?step=1">let&#8217;s go</a>! </p> <p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;</p>
<p><a href="setup-config.php?step=1" class="button">Let&#8217;s go!</a></p>
<?php <?php
break; break;
case 1: case 1:
display_header(); display_header();
?> ?>
</p>
<form method="post" action="setup-config.php?step=2"> <form method="post" action="setup-config.php?step=2">
<p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p> <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
<table> <table class="niceblue">
<tr> <tr>
<th scope="row">Database Name</th> <th scope="row">Database Name</th>
<td><input name="dbname" type="text" size="25" value="wordpress" /></td> <td><input name="dbname" type="text" size="25" value="wordpress" /></td>
@ -144,7 +94,7 @@ switch($step) {
</tr> </tr>
</table> </table>
<h2 class="step"> <h2 class="step">
<input name="submit" type="submit" value="Submit" /> <input name="submit" type="submit" value="Submit" class="button" />
</h2> </h2>
</form> </form>
<?php <?php
@ -197,11 +147,12 @@ switch($step) {
display_header(); display_header();
?> ?>
<p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to <a href="install.php">run the install!</a></p> <p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;</p>
<p><a href="install.php" class="button">Run the install</a></p>
<?php <?php
break; break;
} }
?> ?>
<p id="footer"><a href="http://wordpress.org/">WordPress</a>, personal publishing platform.</p>
</body> </body>
</html> </html>

2
wp-admin/upgrade.php
View File

@ -1,7 +1,7 @@
<?php <?php
define('WP_INSTALLING', true); define('WP_INSTALLING', true);
if (!file_exists('../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."); 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 create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='setup-config.php' class='button'>Create a Configuration File</a>");
require('../wp-config.php'); require('../wp-config.php');
timer_start(); timer_start();

2
wp-blog-header.php
View File

@ -8,7 +8,7 @@ if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
require_once( dirname(__FILE__) . '/wp-includes/classes.php'); require_once( dirname(__FILE__) . '/wp-includes/classes.php');
require_once( dirname(__FILE__) . '/wp-includes/functions.php'); require_once( dirname(__FILE__) . '/wp-includes/functions.php');
require_once( dirname(__FILE__) . '/wp-includes/plugin.php'); require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
wp_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/Editing_wp-config.php'>We got it</a>. You can <a href='{$path}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.", "WordPress &rsaquo; Error"); wp_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/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='{$path}setup-config.php' class='button'>Create a Configuration File</a>", "WordPress &rsaquo; Error");
} }
$wp_did_header = true; $wp_did_header = true;