Ticket #26879: 26879-11.diff

src/wp-admin/css/install.css

@@ -7 +7 @@
         background: #fff;
         color: #555;
         font-family: "Open Sans", sans-serif;
-        margin: 140px auto 25px;
-        padding: 20px 20px 10px 20px;
+        margin: 8em auto;
+        padding: 1em 2em;
         max-width: 700px;
         -webkit-font-smoothing: subpixel-antialiased;
         -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
@@ -187 +187 @@
 
 #error-page code, .code {
         font-family: Consolas, Monaco, monospace;
+        background: aliceblue;
 }
 
 #pass-strength-result {

src/wp-admin/setup-config.php

@@ -112 +112 @@
                 setup_config_display_header();
 ?>
 
-<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
+<p><?php _e( "OK! We need some information about your database." )?></p>
+<p><?php _e( "This information is available through your web host. If you don't have it, you'll need to get in touch with them. Here's what you need:" ) ?></p>
 <ol>
         <li><?php _e( 'Database name' ); ?></li>
         <li><?php _e( 'Database username' ); ?></li>
         <li><?php _e( 'Database password' ); ?></li>
         <li><?php _e( 'Database host' ); ?></li>
-        <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
-<p><strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;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><?php _e( "In all likelihood, these items were supplied to you by your Web Host. 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><?php _e( "Once you fill in this information, WordPress will create a configuration file called <code>wp-config.php</code>. This connects WordPress with your database, where your content and settings will be stored. Need more help? Check out our <a href='https://codex.wordpress.org/Editing_wp-config.php'>documentation</a>." ); ?></p>
+<p><?php _e( "If you&#8217;re all ready&hellip;" ); ?></p>
 
-<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
+<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button button-large"><?php _e( 'Let&#8217;s Go!' ); ?></a></p>
 <?php
         break;
 
@@ -131 +131 @@
                 setup_config_display_header();
         ?>
 <form method="post" action="setup-config.php?step=2">
-        <p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
+        <p><?php _e( "Below you should enter your MySQL database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
         <table class="form-table">
                 <tr>
                         <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
                         <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
-                        <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
+                        <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
                 </tr>
                 <tr>
                         <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
                         <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
-                        <td><?php _e( 'Your MySQL username' ); ?></td>
+                        <td><?php _e( 'Your database username.' ); ?></td>
                 </tr>
                 <tr>
                         <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
                         <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
-                        <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
+                        <td><?php _e( 'Your database password.' ); ?></td>
                 </tr>
                 <tr>
                         <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
@@ -169 +169 @@
         foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
                 $$key = trim( wp_unslash( $_POST[ $key ] ) );
 
-        $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+        $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
 
-        if ( empty( $prefix ) )
-                wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+        // Validate $prefix: it must not be empty
+        if ( empty( $prefix ) ) {
+                $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can't be empty. Please go back and try again." ) . '</p>';
+                $die .= '<p style="text-align: center;">' . __( "Need more help? Check out our <a href='https://codex.wordpress.org/Editing_wp-config.php#table_prefix'>documentation</a>." ) . '</p>';
+                $die .= ( __( $tryagain_link ) );
+                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
+        }
 
         // Validate $prefix: it can only contain letters, numbers and underscores.
-        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-                wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+                $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can only contain numbers, letters, and underscores. Please go back and try again. ") . '</p>';
+                $die .= '<p style="text-align: center;">' . __( "Need more help? Check out our <a href='https://codex.wordpress.org/Editing_wp-config.php#table_prefix'>documentation</a>." ) . '</p>';
+                $die .= ( __( $tryagain_link ) );
+                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
+        }
 
         // Test the db connection.
         /**#@+
@@ -260 +269 @@
                 setup_config_display_header();
 ?>
 <p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
-<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
+<p><?php _e( 'To continue, manually create a file named <code>wp-config.php</code> in the root directory where the rest of your WordPress files are located and copy and paste the following text into the file:' ); ?></p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
                 foreach( $config_file as $line ) {
                         echo htmlentities($line, ENT_COMPAT, 'UTF-8');

src/wp-includes/functions.php

@@ -2195 +2195 @@
         <style type="text/css">
                 html {
                         background: #eee;
+                        margin: 0 20px;
                 }
                 body {
                         background: #fff;
-                        color: #333;
+                        color: #555;
                         font-family: "Open Sans", sans-serif;
-                        margin: 2em auto;
+                        margin: 8em auto;
                         padding: 1em 2em;
                         max-width: 700px;
+                        -webkit-font-smoothing: subpixel-antialiased;
                         -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
                         box-shadow: 0 1px 3px rgba(0,0,0,0.13);
                 }
@@ -2215 +2217 @@
                         padding: 0;
                         padding-bottom: 7px;
                 }
-                #error-page {
-                        margin-top: 50px;
-                }
                 #error-page p {
                         font-size: 14px;
                         line-height: 1.5;
-                        margin: 25px 0 20px;
+                        padding-bottom: 2px;
                 }
                 #error-page code {
                         font-family: Consolas, Monaco, monospace;
                 }
+                #logo {
+                        margin: 6px 0 14px 0;
+                        border-bottom: none;
+                        text-align:center;
+                }
+                #logo a {
+                        background-image: url('../wp-admin/images/w-logo-blue.png');
+                        background-image: none, url('../wp-admin/images/wordpress-logo.svg');
+                        background-size: 80px 80px;
+                        background-position: center top;
+                        background-repeat: no-repeat;
+                        color: #999;
+                        height: 80px;
+                        font-size: 20px;
+                        font-weight: normal;
+                        line-height: 1.3em;
+                        margin: -154px auto 25px;
+                        padding: 0;
+                        text-decoration: none;
+                        width: 80px;
+                        text-indent: -9999px;
+                        outline: none;
+                        overflow: hidden;
+                        display: block;
+                }
+
                 ul li {
                         margin-bottom: 10px;
                         font-size: 14px ;

src/wp-load.php

@@ -53 +53 @@
         $path = wp_guess_url() . '/wp-admin/setup-config.php';
 
         // Die with an error message
-        $die  = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
-        $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
-        $die .= '<p>' . __( "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>';
-        $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
+        $die  = '<h1 id="logo">' . __( "<a href='https://wordpress.org/'>WordPress</a>" ) . '</h1>';
+        $die .= '<h1 style="text-align: center;">' . __( "Welcome to WordPress!" ) . '</h1>';
+        $die .= '<p>' . __( "In just a few minutes, you'll be all set up with WordPress and ready to create your own corner of the web." ) . '</p>';
+        $die .= '<p>' . __( "This free and Open Source software is built and maintained by a community of hundreds of volunteers. Transform your website with countless of <a href='https://wordpress.org/plugins/'>plugins</a> and <a href='https://wordpress.org/themes/'>themes</a> available from right within WordPress." ) . '</p>';
+        $die .= '<p>' . __( "Write your blog, build your first website, launch your business, share your photos with your friends. You can do just about anything you can imagine." ) . '</p>';
+        $die .= '<p style="text-align: center;"><a href="' . $path . '" class="button button-large">' . __( "Let's Get Started!" ) . '</a>';
 
-        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
+        wp_die( $die, __( "Welcome to WordPress!" ) );
 }