WordPress.org
Get WordPress

Make WordPress Core

Ticket #26879: 26879-6.patch

File 26879-6.patch, 11.5 KB (added by mrtortai, 11 years ago)

  • wp-admin/css/install.css

     
    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);
    … …  
    187187
    188188#error-page code, .code {
    189189        font-family: Consolas, Monaco, monospace;
     190        background: aliceblue;
    190191}
    191192
    192193#pass-strength-result {

  • wp-admin/css/wp-admin.css

     
    99839983.login form {
    99849984        margin-top: 20px;
    99859985        margin-left: 0;
    9986         padding: 26px 24px 46px;
     9986        padding: 19px 24px 25px 24px;
    99879987        font-weight: normal;
    99889988        overflow: hidden;
    99899989        background: #fff;

  • wp-admin/setup-config.php

     
    116116                setup_config_display_header();
    117117?>
    118118
    119 <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>
     119
     120<p><?php _e( "To get started, we need some information on the database. 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>
    120121<ol>
    121122        <li><?php _e( 'Database name' ); ?></li>
    122123        <li><?php _e( 'Database username' ); ?></li>
    … …  
    124125        <li><?php _e( 'Database host' ); ?></li>
    125126        <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
    126127</ol>
    127 <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>
    128 <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>
     128<p><?php _e( "Once you fill in this information, WordPress will create a configuration file called wp-config.php. This connects WordPress with your database (that's where your content, settings, photos, and all that good stuff is stored). Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?></p>
     129<p><?php _e( "If you&#8217;re all ready&hellip;" ); ?></p>
    129130
    130131<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>
    131132<?php
    … …  
    135136                setup_config_display_header();
    136137        ?>
    137138<form method="post" action="setup-config.php?step=2">
    138         <p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
     139        <p><?php _e( "Below you should enter your MySQL database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
    139140        <table class="form-table">
    140141                <tr>
    141142                        <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
    142143                        <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
    143                         <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
     144                        <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
    144145                </tr>
    145146                <tr>
    146147                        <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
    147148                        <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
    148                         <td><?php _e( 'Your MySQL username' ); ?></td>
     149                        <td><?php _e( 'Your database username' ); ?></td>
    149150                </tr>
    150151                <tr>
    151152                        <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
    152153                        <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
    153                         <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
     154                        <td><?php _e( '&hellip;and your database password.' ); ?></td>
    154155                </tr>
    155156                <tr>
    156157                        <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
    … …  
    175176
    176177        $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>';
    177178
    178         if ( empty( $prefix ) )
    179                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
    180 
     179        // Validate $prefix: it must not be empty
     180        if ( empty( $prefix ) ):
     181                $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     182                $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field should not be empty. <br /> Please go back and try again. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>We got it</a>." ) . '</p>';
     183                $die .= ( __( $tryagain_link ) );
     184                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     185        endif;
     186               
    181187        // Validate $prefix: it can only contain letters, numbers and underscores.
    182         if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
    183                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
     188        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ):
     189                $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     190                $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can only contain numbers, letters, and underscores. <br />Please go back and try again. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>We got it</a>." ) . '</p>';
     191                $die .= ( __( $tryagain_link ) );
     192                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     193        endif;
    184194
    185195        // Test the db connection.
    186196        /**#@+
    … …  
    263273        if ( ! is_writable(ABSPATH) ) :
    264274                setup_config_display_header();
    265275?>
    266 <p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
    267 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
     276<p><?php _e( 'Please manually create a file called <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>
    268277<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
    269278                foreach( $config_file as $line ) {
    270279                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');

  • wp-includes/functions.php

     
    22062206        <style type="text/css">
    22072207                html {
    22082208                        background: #eee;
     2209                        margin: 0 20px;
    22092210                }
    22102211                body {
    22112212                        background: #fff;
    2212                         color: #333;
     2213                        color: #555;
    22132214                        font-family: "Open Sans", sans-serif;
    2214                         margin: 2em auto;
     2215                        margin: 8em auto;
    22152216                        padding: 1em 2em;
    22162217                        max-width: 700px;
     2218                        -webkit-font-smoothing: subpixel-antialiased;
    22172219                        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22182220                        box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22192221                }
    … …  
    22262228                        padding: 0;
    22272229                        padding-bottom: 7px;
    22282230                }
    2229                 #error-page {
    2230                         margin-top: 50px;
    2231                 }
    22322231                #error-page p {
    22332232                        font-size: 14px;
    22342233                        line-height: 1.5;
    2235                         margin: 25px 0 20px;
     2234                        padding-bottom: 2px;
     2235                        /*margin: 25px 0 20px;*/
    22362236                }
    22372237                #error-page code {
    22382238                        font-family: Consolas, Monaco, monospace;
    22392239                }
     2240                #logo {
     2241                        margin: 6px 0 14px 0;
     2242                        border-bottom: none;
     2243                        text-align:center;
     2244                }
     2245                #logo a {
     2246                        background-image: url('/wp-admin/images/w-logo-blue.png?ver=20131202');
     2247                        background-image: none, url('/wp-admin/images/wordpress-logo.svg?ver=20131107');
     2248                        background-size: 80px 80px;
     2249                        background-position: center top;
     2250                        background-repeat: no-repeat;
     2251                        color: #999;
     2252                        height: 80px;
     2253                        font-size: 20px;
     2254                        font-weight: normal;
     2255                        line-height: 1.3em;
     2256                        margin: -154px auto 25px;
     2257                        padding: 0;
     2258                        text-decoration: none;
     2259                        width: 80px;
     2260                        text-indent: -9999px;
     2261                        outline: none;
     2262                        overflow: hidden;
     2263                        display: block;
     2264                }
     2265
    22402266                ul li {
    22412267                        margin-bottom: 10px;
    22422268                        font-size: 14px ;

  • wp-includes/wp-db.php

     
    903903                if ( !@mysql_select_db( $db, $dbh ) ) {
    904904                        $this->ready = false;
    905905                        wp_load_translations_early();
    906                         $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
     906                        $this->bail( sprintf( __( '<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1>
     907<h1>Can&#8217;t select database</h1>
    907908<p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p>
    908909<ul>
    909910<li>Are you sure it exists?</li>
    … …  
    12431244                        }
    12441245
    12451246                        $this->bail( sprintf( __( "
     1247<h1 id='logo'><a href='http://wordpress.org/'>WordPress</a></h1>
    12461248<h1>Error establishing a database connection</h1>
    12471249<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
    12481250<ul>

  • wp-load.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>';
    60 
    61         wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     56        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     57        $die .= '<h1 style="text-align: center;">' . __( "Welcome to WordPress!" ) . '</h1>';
     58        $die .= '<p>' . __( "WordPress is web software you can use to create a beautiful website, blog, or almost <a href='http://wordpress.org/showcase/'>anything you can imagine</a>. The core software is built by hundreds of community volunteers, and there are thousands of <a href='http://wordpress.org/plugins/'>plugins</a> and <a href='http://wordpress.org/themes/'>themes</a> available to transform your site." ) . '</p>';
     59        $die .= '<p style="text-align: center;">' . __( "We'd love you to join the family." ) . '</p>';
     60        $die .= '<p style="text-align: center;"><a href="' . $path . '" class="button button-large">' . __( "Let's Get Started!" ) . '</a>';
     61        wp_die( $die, __( "Welcome to WordPress!" ) );
    6262}