golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Kill the tables in install.php. props andrewryno. see #16413. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-09-29 19:57:36 +00:00
parent 1066f1addb
commit a418189fe2
4 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/install.css
View File

@ -1 +1 @@
html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:sans-serif;margin:2em auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:12px;line-height:18px;}code,.code{font-size:13px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #bbb;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:130px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}.form-table th p{font-weight:normal;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;display:none;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;}body.rtl{font-family:Tahoma,arial;}.rtl h1{font-family:arial;margin:5px -4px 0 0;}.rtl ul,.rtl ol{padding:5px 22px 5px 5px;}.rtl .step,.rtl th,.rtl .form-table th{text-align:right;}.rtl .submit input,.rtl .button,.rtl .button-secondary{margin-right:0;}.rtl #user_login,.rtl #admin_email,.rtl #pass1,.rtl #pass2{direction:ltr;} html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:sans-serif;margin:2em auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:12px;line-height:18px;}code,.code{font-size:13px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,.field-label{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #bbb;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.form-fields{margin-top:1em;width:100%;}.form-fields .field-input{margin-bottom:9px;margin-left:150px;padding:10px;font-size:12px;}.form-fields .field-full{margin-left:0;}.form-fields .field-label{float:left;font-size:13px;font-weight:bold;text-align:left;padding:16px 10px 10px 10px;width:130px;vertical-align:top;}.form-fields .field-row{background:#f3f3f3;}.form-fields code{line-height:18px;font-size:18px;}.form-fields p{margin:4px 0 0 0;font-size:11px;}.form-fields input{line-height:20px;font-size:15px;padding:2px;}.form-fields p{font-weight:normal;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;display:none;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;}body.rtl{font-family:Tahoma,arial;}.rtl h1{font-family:arial;margin:5px -4px 0 0;}.rtl ul,.rtl ol{padding:5px 22px 5px 5px;}.rtl .step,.rtl .field-label,.rtl .form-fields .field-label{text-align:right;}.rtl .submit input,.rtl .button,.rtl .button-secondary{margin-right:0;}.rtl #user_login,.rtl #admin_email,.rtl #pass1,.rtl #pass2{direction:ltr;}

32
wp-admin/css/install.dev.css
View File

@ -68,7 +68,7 @@ abbr {
.step { .step {
margin: 20px 0 15px; margin: 20px 0 15px;
} }
.step, th { .step, .field-label {
text-align: left; text-align: left;
padding: 0; padding: 0;
} }
@ -113,49 +113,53 @@ textarea {
border-radius: 3px; border-radius: 3px;
} }
.form-table { .form-fields {
border-collapse: collapse;
margin-top: 1em; margin-top: 1em;
width: 100%; width: 100%;
} }
.form-table td { .form-fields .field-input {
margin-bottom: 9px; margin-bottom: 9px;
margin-left: 150px;
padding: 10px; padding: 10px;
border-bottom: 8px solid #fff;
font-size: 12px; font-size: 12px;
} }
.form-table th { .form-fields .field-full {
margin-left: 0;
}
.form-fields .field-label {
float: left;
font-size: 13px; font-size: 13px;
font-weight: bold;
text-align: left; text-align: left;
padding: 16px 10px 10px 10px; padding: 16px 10px 10px 10px;
border-bottom: 8px solid #fff;
width: 130px; width: 130px;
vertical-align: top; vertical-align: top;
} }
.form-table tr { .form-fields .field-row {
background: #f3f3f3; background: #f3f3f3;
} }
.form-table code { .form-fields code {
line-height: 18px; line-height: 18px;
font-size: 18px; font-size: 18px;
} }
.form-table p { .form-fields p {
margin: 4px 0 0 0; margin: 4px 0 0 0;
font-size: 11px; font-size: 11px;
} }
.form-table input { .form-fields input {
line-height: 20px; line-height: 20px;
font-size: 15px; font-size: 15px;
padding: 2px; padding: 2px;
} }
.form-table th p { .form-fields p {
font-weight: normal; font-weight: normal;
} }
@ -229,8 +233,8 @@ body.rtl {
} }
.rtl .step, .rtl .step,
.rtl th, .rtl .field-label,
.rtl .form-table th { .rtl .form-fields .field-label {
text-align: right; text-align: right;
} }

