forked from WordPress/WordPress
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Style updates for install from mt. fixes #5946
git-svn-id: http://svn.automattic.com/wordpress/trunk@6965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
- Loading branch information
ryan
committed
Feb 21, 2008
1 parent
e6a1bad
commit 4a89a7e
Showing
5 changed files
with
123 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,111 @@ | ||
| html { background: #eee; } | ||
| html { background: #f1f1f1; } | ||
|
|
||
| body { | ||
| background: #fff; | ||
| color: #000; | ||
| font-family: Georgia, "Times New Roman", Times, serif; | ||
| margin-left: 20%; | ||
| margin-right: 20%; | ||
| padding: .2em 2em; | ||
| color: #333; | ||
| font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; | ||
| margin: 2em auto 0 auto; | ||
| width: 700px; | ||
| padding: 1em 2em; | ||
| -webkit-border-radius: 12px; | ||
| font-size: 62.5%; | ||
| } | ||
|
|
||
| a { color: #2583ad; text-decoration: none; } | ||
|
|
||
| a:hover { color: #d54e21; } | ||
|
|
||
|
|
||
| h1 { | ||
| color: #006; | ||
| font-size: 18px; | ||
| font-weight: lighter; | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| h2 { font-size: 16px; } | ||
|
|
||
| p, li, dt { | ||
| line-height: 140%; | ||
| p, li { | ||
| 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; } | ||
|
|
||
| td input { font-size: 1.5em; } | ||
|
|
||
| .step, th { text-align: right; } | ||
| .step, th { text-align: left; padding: 0; } | ||
|
|
||
| .submit input, .button, .button-secondary { | ||
| font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; | ||
| padding: 6px; | ||
| border: none; | ||
| 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%; | ||
| } | ||
|
|
||
| #footer { | ||
| text-align: center; | ||
| border-top: 1px solid #ccc; | ||
| padding-top: 1em; | ||
| font-style: italic; | ||
| .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; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| if (!file_exists('../wp-config.php')) { | ||
| require_once('../wp-includes/compat.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 › 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 › Error"); | ||
| } | ||
|
|
||
| require_once('../wp-config.php'); | ||
|
|
@@ -45,22 +45,21 @@ function display_header(){ | |
| <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"> | ||
| <table width="100%"> | ||
| <table class="niceblue"> | ||
| <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> | ||
| </tr> | ||
| <tr> | ||
| <th><?php _e('Your e-mail:'); ?></th> | ||
| <td><input name="admin_email" type="text" id="admin_email" size="25" /></td> | ||
| <th><?php _e('Your E-mail'); ?></th> | ||
| <td><input name="admin_email" type="text" id="admin_email" size="25" /><br /> | ||
| <?php _e('Double-check your email address before continuing.'); ?> | ||
| </tr> | ||
| <tr> | ||
| <td> </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> | ||
| <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> | ||
| </tr> | ||
| </table> | ||
| <p><em><?php _e('Double-check your email address before continuing.'); ?></em></p> | ||
| <h2 class="step"><input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" /></h2> | ||
| <input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" /> | ||
| </form> | ||
|
|
||
| <?php | ||
|
|
@@ -77,7 +76,7 @@ function display_header(){ | |
| // check e-mail address | ||
| if (empty($admin_email)) { | ||
| // 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)) { | ||
| // TODO: poka-yoke | ||
| die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address. E-mail addresses look like: <code>[email protected]</code>')); | ||
|
|
@@ -90,24 +89,25 @@ function display_header(){ | |
|
|
||
| <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 _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.'); ?></p> | ||
| <p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p> | ||
|
|
||
| <dl> | ||
| <dt><?php _e('Username'); ?></dt> | ||
| <dd><code>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> | ||
| </dl> | ||
| <p><?php _e('Were you expecting more steps? Sorry to disappoint. :)'); ?></p> | ||
| <table class="niceblue"> | ||
| <tr> | ||
| <th><?php _e('Username'); ?></th> | ||
| <td><code>admin</code></td> | ||
| </tr> | ||
| <tr> | ||
| <th><?php _e('Password'); ?></th> | ||
| <td><code><?php echo $password; ?></code><br /> | ||
| <?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 | ||
| break; | ||
| } | ||
| ?> | ||
|
|
||
| <p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p> | ||
| </body> | ||
| </html> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters