Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 13052)
+++ wp-admin/custom-background.php	(working copy)
@@ -9,7 +9,7 @@
 /**
  * The custom background image class.
  *
- * @since unknown
+ * @since 3.0.0
  * @package WordPress
  * @subpackage Administration
  */
@@ -19,7 +19,7 @@
 	 * Callback for administration header.
 	 *
 	 * @var callback
-	 * @since unknown
+	 * @since 3.0.0
 	 * @access private
 	 */
 	var $admin_header_callback;
@@ -28,7 +28,7 @@
 	 * Callback for header div.
 	 *
 	 * @var callback
-	 * @since unknown
+	 * @since 3.0.0
 	 * @access private
 	 */
 	var $admin_image_div_callback;
@@ -36,7 +36,7 @@
 	/**
 	 * PHP4 Constructor - Register administration header callback.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 * @param callback $admin_header_callback
 	 * @param callback $admin_image_div_callback Optional custom image div output callback.
 	 * @return Custom_Background
@@ -49,24 +49,23 @@
 	/**
 	 * Setup the hooks for the Custom Background admin page.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 */
 	function init() {
 		if ( ! current_user_can('switch_themes') )
 			return;
 
-		$page = add_theme_page(__('Custom Background'), __('Custom Background'), 'switch_themes', 'custom-background', array(&$this, 'admin_page'));
+		$page = add_theme_page( __( 'Custom Background' ), __( 'Custom Background' ), 'switch_themes', 'custom-background', array(&$this, 'admin_page') );
 
-		add_action("admin_head-$page", array(&$this, 'take_action'), 50);
+		add_action( "admin_head-$page", array(&$this, 'take_action'), 50 );
 		if ( $this->admin_header_callback )
-			add_action("admin_head-$page", $this->admin_header_callback, 51);
+			add_action( "admin_head-$page", $this->admin_header_callback, 51 );
 	}
 
 	/**
 	 * Get the current step.
 	 *
-	 * @since unknown
-	 *
+	 * @since 3.0.0
 	 * @return int Current step
 	 */
 	function step() {
@@ -83,171 +82,203 @@
 	/**
 	 * Execute custom background modification.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 */
 	function take_action() {
 		if ( ! current_user_can('switch_themes') )
 			return;
 
 		if ( isset($_POST['reset-background']) ) {
-			check_admin_referer('custom-background');
+			check_admin_referer( 'custom-background' );
 			remove_theme_mods();
 		}
 		if ( isset($_POST['repeat-background']) ) {
-			check_admin_referer('custom-background');
-			$repeat = $_POST['repeat-background'] ? true: false;
-			set_theme_mod('background_repeat', $repeat);
+			check_admin_referer( 'custom-background' );
+			$repeat = $_POST['repeat-background'] ? true : false;
+			set_theme_mod( 'background_repeat', $repeat );
+			
 		} elseif ( isset($_POST['save-background-options']) ) {
-			set_theme_mod('background_repeat', false);
+			set_theme_mod( 'background_repeat', false );
 		}
 		if ( isset($_POST['remove-background']) ) {
-			check_admin_referer('custom-background');
-			set_theme_mod('background_image', '');
+			check_admin_referer( 'custom-background' );
+			set_theme_mod( 'background_image', '' );
 		}
 	}
 
 	/**
 	 * Display first step of custom background image page.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 */
 	function step_1() {
-		if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
-<div id="message" class="updated">
-<p><?php printf(__('Background updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
-</div>
-		<?php } ?>
+		echo '<div class="wrap" style="margin-bottom: 50px;">';
+			screen_icon();
+			echo '<h2>'. __( 'Custom Background' ) .'</h2>';
+			$this->feedback();
 
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e('Custom Background'); ?></h2>
-<?php if ( get_background_image() ) { ?>
-<p><?php _e('This is your current background image.'); ?></p>
-<?php
-} else { ?>
-<p><?php _e('There is currently no background image.'); ?></p> <?php
-}
+			if ( get_background_image() )
+				echo '<h3>'. __( 'Current background image:' ) .'</h3>';
+			
+			if ( is_callable($this->admin_image_div_callback) )
+				call_user_func( $this->admin_image_div_callback );
+			else
+				$this->background_image();
 
-if ( $this->admin_image_div_callback ) {
-  call_user_func($this->admin_image_div_callback);
-} else {
-?>
-<div id="background-image">
-<img src="<?php background_image(); ?>" />
-</div>
-<?php } ?>
-</div>
-<div class="wrap">
-<h2><?php _e('Upload New Background Image'); ?></h2><p><?php _e('Here you can upload a new background image.'); ?></p>
+			if ( get_background_image() ) :
+				$this->form_update_background();
+				$this->form_remove_background();
+			endif;
 
-<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
-<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
-<input type="hidden" name="action" value="save" />
-<?php wp_nonce_field('custom-background') ?>
-<p class="submit">
-<input type="submit" value="<?php esc_attr_e('Upload'); ?>" />
-</p>
-</form>
-
-</div>
-
-<div class="wrap">
-
-<h2><?php _e('Change Display Options') ?></h2>
-<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
-<label for="repeat-background">
-<p><input name="repeat-background" type="checkbox" id="repeat-background" value="1" <?php checked(true, get_theme_mod('background_repeat')); ?> />
-<?php _e('Tile the background.') ?></label></p>
-<?php wp_nonce_field('custom-background'); ?>
-<input type="submit" class="button" name="save-background-options" value="<?php esc_attr_e('Save Changes'); ?>" />
-</form>
-</div>
-
-<?php if ( get_theme_mod('background_image') ) : ?>
-<div class="wrap">
-<h2><?php _e('Reset Background Image'); ?></h2>
-<p><?php _e('This will restore the original background image. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
-<?php wp_nonce_field('custom-background'); ?>
-<input type="submit" class="button" name="reset-background" value="<?php esc_attr_e('Restore Original Background'); ?>" />
-</form>
-</div>
-<?php endif;
-
-if ( get_background_image() ) :
-?>
-<div class="wrap">
-<h2><?php _e('Remove Background Image'); ?></h2>
-<p><?php _e('This will remove background image. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
-<?php wp_nonce_field('custom-background'); ?>
-<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background'); ?>" />
-</form>
-</div>
-<?php endif;
-
+			$this->form_upload_background();
+		echo '</div>';
 	}
 
 	/**
 	 * Display second step of custom background image page.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 */
 	function step_2() {
-		check_admin_referer('custom-background');
-		$overrides = array('test_form' => false);
-		$file = wp_handle_upload($_FILES['import'], $overrides);
+		check_admin_referer( 'custom-background' );
+		$overrides = array( 'test_form' => false );
+		$file = wp_handle_upload( $_FILES['import'], $overrides );
 
 		if ( isset($file['error']) )
-			die( $file['error'] );
+			wp_die( $file['error'] );
 
 		$url = $file['url'];
 		$type = $file['type'];
 		$file = $file['file'];
-		$filename = basename($file);
+		$filename = basename( $file );
 
 		// Construct the object array
 		$object = array(
-		'post_title' => $filename,
-		'post_content' => $url,
-		'post_mime_type' => $type,
-		'guid' => $url);
+			'post_title' => $filename,
+			'post_content' => $url,
+			'post_mime_type' => $type,
+			'guid' => $url,
+		);
 
 		// Save the data
-		$id = wp_insert_attachment($object, $file);
+		$id = wp_insert_attachment( $object, $file );
 
 		// Add the meta-data
 		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
 
-		set_theme_mod('background_image', esc_url($url));
-		do_action('wp_create_file_in_uploads', $file, $id); // For replication
+		set_theme_mod( 'background_image', esc_url($url) );
+		do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
+		
 		return $this->finished();
 	}
 
 	/**
 	 * Display last step of custom header image page.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 */
 	function finished() {
 		$_GET['updated'] = 1;
-	  $this->step_1();
+		$this->step_1();
 	}
 
 	/**
 	 * Display the page based on the current step.
 	 *
-	 * @since unknown
+	 * @since 3.0.0
 	 */
 	function admin_page() {
 		if ( ! current_user_can('switch_themes') )
-			wp_die(__('You do not have permission to customize the background.'));
+			wp_die( __('You do not have permission to customize the background.') );
 		$step = $this->step();
 		if ( 1 == $step )
 			$this->step_1();
 		elseif ( 2 == $step )
 			$this->step_2();
 	}
-
+	
+	/**
+	 * Gives feedback to the user when they perform an action.
+	 *
+	 * @since 3.0.0
+	 **/
+	function feedback() { 
+		if ( isset($_GET['updated']) && $_GET['updated'] ) : ?>
+			<div id="message" class="updated">
+			<?php show_message( sprintf(__('Background image <strong>uploaded</strong>. <a href="%s">Visit your site</a> to see how it looks.'), home_url()) ); ?>
+			</div>
+		<?php
+		endif;
+	}
+	
+	/**
+	 * Displays the custom background image.
+	 *
+	 * @since 3.0.0
+	 **/
+	function background_image() {
+		echo '<div id="background-image">';
+			echo '<img src="'. get_background_image() .'" width="100%" height="100%" />';
+		echo '</div>';
+	}
+	
+	/**
+	 * Displays the upload background image form.
+	 *
+	 * @since 3.0.0
+	 **/
+	function form_upload_background() { ?>
+		<h3><?php _e( 'Upload New Background Image' ); ?></h3>
+		<form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
+			<?php wp_nonce_field( 'custom-background' ); ?>
+			<input type="hidden" name="action" value="save" />
+			
+			<p><label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label></p>
+			<input type="file" id="upload" name="import" /><input type="submit" class="button" value="<?php esc_attr_e( 'Upload' ); ?>" />
+			
+			<p>
+				<label for="repeat-background">
+					<input name="repeat-background" type="checkbox" id="repeat-background" value="1" <?php checked(true, get_theme_mod('background_repeat')); ?> />
+					<?php _e( 'Tile the background image.' ) ?>
+				</label>
+			</p>
+		</form>
+		<?php
+	}
+	
+	/**
+	 * Displays the update background image form.
+	 *
+	 * @since 3.0.0
+	 **/
+	function form_update_background() { ?>
+		<h3><?php _e( 'Change Display Options' ) ?></h3>
+		<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
+			<?php wp_nonce_field( 'custom-background' ); ?>
+			
+			<label for="repeat-background">
+			<p><input name="repeat-background" type="checkbox" id="repeat-background" value="1" <?php checked(true, get_theme_mod('background_repeat')); ?> />
+			<?php _e( 'Tile the background image.' ) ?>
+			</p></label>
+						
+			<input type="submit" class="button" name="save-background-options" value="<?php esc_attr_e( 'Save Changes' ); ?>" />
+		</form>
+		<?php
+	}
+	
+	/**
+	 * Displays the remove background image form.
+	 *
+	 * @since 3.0.0
+	 **/
+	function form_remove_background() { ?>
+		<h3><?php _e( 'Remove Background Image' ); ?></h3>
+		<p><?php _e( 'This will remove background image. You <strong>will not</strong> be able to retrieve any customizations.' ); ?></p>
+		<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
+			<?php wp_nonce_field( 'custom-background' ); ?>
+			<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e( 'Remove Background' ); ?>" />
+		</form>
+		<?php
+	}
 }
 ?>