WordPress.org

Make WordPress Core

Changeset 18897


Ignore:
Timestamp:
10/05/11 23:42:11 (4 years ago)
Author:
nacin
Message:

Revert [18817]. Adding the new HTML to setup-config would make translation files stale, and I'd rather i18n that file first (see #18180). fixes #18865, see #16413.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/install.css

    r18817 r18897  
    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,.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;} 
     1html{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;} 
  • trunk/wp-admin/css/install.dev.css

    r18817 r18897  
    6969    margin: 20px 0 15px; 
    7070} 
    71 .step, .field-label { 
     71.step, th { 
    7272    text-align: left; 
    7373    padding: 0; 
     
    114114} 
    115115 
    116 .form-fields { 
     116.form-table { 
     117    border-collapse: collapse; 
    117118    margin-top: 1em; 
    118119    width: 100%; 
    119120} 
    120121 
    121 .form-fields .field-input { 
     122.form-table td { 
    122123    margin-bottom: 9px; 
    123     margin-left: 150px; 
    124124    padding: 10px; 
     125    border-bottom: 8px solid #fff; 
    125126    font-size: 12px; 
    126127} 
    127128 
    128 .form-fields .field-full { 
    129     margin-left: 0; 
    130 } 
    131  
    132 .form-fields .field-label { 
    133     float: left; 
     129.form-table th { 
    134130    font-size: 13px; 
    135     font-weight: bold; 
    136131    text-align: left; 
    137132    padding: 16px 10px 10px 10px; 
     133    border-bottom: 8px solid #fff; 
    138134    width: 130px; 
    139135    vertical-align: top; 
    140136} 
    141137 
    142 .form-fields .field-row { 
     138.form-table tr { 
    143139    background: #f3f3f3; 
    144140} 
    145141 
    146 .form-fields code { 
     142.form-table code { 
    147143    line-height: 18px; 
    148144    font-size: 18px; 
    149145} 
    150146 
    151 .form-fields p { 
     147.form-table p { 
    152148    margin: 4px 0 0 0; 
    153149    font-size: 11px; 
    154150} 
    155151 
    156 .form-fields input { 
     152.form-table input { 
    157153    line-height: 20px; 
    158154    font-size: 15px; 
     
    160156} 
    161157 
    162 .form-fields p { 
     158.form-table th p { 
    163159    font-weight: normal; 
    164160} 
     
    234230 
    235231.rtl .step, 
    236 .rtl .field-label, 
    237 .rtl .form-fields .field-label { 
     232.rtl th, 
     233.rtl .form-table th { 
    238234    text-align: right; 
    239235} 
  • trunk/wp-admin/install.php

    r18817 r18897  
    9393<?php } ?> 
    9494<form id="setup" method="post" action="install.php?step=2"> 
    95     <div class="form-fields"> 
    96         <div class="field-row"> 
    97             <div class="field-label"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></div> 
    98             <div class="field-input"><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></div> 
    99         </div> 
    100         <div class="field-row"> 
    101             <div class="field-label"><label for="user_name"><?php _e('Username'); ?></label></div> 
    102             <div class="field-input"> 
     95    <table class="form-table"> 
     96        <tr> 
     97            <th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th> 
     98            <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td> 
     99        </tr> 
     100        <tr> 
     101            <th scope="row"><label for="user_name"><?php _e('Username'); ?></label></th> 
     102            <td> 
    103103            <?php 
    104104            if ( $user_table ) { 
     
    109109            <?php 
    110110            } ?> 
    111             </div> 
    112         </div> 
     111            </td> 
     112        </tr> 
    113113        <?php if ( ! $user_table ) : ?> 
    114         <div class="field-row"> 
    115             <div class="field-label"> 
     114        <tr> 
     115            <th scope="row"> 
    116116                <label for="admin_password"><?php _e('Password, twice'); ?></label> 
    117117                <p><?php _e('A password will be automatically generated for you if you leave this blank.'); ?></p> 
    118             </div> 
    119             <div class="field-input"> 
     118            </th> 
     119            <td> 
    120120                <input name="admin_password" type="password" id="pass1" size="25" value="" /> 
    121121                <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p> 
    122122                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div> 
    123123                <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> 
    124             </div> 
    125         </div> 
     124            </td> 
     125        </tr> 
    126126        <?php endif; ?> 
    127         <div class="field-row"> 
    128             <div class="field-label"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></div> 
    129             <div class="field-input"><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" /> 
    130             <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></div> 
    131         </div> 
    132         <div class="field-row"> 
    133             <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> 
    134         </div> 
    135     </div> 
     127        <tr> 
     128            <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th> 
     129            <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" /> 
     130            <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td> 
     131        </tr> 
     132        <tr> 
     133            <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> 
     134        </tr> 
     135    </table> 
    136136    <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p> 
    137137</form> 
     
    221221<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p> 
    222222 
    223 <div class="form-fields"> 
    224     <div class="field-row"> 
    225         <div class="field-label"><?php _e( 'Username' ); ?></div> 
    226         <div class="field-input"><code><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></code></div> 
    227     </div> 
    228     <div class="field-row"> 
    229         <div class="field-label"><?php _e( 'Password' ); ?></div> 
    230         <div class="field-input"><?php 
     223<table class="form-table"> 
     224    <tr> 
     225        <th><?php _e( 'Username' ); ?></th> 
     226        <td><code><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></code></td> 
     227    </tr> 
     228    <tr> 
     229        <th><?php _e( 'Password' ); ?></th> 
     230        <td><?php 
    231231        if ( ! empty( $password ) && empty($admin_password_check) ) 
    232232            echo '<code>'. esc_html($password) .'</code><br />'; 
    233233        echo "<p>$password_message</p>"; ?> 
    234         </div> 
    235     </div> 
    236 </div> 
     234        </td> 
     235    </tr> 
     236</table> 
    237237 
    238238<p class="step"><a href="../wp-login.php" class="button"><?php _e( 'Log In' ); ?></a></p> 
  • trunk/wp-includes/script-loader.php

    r18896 r18897  
    448448 
    449449    $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110930' ); 
    450     $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110929' ); // Readme as well 
     450    $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well 
    451451    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); 
    452452    $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); 
Note: See TracChangeset for help on using the changeset viewer.