<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13696] trunk: install.php password UI cleanup.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13696">13696</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-14 02:30:50 +0000 (Sun, 14 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>install.php password UI cleanup. see <a href="http://trac.wordpress.org/ticket/10396">#10396</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincssinstallcss">trunk/wp-admin/css/install.css</a></li>
<li><a href="#trunkwpadmincssinstalldevcss">trunk/wp-admin/css/install.dev.css</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincssinstallcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/install.css (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/install.css        2010-03-13 20:01:02 UTC (rev 13695)
+++ trunk/wp-admin/css/install.css        2010-03-14 02:30:50 UTC (rev 13696)
</span><span class="lines">@@ -1 +1 @@
</span><del>-html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:&quot;Lucida Grande&quot;,Verdana,Arial,&quot;Bitstream Vera Sans&quot;,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,&quot;Times New Roman&quot;,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{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:&quot;Lucida Grande&quot;,Verdana,Arial,&quot;Bitstream Vera Sans&quot;,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;}.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;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code{font-family:Consolas,Monaco,Courier,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;float:left;margin:12px 5px 5px 1px;padding:5px;text-align:center;width:200px;}#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;}
</del><span class="cx">\ No newline at end of file
</span><ins>+html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:&quot;Lucida Grande&quot;,Verdana,Arial,&quot;Bitstream Vera Sans&quot;,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,&quot;Times New Roman&quot;,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{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:&quot;Lucida Grande&quot;,Verdana,Arial,&quot;Bitstream Vera Sans&quot;,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;}.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{font-family:Consolas,Monaco,Courier,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;}#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;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadmincssinstalldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/install.dev.css (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/install.dev.css        2010-03-13 20:01:02 UTC (rev 13695)
+++ trunk/wp-admin/css/install.dev.css        2010-03-14 02:30:50 UTC (rev 13696)
</span><span class="lines">@@ -135,6 +135,10 @@
</span><span class="cx">         padding: 2px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.form-table th p {
+        font-weight: normal;
+}
+
</ins><span class="cx"> #error-page { margin-top: 50px; }
</span><span class="cx"> 
</span><span class="cx"> #error-page p {
</span><span class="lines">@@ -150,8 +154,7 @@
</span><span class="cx">         border-color: #ddd !important;
</span><span class="cx">         border-style: solid;
</span><span class="cx">         border-width: 1px;
</span><del>-        float: left;
-        margin: 12px 5px 5px 1px;
</del><ins>+        margin: 5px 5px 5px 1px;
</ins><span class="cx">         padding: 5px;
</span><span class="cx">         text-align: center;
</span><span class="cx">         width: 200px;
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php        2010-03-13 20:01:02 UTC (rev 13695)
+++ trunk/wp-admin/install.php        2010-03-14 02:30:50 UTC (rev 13696)
</span><span class="lines">@@ -111,21 +111,21 @@
</span><span class="cx">                 &lt;?php if ( ! $user_table ) : ?&gt;
</span><span class="cx">                 &lt;tr&gt;
</span><span class="cx">                         &lt;th scope=&quot;row&quot;&gt;
</span><del>-                                &lt;p&gt;&lt;label for=&quot;admin_password&quot;&gt;&lt;?php _e('Password'); ?&gt;&lt;/label&gt;&lt;/p&gt;
-                                &lt;p&gt;&lt;label for=&quot;admin_password2&quot;&gt;&lt;?php _e('Re-enter Password'); ?&gt;&lt;/label&gt;&lt;/p&gt;&lt;/th&gt;
</del><ins>+                                &lt;label for=&quot;admin_password&quot;&gt;&lt;?php _e('Password, twice'); ?&gt;&lt;/label&gt;
+                                &lt;p&gt;&lt;?php _e('A password will be automatically generated for you if you leave this blank.'); ?&gt;&lt;/p&gt;
+                        &lt;/th&gt;
</ins><span class="cx">                         &lt;td&gt;
</span><del>-                                &lt;p&gt;&lt;input name=&quot;admin_password&quot; type=&quot;password&quot; id=&quot;pass1&quot; size=&quot;25&quot; value=&quot;&quot; /&gt;&lt;/p&gt;
</del><ins>+                                &lt;input name=&quot;admin_password&quot; type=&quot;password&quot; id=&quot;pass1&quot; size=&quot;25&quot; value=&quot;&quot; /&gt;
</ins><span class="cx">                                 &lt;p&gt;&lt;input name=&quot;admin_password2&quot; type=&quot;password&quot; id=&quot;pass2&quot; size=&quot;25&quot; value=&quot;&quot; /&gt;&lt;/p&gt;
</span><del>-                                &lt;p&gt;&lt;?php _e('A password will be automatically generated for you if you leave this field blank.'); ?&gt;&lt;/p&gt;
</del><span class="cx">                                 &lt;div id=&quot;pass-strength-result&quot;&gt;&lt;?php _e('Strength indicator'); ?&gt;&lt;/div&gt;
</span><del>-                                &lt;p class=&quot;description indicator-hint&quot;&gt;&lt;?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 ! &quot; ? $ % ^ &amp;amp; ).'); ?&gt;&lt;/p&gt;
</del><ins>+                                &lt;p&gt;&lt;?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 ! &quot; ? $ % ^ &amp;amp; ).'); ?&gt;&lt;/p&gt;
</ins><span class="cx">                         &lt;/td&gt;
</span><span class="cx">                 &lt;/tr&gt;
</span><span class="cx">                 &lt;?php endif; ?&gt;
</span><span class="cx">                 &lt;tr&gt;
</span><span class="cx">                         &lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;admin_email&quot;&gt;&lt;?php _e( 'Your E-mail' ); ?&gt;&lt;/label&gt;&lt;/th&gt;
</span><del>-                        &lt;td&gt;&lt;input name=&quot;admin_email&quot; type=&quot;text&quot; id=&quot;admin_email&quot; size=&quot;25&quot; value=&quot;&lt;?php  echo esc_attr( $admin_email ); ?&gt;&quot; /&gt;&lt;br /&gt;
-                        &lt;?php _e( 'Double-check your email address before continuing.' ); ?&gt;&lt;/td&gt;
</del><ins>+                        &lt;td&gt;&lt;input name=&quot;admin_email&quot; type=&quot;text&quot; id=&quot;admin_email&quot; size=&quot;25&quot; value=&quot;&lt;?php echo esc_attr( $admin_email ); ?&gt;&quot; /&gt;
+                        &lt;p&gt;&lt;?php _e( 'Double-check your email address before continuing.' ); ?&gt;&lt;/p&gt;&lt;/td&gt;
</ins><span class="cx">                 &lt;/tr&gt;
</span><span class="cx">                 &lt;tr&gt;
</span><span class="cx">                         &lt;td colspan=&quot;2&quot;&gt;&lt;label&gt;&lt;input type=&quot;checkbox&quot; name=&quot;blog_public&quot; value=&quot;1&quot; &lt;?php checked( $blog_public ); ?&gt; /&gt; &lt;?php _e( 'Allow my blog to appear in search engines like Google and Technorati.' ); ?&gt;&lt;/label&gt;&lt;/td&gt;
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (13695 => 13696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2010-03-13 20:01:02 UTC (rev 13695)
+++ trunk/wp-includes/script-loader.php        2010-03-14 02:30:50 UTC (rev 13696)
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx">         $styles-&gt;add( 'media', &quot;/wp-admin/css/media$suffix.css&quot;, array(), '20091029' );
</span><span class="cx">         $styles-&gt;add( 'widgets', &quot;/wp-admin/css/widgets$suffix.css&quot;, array(), '20091118' );
</span><span class="cx">         $styles-&gt;add( 'dashboard', &quot;/wp-admin/css/dashboard$suffix.css&quot;, array(), '20100301' );
</span><del>-        $styles-&gt;add( 'install', &quot;/wp-admin/css/install$suffix.css&quot;, array(), '20100228' ); // Readme as well
</del><ins>+        $styles-&gt;add( 'install', &quot;/wp-admin/css/install$suffix.css&quot;, array(), '20100313' ); // Readme as well
</ins><span class="cx">         $styles-&gt;add( 'theme-editor', &quot;/wp-admin/css/theme-editor$suffix.css&quot;, array(), '20090625' );
</span><span class="cx">         $styles-&gt;add( 'press-this', &quot;/wp-admin/css/press-this$suffix.css&quot;, array(), '20091022' );
</span><span class="cx">         $styles-&gt;add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
</span></span></pre>
</div>
</div>

</body>
</html>