From 44590b1d7875c61159833e43ae65d9c5fd550886 Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 5 Oct 2011 23:42:11 +0000 Subject: [PATCH] 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. git-svn-id: http://svn.automattic.com/wordpress/trunk@18897 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/install.css | 2 +- wp-admin/css/install.dev.css | 32 +++++++--------- wp-admin/install.php | 72 +++++++++++++++++------------------ wp-includes/script-loader.php | 2 +- 4 files changed, 52 insertions(+), 56 deletions(-) diff --git a/wp-admin/css/install.css b/wp-admin/css/install.css index b6139e8d2..8de165c8c 100644 --- a/wp-admin/css/install.css +++ b/wp-admin/css/install.css @@ -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,.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;} \ No newline at end of file +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;} \ No newline at end of file diff --git a/wp-admin/css/install.dev.css b/wp-admin/css/install.dev.css index e9dd55c6b..66169ee39 100644 --- a/wp-admin/css/install.dev.css +++ b/wp-admin/css/install.dev.css @@ -68,7 +68,7 @@ abbr { .step { margin: 20px 0 15px; } -.step, .field-label { +.step, th { text-align: left; padding: 0; } @@ -113,53 +113,49 @@ textarea { border-radius: 3px; } -.form-fields { +.form-table { + border-collapse: collapse; margin-top: 1em; width: 100%; } -.form-fields .field-input { +.form-table td { margin-bottom: 9px; - margin-left: 150px; padding: 10px; + border-bottom: 8px solid #fff; font-size: 12px; } -.form-fields .field-full { - margin-left: 0; -} - -.form-fields .field-label { - float: left; +.form-table th { font-size: 13px; - font-weight: bold; text-align: left; padding: 16px 10px 10px 10px; + border-bottom: 8px solid #fff; width: 130px; vertical-align: top; } -.form-fields .field-row { +.form-table tr { background: #f3f3f3; } -.form-fields code { +.form-table code { line-height: 18px; font-size: 18px; } -.form-fields p { +.form-table p { margin: 4px 0 0 0; font-size: 11px; } -.form-fields input { +.form-table input { line-height: 20px; font-size: 15px; padding: 2px; } -.form-fields p { +.form-table th p { font-weight: normal; } @@ -233,8 +229,8 @@ body.rtl { } .rtl .step, -.rtl .field-label, -.rtl .form-fields .field-label { +.rtl th, +.rtl .form-table th { text-align: right; } diff --git a/wp-admin/install.php b/wp-admin/install.php index 1ca1cfba7..68965c975 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -92,14 +92,14 @@ function display_setup_form( $error = null ) {

ERROR: %s' ), $error ); ?>

-
-
-
-
-
-
-
-
+ + + + + + + + + -
-
+
+ + + -
-
-
-

-
-
-
-
- + + + + + + + +

- - +

- -
+

- - +
+

-
-
-
-
-
-
-
-
+ + + + + + + '. esc_html($password) .'
'; echo "

$password_message

"; ?> -
-
-
+ + +

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 9a432da74..a165d6345 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -447,7 +447,7 @@ function wp_default_styles( &$styles ) { $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(), '20110930' ); - $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110929' ); // Readme as well + $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); $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' );