Ticket #5946: 5946.diff

File 5946.diff, 13.2 kB (added by iammattthomas, 7 months ago)

Patch applies new style for install

  • wp-blog-header.php

    old new  
    88        require_once( dirname(__FILE__) . '/wp-includes/classes.php'); 
    99        require_once( dirname(__FILE__) . '/wp-includes/functions.php'); 
    1010        require_once( dirname(__FILE__) . '/wp-includes/plugin.php'); 
    11         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='{$path}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 &rsaquo; Error"); 
     11        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='{$path}setup-config.php' class='button'>Create a Configuration File</a>", "WordPress &rsaquo; Error"); 
    1212} 
    1313 
    1414$wp_did_header = true; 

  • wp-admin/upgrade.php

    old new  
    11<?php 
    22define('WP_INSTALLING', true); 
    33if (!file_exists('../wp-config.php')) 
    4         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/Installing_WordPress#Step_3:_Set_up_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."); 
     4        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/Installing_WordPress#Step_3:_Set_up_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>"); 
    55 
    66require('../wp-config.php'); 
    77timer_start(); 

  • wp-admin/css/install.css

    old new  
    1 html { background: #eee; } 
     1html { background: #f1f1f1; } 
    22 
    33body { 
    44        background: #fff; 
    5         color: #000; 
    6         font-family: Georgia, "Times New Roman", Times, serif; 
    7         margin-left: 20%; 
    8         margin-right: 20%; 
    9         padding: .2em 2em; 
     5        color: #333; 
     6        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; 
     7        margin: 2em auto 0 auto; 
     8        width: 700px; 
     9        padding: 1em 2em; 
     10        -webkit-border-radius: 12px; 
     11        font-size: 62.5%; 
    1012} 
    1113 
     14a { color: #2583ad; text-decoration: none; } 
     15 
     16a:hover { color: #d54e21; } 
     17 
     18 
    1219h1 { 
    13         color: #006; 
    1420        font-size: 18px; 
    15         font-weight: lighter; 
     21        margin-bottom: 0; 
    1622} 
    1723 
    1824h2 { font-size: 16px; } 
    1925 
    20 p, li, dt { 
    21         line-height: 140%; 
     26p, li { 
    2227        padding-bottom: 2px; 
     28        font-size: 1.3em; 
     29        line-height: 1.8em; 
    2330} 
    2431 
    25 ul, ol { padding: 5px 5px 5px 20px; } 
     32code { 
     33        font-size: 1.3em; 
     34} 
    2635 
    27 #logo { margin-bottom: 2em; } 
     36ul, ol { padding: 5px 5px 5px 22px; } 
    2837 
     38#logo { margin: 6px 0 14px 0px; border-bottom: none;} 
     39 
    2940.step a, .step input { font-size: 2em; } 
    3041 
    3142td input { font-size: 1.5em; } 
    3243 
    33 .step, th { text-align: right; } 
     44.step, th { text-align: left; padding: 0; } 
    3445 
    35 #footer { 
    36         text-align: center;  
    37         border-top: 1px solid #ccc;  
    38         padding-top: 1em;  
    39         font-style: italic; 
     46.submit input, .button, .button-secondary { 
     47        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; 
     48        padding: 6px; 
     49        border: none; 
     50        margin-left: 0; 
     51        font-size: 13px !important; 
     52        -moz-border-radius: 2px; 
     53        -khtml-border-radius: 2px;       
     54        -webkit-border-radius: 2px; 
     55        border-radius: 2px; 
     56        color: #246; 
     57        background: #e5e5e5; 
     58} 
     59 
     60.button-secondary { 
     61        background: #cee1ef; 
     62} 
     63 
     64.submit input:hover, .button:hover, .button-secondary:hover { 
     65        color: #d54e21; 
     66} 
     67 
     68.niceblue { 
     69        border-collapse: collapse; 
     70        margin-top: 1em; 
     71        width: 100%; 
     72} 
     73 
     74.niceblue td { 
     75        margin-bottom: 9px; 
     76        padding: 10px; 
     77        border-bottom: 8px solid #fff; 
     78} 
     79 
     80.niceblue th { 
     81        font-size: 12px; 
     82        text-align: left; 
     83        padding: 12px 10px 10px 10px; 
     84        border-bottom: 8px solid #fff; 
     85        width: 110px; 
     86        vertical-align: top; 
     87} 
     88 
     89.niceblue tr { 
     90        background: #eaf3fa; 
     91} 
     92 
     93.niceblue code { 
     94        line-height: 18px; 
     95        font-size: 18px; 
     96} 
     97 
     98.niceblue p { 
     99        margin: 4px 0 0 0; 
     100        font-size: 11px; 
     101} 
     102 
     103h1 { 
     104        border-bottom: 1px solid #dadada; 
     105        clear: both; 
     106        color: #666666; 
     107        font: 24px Georgia, "Times New Roman", Times, serif; 
     108        margin: 5px 0 0 -4px; 
     109        padding: 0; 
     110        padding-bottom: 7px; 
    40111} 

  • wp-admin/setup-config.php

    old new  
    3333<head> 
    3434<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    3535<title>WordPress &rsaquo; Setup Configuration File</title> 
     36<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install.css" type="text/css" /> 
    3637 
    37 <style media="screen" type="text/css"> 
    38         <!-- 
    39         html { 
    40                 background: #eee; 
    41         } 
    42         body { 
    43                 background: #fff; 
    44                 color: #000; 
    45                 font-family: Georgia, "Times New Roman", Times, serif; 
    46                 margin-left: 20%; 
    47                 margin-right: 20%; 
    48                 padding: .2em 2em; 
    49         } 
    50  
    51         h1 { 
    52                 color: #006; 
    53                 font-size: 18px; 
    54                 font-weight: lighter; 
    55         } 
    56  
    57         h2 { 
    58                 font-size: 16px; 
    59         } 
    60  
    61         p, li, dt { 
    62                 line-height: 140%; 
    63                 padding-bottom: 2px; 
    64         } 
    65  
    66         ul, ol { 
    67                 padding: 5px 5px 5px 20px; 
    68         } 
    69         #logo { 
    70                 margin-bottom: 2em; 
    71         } 
    72         .step a, .step input { 
    73                 font-size: 2em; 
    74         } 
    75         td input { 
    76                 font-size: 1.5em; 
    77         } 
    78         .step, th { 
    79                 text-align: right; 
    80         } 
    81         #footer { 
    82                 text-align: center; 
    83                 border-top: 1px solid #ccc; 
    84                 padding-top: 1em; 
    85                 font-style: italic; 
    86         } 
    87         --> 
    88         </style> 
    8938</head> 
    9039<body> 
    9140<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> 
    …… 
    10655        <li>Table prefix (if you want to run more than one WordPress in a single database) </li> 
    10756</ol> 
    10857<p><strong>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 <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> 
    109 <p>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&#8217;re all ready, <a href="setup-config.php?step=1">let&#8217;s go</a>! </p> 
     58<p>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&#8217;re all ready&hellip;</p> 
     59 
     60<p><a href="setup-config.php?step=1" class="button">Let&#8217;s go!</a></p> 
    11061<?php 
    11162        break; 
    11263 
    11364        case 1: 
    11465                display_header(); 
    11566        ?> 
    116 </p> 
    11767<form method="post" action="setup-config.php?step=2"> 
    11868        <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p> 
    119         <table> 
     69        <table class="niceblue"> 
    12070                <tr> 
    12171                        <th scope="row">Database Name</th> 
    12272                        <td><input name="dbname" type="text" size="25" value="wordpress" /></td> 
    …… 
    14494                </tr> 
    14595        </table> 
    14696        <h2 class="step"> 
    147         <input name="submit" type="submit" value="Submit" /> 
     97        <input name="submit" type="submit" value="Submit" class="button" /> 
    14898        </h2> 
    14999</form> 
    150100<?php 
    …… 
    197147 
    198148        display_header(); 
    199149?> 
    200 <p>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 <a href="install.php">run the install!</a></p> 
     150<p>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&hellip;</p> 
     151 
     152<p><a href="install.php" class="button">Run the install</a></p> 
    201153<?php 
    202154        break; 
    203155} 
    204156?> 
    205 <p id="footer"><a href="http://wordpress.org/">WordPress</a>, personal publishing platform.</p> 
    206157</body> 
    207158</html> 

  • wp-admin/install.php

    old new  
    33if (!file_exists('../wp-config.php')) { 
    44  require_once('../wp-includes/compat.php'); 
    55  require_once('../wp-includes/functions.php'); 
    6   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 &rsaquo; Error"); 
     6  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 &rsaquo; Error"); 
    77} 
    88 
    99require_once('../wp-config.php'); 
    …… 
    4545<p><?php _e("Please provide the following information.  Don't worry, you can always change these settings later."); ?></p> 
    4646 
    4747<form id="setup" method="post" action="install.php?step=2"> 
    48         <table width="100%"> 
     48        <table class="niceblue"> 
    4949                <tr> 
    50                         <th width="33%"><?php _e('Blog title:'); ?></th> 
     50                        <th scope="row"><?php _e('Blog Title'); ?></th> 
    5151                        <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td> 
    5252                </tr> 
    5353                <tr> 
    54                         <th><?php _e('Your e-mail:'); ?></th> 
    55                         <td><input name="admin_email" type="text" id="admin_email" size="25" /></td> 
     54                        <th><?php _e('Your E-mail'); ?></th> 
     55                        <td><input name="admin_email" type="text" id="admin_email" size="25" /><br /> 
     56                        <?php _e('Double-check your email address before continuing.'); ?> 
    5657                </tr> 
    5758                <tr> 
    58                         <td>&nbsp;</td> 
    59                         <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> 
     59                        <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> 
    6060                </tr> 
    6161        </table> 
    62         <p><em><?php _e('Double-check your email address before continuing.'); ?></em></p> 
    63         <h2 class="step"><input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" /></h2> 
     62        <input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" /> 
    6463</form> 
    6564 
    6665<?php 
    …… 
    7776                // check e-mail address 
    7877                if (empty($admin_email)) { 
    7978                        // TODO: poka-yoke 
    80                         die(__("<strong>ERROR</strong>: you must provide an e-mail address")); 
     79                        die(__("<p><strong>ERROR</strong>: you must provide an e-mail address.</p>")); 
    8180                } else if (!is_email($admin_email)) { 
    8281                        // TODO: poka-yoke 
    8382                        die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>')); 
    …… 
    9089 
    9190<h1><?php _e('Success!'); ?></h1> 
    9291 
    93 <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> 
    94 <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> 
     92<p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p> 
    9593 
    96 <dl> 
    97         <dt><?php _e('Username'); ?></dt> 
    98                 <dd><code>admin</code></dd> 
    99         <dt><?php _e('Password'); ?></dt> 
    100                 <dd><code><?php echo $password; ?></code></dd> 
    101         <dt><?php _e('Login address'); ?></dt> 
    102                 <dd><a href="../wp-login.php">wp-login.php</a></dd> 
    103 </dl> 
    104 <p><?php _e('Were you expecting more steps? Sorry to disappoint. :)'); ?></p> 
     94<table class="niceblue"> 
     95        <tr> 
     96                <th><?php _e('Username'); ?></th> 
     97                <td><code>admin</code></td> 
     98        </tr> 
     99        <tr> 
     100                <th><?php _e('Password'); ?></th> 
     101                <td><code><?php echo $password; ?></code><br /> 
     102                        <?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> 
     103        </tr> 
     104</table> 
    105105 
     106<p><a href="../wp-login.php" class="button">Log In</a> 
     107 
    106108<?php 
    107109                break; 
    108110} 
    109111?> 
    110  
    111 <p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p> 
    112112</body> 
    113113</html>