Changes from branches/2.3/wp-admin/install.php at r6470 to trunk/wp-admin/install.php at r7294

File:

• trunk/wp-admin/install.php (modified) (7 diffs)

trunk/wp-admin/install.php

@@ -4 +4 @@
   require_once('../wp-includes/compat.php');
   require_once('../wp-includes/functions.php');
-  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");
+  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");
 }
 
@@ -40 +40 @@
 <h1><?php _e('Welcome'); ?></h1>
 <p><?php printf(__('Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure.  Otherwise, just fill in the information below and you\'ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?></p>
-<!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>-->
+<!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step'); ?></a></h2>-->
 
 <h1><?php _e('Information needed'); ?></h1>
@@ -46 +46 @@
 
 <form id="setup" method="post" action="install.php?step=2">
-    <table width="100%">
+    <table class="form-table">
         <tr>
-            <th width="33%"><?php _e('Blog title:'); ?></th>
+            <th scope="row"><label for="weblog_title"><?php _e('Blog Title'); ?></label></th>
             <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
         </tr>
         <tr>
-            <th><?php _e('Your e-mail:'); ?></th>
-            <td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
+            <th scope="row"><label for="admin_email"><?php _e('Your E-mail'); ?></label></th>
+            <td><input name="admin_email" type="text" id="admin_email" size="25" /><br />
+            <?php _e('Double-check your email address before continuing.'); ?>
         </tr>
         <tr>
-            <td>&nbsp;</td>
-            <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>
+            <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>
         </tr>
     </table>
-    <p><em><?php _e('Double-check your email address before continuing.'); ?></em></p>
-    <h2 class="step"><input type="submit" name="Submit" value="<?php _e('Install WordPress &raquo;'); ?>" /></h2>
+    <input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" />
 </form>
 
@@ -70 +69 @@
             wp_die($wpdb->error->get_error_message());
 
-        display_header();   
+        display_header();
         // Fill in the data we gathered
         $weblog_title = stripslashes($_POST['weblog_title']);
@@ -78 +77 @@
         if (empty($admin_email)) {
             // TODO: poka-yoke
-            die(__("<strong>ERROR</strong>: you must provide an e-mail address"));
+            die('<p>'.__("<strong>ERROR</strong>: you must provide an e-mail address.").'</p>');
         } else if (!is_email($admin_email)) {
             // TODO: poka-yoke
-            die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>'));
+            die('<p>'.__('<strong>ERROR</strong>: that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>').'</p>');
         }
 
@@ -91 +90 @@
 <h1><?php _e('Success!'); ?></h1>
 
-<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>
-<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>
+<p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p>
 
-<dl>
-    <dt><?php _e('Username'); ?></dt>
-        <dd><code>admin</code></dd>
-    <dt><?php _e('Password'); ?></dt>
-        <dd><code><?php echo $password; ?></code></dd>
-    <dt><?php _e('Login address'); ?></dt>
-        <dd><a href="../wp-login.php">wp-login.php</a></dd>
-</dl>
-<p><?php _e('Were you expecting more steps? Sorry to disappoint. :)'); ?></p>
+<table class="form-table">
+    <tr>
+        <th><?php _e('Username'); ?></th>
+        <td><code>admin</code></td>
+    </tr>
+    <tr>
+        <th><?php _e('Password'); ?></th>
+        <td><code><?php echo $password; ?></code><br />
+            <?php echo '<p>'.__('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.').'</p>'; ?></td>
+    </tr>
+</table>
+
+<p><a href="../wp-login.php" class="button"><?php _e('Log In'); ?></a>
 
 <?php
@@ -108 +110 @@
 }
 ?>
-
-<p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p>
+<script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 </body>
 </html>