72
wp-admin/install.php
View File

@ -92,14 +92,14 @@ function display_setup_form( $error = null ) {
<p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p> <p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>
<?php } ?> <?php } ?>
<form id="setup" method="post" action="install.php?step=2"> <form id="setup" method="post" action="install.php?step=2">
<table class="form-table"> <div class="form-fields">
<tr> <div class="field-row">
<th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th> <div class="field-label"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></div>
<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td> <div class="field-input"><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></div>
</tr> </div>
<tr> <div class="field-row">
<th scope="row"><label for="user_name"><?php _e('Username'); ?></label></th> <div class="field-label"><label for="user_name"><?php _e('Username'); ?></label></div>
<td> <div class="field-input">
<?php <?php
if ( $user_table ) { if ( $user_table ) {
_e('User(s) already exists.'); _e('User(s) already exists.');
@ -108,31 +108,31 @@ function display_setup_form( $error = null ) {
<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p> <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
<?php <?php
} ?> } ?>
</td> </div>
</tr> </div>
<?php if ( ! $user_table ) : ?> <?php if ( ! $user_table ) : ?>
<tr> <div class="field-row">
<th scope="row"> <div class="field-label">
<label for="admin_password"><?php _e('Password, twice'); ?></label> <label for="admin_password"><?php _e('Password, twice'); ?></label>
<p><?php _e('A password will be automatically generated for you if you leave this blank.'); ?></p> <p><?php _e('A password will be automatically generated for you if you leave this blank.'); ?></p>
</th> </div>
<td> <div class="field-input">
<input name="admin_password" type="password" id="pass1" size="25" value="" /> <input name="admin_password" type="password" id="pass1" size="25" value="" />
<p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p> <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div> <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p> <p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
</td> </div>
</tr> </div>
<?php endif; ?> <?php endif; ?>
<tr> <div class="field-row">
<th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th> <div class="field-label"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></div>
<td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" /> <div class="field-input"><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
<p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td> <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></div>
</tr> </div>
<tr> <div class="field-row">
<td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td> <div class="field-input field-full"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></div>
</tr> </div>
</table> </div>
<p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p> <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</form> </form>
<?php <?php
@ -220,20 +220,20 @@ switch($step) {
<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p> <p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>
<table class="form-table"> <div class="form-fields">
<tr> <div class="field-row">
<th><?php _e( 'Username' ); ?></th> <div class="field-label"><?php _e( 'Username' ); ?></div>
<td><code><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></code></td> <div class="field-input"><code><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></code></div>
</tr> </div>
<tr> <div class="field-row">
<th><?php _e( 'Password' ); ?></th> <div class="field-label"><?php _e( 'Password' ); ?></div>
<td><?php <div class="field-input"><?php
if ( ! empty( $password ) && empty($admin_password_check) ) if ( ! empty( $password ) && empty($admin_password_check) )
echo '<code>'. esc_html($password) .'</code><br />'; echo '<code>'. esc_html($password) .'</code><br />';
echo "<p>$password_message</p>"; ?> echo "<p>$password_message</p>"; ?>
</td> </div>
</tr> </div>
</table> </div>
<p class="step"><a href="../wp-login.php" class="button"><?php _e( 'Log In' ); ?></a></p> <p class="step"><a href="../wp-login.php" class="button"><?php _e( 'Log In' ); ?></a></p>

2
wp-includes/script-loader.php
View File

@ -448,7 +448,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin'), $colors_version ); $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin'), $colors_version );
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110928' ); $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110928' );
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110929' ); // Readme as well
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );