WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@721 7be80a69-a1ef-0310-a953-fb0f7c49ff36

5 files changed, 73 insertions, 31 deletions

diff --git a/wp-admin/images/login-bkg-bottom.gif b/wp-admin/images/login-bkg-bottom.gif
new file mode 100644
index 0000000..a78656e
--- /dev/null
+++ b/wp-admin/images/login-bkg-bottom.gif
diff --git a/wp-admin/images/login-bkg-tile.gif b/wp-admin/images/login-bkg-tile.gif
new file mode 100644
index 0000000..1015a9e
--- /dev/null
+++ b/wp-admin/images/login-bkg-tile.gif
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index eb66e07..bee9487 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -28,6 +28,13 @@ $bookmarklet_height= 440;
 <input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
 </p>
 
+<h3><?php _e('Personal Options'); ?></h3>
+
+<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
+<?php _e('Use the visual rich editor when writing') ?></label></p>
+
+<?php do_action('profile_personal_options'); ?>
+
 <fieldset>
 <legend><?php _e('Name'); ?></legend>
 <p><label><?php _e('Username: (no editing)'); ?><br />
@@ -85,7 +92,7 @@ $bookmarklet_height= 440;
 </fieldset>
 <br clear="all" />
 <fieldset>
-<legend><?php _e('About yourself'); ?></legend>
+<legend><?php _e('About Yourself'); ?></legend>
 <p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
 <p><textarea name="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea></p>
 </fieldset>
@@ -110,13 +117,6 @@ if ( $show_password_fields ) :
 
 <br clear="all" />
 
-<h3><?php _e('Personal Options'); ?></h3>
-
-<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
-<?php _e('Use the visual rich editor when writing') ?></label></p>
-
-<?php do_action('profile_personal_options'); ?>
-
   <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
     <?php
     if(count($profileuser->caps) > count($profileuser->roles)):
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index d7d84ab..3eae7e0 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -120,7 +120,7 @@ CREATE TABLE $wpdb->posts (
   comment_count bigint(20) NOT NULL default '0',
   PRIMARY KEY  (ID),
   KEY post_name (post_name),
-  KEY type_status_date (post_type, post_status, post_date, ID)
+  KEY type_status_date (post_type,post_status,post_date,ID)
 ) TYPE=MyISAM;
 CREATE TABLE $wpdb->users (
   ID bigint(20) unsigned NOT NULL auto_increment,
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 7a1a584..080614f 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -557,58 +557,100 @@ table .vers {
 }
 
 #login {
-	background: #fff;
-	border: 1px solid #a2a2a2;
+	position: relative;
+	background: url('images/login-bkg-tile.gif') no-repeat top center #fbfbfb;
+	color: #fff;
+	/* height: 430px; */
 	margin: 5em auto;
-	padding: 1.5em;
-	width: 25em;
+	padding: 45px 50px 0;
+	width: 325px;
 }
 
 #login #login_error {
-	background: #c00;
-	border: 1px solid #a40000;
-	color: #fff;
-	font-size: 16px;
+	background: #0e3350;
+	border: 1px solid #2571ab;
+	color: #ebcd4e;
+	font-size: 11px;
 	font-weight: bold;
-	padding: .5em;
+	padding: .6em;
 	text-align: center;
 }
 
+#login #send {
+	color: #fff;
+	text-align: left;
+	font-weight: normal;
+	font-size: 1.1em;
+}
+
 #login h1 {
-	background: url(images/wordpress-logo.png) no-repeat top left;
-	margin-top: 0;
+	margin: 0 auto;
+	padding-bottom: 10px;
+	left: 137px;
+	height: 75px;
+	width: 75px;
 }
 
 #login h1 a {
 	display: block;
-	text-indent: -1000px;
-	height: 66px;
+	text-indent: -9999px;
 	border-bottom: none;
 }
 
 #login input {
-	padding: 3px;
+	padding: 4px;
 }
 
 #login ul {
+	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
 	list-style: none;
-	margin: 0;
-	padding: 0;
+	margin: 0 -50px;
+	padding: 0 50px 5px;
+}
+
+#login ul:after {
+  content: "."; 
+  display: block; 
+  height: 0; 
+  clear: both; 
+  visibility: hidden;
 }
 
 #login ul li {
-	display: inline;
-	margin-left: 1.4em;
+	float: left;
+	font-size: 11px;
+	padding: 15px 0;
 	text-align: center;
 }
 
-#login #log, #pwd {
-	font-size: 1.7em;
-	width: 80%;
+#login ul li a {
+	display: block;
+	color: #84c4f0;
+	border: none;
+	padding: 4px 1px 5px;
+	width: 160px;
+}
+
+#login ul li a:hover {
+	background: #0e3350;
+	border: 1px solid #2571ab;
+	padding: 3px 0 4px; 
+	color: #fff;
+}
+
+#login #log, #pwd, #user_login, #email {
+	font-size: 1.8em;
+	margin-top: 3px;
+	width: 97%;
+}
+
+#login p label { 
+	font-size: 11px;
 }
 
 #login #submit {
-	font-size: 1.7em;
+	margin: 0;
+	font-size: 1.2em;
 }
 
 #postcustom .updatemeta, #postcustom .deletemeta {