From a15cb1971e9bcade537e3fe3e0e6843de4b3996e Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 21 Oct 2008 22:27:41 +0000
Subject: [PATCH] New footer style, first draft

git-svn-id: http://svn.automattic.com/wordpress/trunk@9269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-footer.php     |  9 +++------
 wp-admin/css/colors-fresh.css |  2 +-
 wp-admin/includes/update.php  |  6 +++---
 wp-admin/wp-admin.css         | 18 ++++++++++++++----
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index 13781d3b1..7999dab14 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -16,12 +16,9 @@
 <p><?php
 do_action('in_admin_footer', '');
 $upgrade = apply_filters( 'update_footer', '' );
-echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade;
-
-$quick_edit_help = array( 'edit.php', 'edit-pages.php', 'edit-comments.php', 'edit-tags.php', 'categories.php', 'edit-link-categories.php' );
-if ( in_array($pagenow, $quick_edit_help) )
-	echo '<br />' . __('Hint: double-click on a row to open Quick Edit.');
-?></p>
+echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' <span id="footer-upgrade">'.$upgrade . '</span>';
+?>
+</p>
 </div>
 <?php do_action('admin_footer', ''); ?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index e9a0045f3..01b4fdc6f 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -421,7 +421,7 @@ input.readonly {
 }
 
 #footer {
-	background: url(../images/logo-ghost.png) #464646 no-repeat 20px 10px;
+	background: #464646;
 	color: #999;
 }
 
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index fa7aa3191..679b5ffa1 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -21,18 +21,18 @@ function core_update_footer( $msg = '' ) {
 
 	switch ( $cur->response ) {
 	case 'development' :
-		return sprintf( '| '.__( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update.php?action=upgrade-core');
+		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update.php?action=upgrade-core');
 	break;
 
 	case 'upgrade' :
 		if ( current_user_can('manage_options') ) {
-			return sprintf( '| <strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core'), $cur->current);
+			return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core'), $cur->current);
 			break;
 		}
 
 	case 'latest' :
 	default :
-		return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] );
+		return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
 	break;
 	}
 }
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 5059df39e..ff9cd5823 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -952,16 +952,26 @@ html, body {
 }
 
 #footer {
+	font: 12px Georgia, "Times New Roman", Times, serif;
 	clear: both;
-	font-size: 12px;
-	height: 75px;
-	margin-top: -75px;
+	height: 45px;
+	margin-top: -45px;
 	position: relative;
 }
 
+#footer #footer-thankyou, #footer #footer-upgrade {
+	font-style: italic;
+}
+
+#footer #footer-upgrade {
+	position: absolute;
+	bottom: 12px;
+	right: 15px;
+}
+
 #footer p {
 	margin: 0;
-	padding: 17px 0 7px 60px;
+	padding: 17px 0 7px 15px;
 }
 
 #footer p a {