diff --git a/wp-admin/css/install.css b/wp-admin/css/install.css index 5eb85cd316..c7cc047071 100644 --- a/wp-admin/css/install.css +++ b/wp-admin/css/install.css @@ -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; } -#footer { - text-align: center; - border-top: 1px solid #ccc; - padding-top: 1em; - font-style: italic; +.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%; +} + +.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; } \ No newline at end of file diff --git a/wp-admin/install.php b/wp-admin/install.php index 9f73ca1141..885d1e1258 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -3,7 +3,7 @@ define('WP_INSTALLING', true); 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 wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, 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 wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

Create a Configuration File", "WordPress › Error"); } require_once('../wp-config.php'); @@ -45,22 +45,21 @@ switch($step) {

- +
- + - - + + - - +

+
 
-

-

+
ERROR: you must provide an e-mail address")); + die(__("

ERROR: you must provide an e-mail address.

")); } else if (!is_email($admin_email)) { // TODO: poka-yoke die(__('ERROR: that isn\'t a valid e-mail address. E-mail addresses look like: username@example.com')); @@ -90,24 +89,25 @@ switch($step) {

-

log in with the username "admin" and password "%2$s".'), '../wp-login.php', $password); ?>

-

Note that password carefully! It is a random password that was generated just for you.'); ?>

+

-
-
-
admin
-
-
-
-
wp-login.php
-
-

+ + + + + + + + + +
admin

+ Note that password carefully! It is a random password that was generated just for you.

'); ?>
+ +

Log In - -

\ No newline at end of file diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index dcf640ed3a..520e3940f6 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -33,59 +33,8 @@ function display_header(){ WordPress › Setup Configuration File + -

WordPress

@@ -106,17 +55,18 @@ switch($step) {
  • Table prefix (if you want to run more than one WordPress in a single database)

    • 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 wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php.

    -

    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’re all ready, let’s go!

    +

    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’re all ready…

    + +

    Let’s go!

    -

    Below you should enter your database connection details. If you're not sure about these, contact your host.

    - +
    @@ -144,7 +94,7 @@ switch($step) {
    Database Name

    - +

    -

    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 run the install!

    +

    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…

    + +

    Run the install

    - diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index dd70e4e3c7..4b7d3c15cd 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -1,7 +1,7 @@ wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, 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 wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

    Create a Configuration File"); require('../wp-config.php'); timer_start(); diff --git a/wp-blog-header.php b/wp-blog-header.php index 0e2db8b6e6..ff81b46c82 100644 --- a/wp-blog-header.php +++ b/wp-blog-header.php @@ -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/functions.php'); require_once( dirname(__FILE__) . '/wp-includes/plugin.php'); - wp_die("There doesn't seem to be a wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, 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 wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

    Create a Configuration File", "WordPress › Error"); } $wp_did_header = true;