Make WordPress Core

Ticket #26879: 26879-11.diff

File 26879-11.diff, 10.7 KB (added by kirasong, 10 years ago)

Cleanup, error logo removal, small text tweaks.

  • src/wp-admin/css/install.css

    diff --git src/wp-admin/css/install.css src/wp-admin/css/install.css
    index 1ea9d4b..57c81f3 100644
    body { 
    77        background: #fff;
    88        color: #555;
    99        font-family: "Open Sans", sans-serif;
    10         margin: 140px auto 25px;
    11         padding: 20px 20px 10px 20px;
     10        margin: 8em auto;
     11        padding: 1em 2em;
    1212        max-width: 700px;
    1313        -webkit-font-smoothing: subpixel-antialiased;
    1414        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    submit { 
    187187
    188188#error-page code, .code {
    189189        font-family: Consolas, Monaco, monospace;
     190        background: aliceblue;
    190191}
    191192
    192193#pass-strength-result {
  • src/wp-admin/setup-config.php

    diff --git src/wp-admin/setup-config.php src/wp-admin/setup-config.php
    index 2b5b7f8..358c1f8 100644
    switch($step) { 
    112112                setup_config_display_header();
    113113?>
    114114
    115 <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>
     115<p><?php _e( "OK! We need some information about your database." )?></p>
     116<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>
    116117<ol>
    117118        <li><?php _e( 'Database name' ); ?></li>
    118119        <li><?php _e( 'Database username' ); ?></li>
    119120        <li><?php _e( 'Database password' ); ?></li>
    120121        <li><?php _e( 'Database host' ); ?></li>
    121         <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
    122122</ol>
    123 <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>
    124 <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>
     123<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>
     124<p><?php _e( "If you&#8217;re all ready&hellip;" ); ?></p>
    125125
    126 <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>
     126<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>
    127127<?php
    128128        break;
    129129
    switch($step) { 
    131131                setup_config_display_header();
    132132        ?>
    133133<form method="post" action="setup-config.php?step=2">
    134         <p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
     134        <p><?php _e( "Below you should enter your MySQL database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
    135135        <table class="form-table">
    136136                <tr>
    137137                        <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
    138138                        <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
    139                         <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
     139                        <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
    140140                </tr>
    141141                <tr>
    142142                        <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
    143143                        <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
    144                         <td><?php _e( 'Your MySQL username' ); ?></td>
     144                        <td><?php _e( 'Your database username.' ); ?></td>
    145145                </tr>
    146146                <tr>
    147147                        <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
    148148                        <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
    149                         <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
     149                        <td><?php _e( 'Your database password.' ); ?></td>
    150150                </tr>
    151151                <tr>
    152152                        <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
    switch($step) { 
    169169        foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
    170170                $$key = trim( wp_unslash( $_POST[ $key ] ) );
    171171
    172         $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>';
     172        $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>';
    173173
    174         if ( empty( $prefix ) )
    175                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
     174        // Validate $prefix: it must not be empty
     175        if ( empty( $prefix ) ) {
     176                $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can't be empty. Please go back and try again." ) . '</p>';
     177                $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>';
     178                $die .= ( __( $tryagain_link ) );
     179                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     180        }
    176181
    177182        // Validate $prefix: it can only contain letters, numbers and underscores.
    178         if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
    179                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
     183        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
     184                $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>';
     185                $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>';
     186                $die .= ( __( $tryagain_link ) );
     187                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     188        }
    180189
    181190        // Test the db connection.
    182191        /**#@+
    switch($step) { 
    260269                setup_config_display_header();
    261270?>
    262271<p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
    263 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
     272<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>
    264273<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
    265274                foreach( $config_file as $line ) {
    266275                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');
  • src/wp-includes/functions.php

    diff --git src/wp-includes/functions.php src/wp-includes/functions.php
    index 6fa978c..4ea9993 100644
    function _default_wp_die_handler( $message, $title = '', $args = array() ) { 
    21952195        <style type="text/css">
    21962196                html {
    21972197                        background: #eee;
     2198                        margin: 0 20px;
    21982199                }
    21992200                body {
    22002201                        background: #fff;
    2201                         color: #333;
     2202                        color: #555;
    22022203                        font-family: "Open Sans", sans-serif;
    2203                         margin: 2em auto;
     2204                        margin: 8em auto;
    22042205                        padding: 1em 2em;
    22052206                        max-width: 700px;
     2207                        -webkit-font-smoothing: subpixel-antialiased;
    22062208                        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22072209                        box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22082210                }
    function _default_wp_die_handler( $message, $title = '', $args = array() ) { 
    22152217                        padding: 0;
    22162218                        padding-bottom: 7px;
    22172219                }
    2218                 #error-page {
    2219                         margin-top: 50px;
    2220                 }
    22212220                #error-page p {
    22222221                        font-size: 14px;
    22232222                        line-height: 1.5;
    2224                         margin: 25px 0 20px;
     2223                        padding-bottom: 2px;
    22252224                }
    22262225                #error-page code {
    22272226                        font-family: Consolas, Monaco, monospace;
    22282227                }
     2228                #logo {
     2229                        margin: 6px 0 14px 0;
     2230                        border-bottom: none;
     2231                        text-align:center;
     2232                }
     2233                #logo a {
     2234                        background-image: url('../wp-admin/images/w-logo-blue.png');
     2235                        background-image: none, url('../wp-admin/images/wordpress-logo.svg');
     2236                        background-size: 80px 80px;
     2237                        background-position: center top;
     2238                        background-repeat: no-repeat;
     2239                        color: #999;
     2240                        height: 80px;
     2241                        font-size: 20px;
     2242                        font-weight: normal;
     2243                        line-height: 1.3em;
     2244                        margin: -154px auto 25px;
     2245                        padding: 0;
     2246                        text-decoration: none;
     2247                        width: 80px;
     2248                        text-indent: -9999px;
     2249                        outline: none;
     2250                        overflow: hidden;
     2251                        display: block;
     2252                }
     2253
    22292254                ul li {
    22302255                        margin-bottom: 10px;
    22312256                        font-size: 14px ;
  • src/wp-load.php

    diff --git src/wp-load.php src/wp-load.php
    index fb85953..e2e7f1e 100644
    if ( file_exists( ABSPATH . 'wp-config.php') ) { 
    5353        $path = wp_guess_url() . '/wp-admin/setup-config.php';
    5454
    5555        // Die with an error message
    56         $die  = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
    57         $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
    58         $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>';
    59         $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
     56        $die  = '<h1 id="logo">' . __( "<a href='https://wordpress.org/'>WordPress</a>" ) . '</h1>';
     57        $die .= '<h1 style="text-align: center;">' . __( "Welcome to WordPress!" ) . '</h1>';
     58        $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>';
     59        $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>';
     60        $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>';
     61        $die .= '<p style="text-align: center;"><a href="' . $path . '" class="button button-large">' . __( "Let's Get Started!" ) . '</a>';
    6062
    61         wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     63        wp_die( $die, __( "Welcome to WordPress!" ) );
    6264}