Changeset 13765

Timestamp:

03/19/2010 09:33:29 AM (14 years ago)

Author:

dd32

Message:

Show Background preview and options when no Image is uploaded. Display "Updated" div upon updates. Fix Colour Picker not loading after uploading a background image. See #12186

File:

• trunk/wp-admin/custom-background.php (modified) (11 diffs)

trunk/wp-admin/custom-background.php

@@ -90 +90 @@
      */
     function js_includes() {
-        $step = $this->step();
-
-        if ( 1 == $step )
-            wp_enqueue_script('farbtastic');
+        wp_enqueue_script('farbtastic');
     }
 
@@ -102 +99 @@
      */
     function css_includes() {
-        $step = $this->step();
-
-        if ( 1 == $step )
-            wp_enqueue_style('farbtastic');
+        wp_enqueue_style('farbtastic');
     }
 
@@ -154 +148 @@
                 set_theme_mod('background_color', '');
         }
+
+        $this->updated = true;
     }
 
@@ -162 +158 @@
      */
     function js() {
-        $step = $this->step();
-        if ( 1 == $step )
-            $this->js_1();
+        $this->js_1();
     }
 
@@ -235 +229 @@
 <?php screen_icon(); ?>
 <h2><?php _e('Custom Background'); ?></h2>
-<?php if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
+<?php if ( !empty($this->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 }
-
-if ( get_background_image() || get_background_color() ) { ?>
+<?php } ?>
 <p><?php _e('This is your current background.'); ?></p>
 <?php
@@ -257 +249 @@
 <?php } ?>
 </div>
-<?php }
-} else { ?>
-<p><?php _e('There is currently no background image.'); ?></p> <?php
-}
-
-if ( get_background_image() ) : ?>
-
+<?php } ?>
 <h3><?php _e('Change Display Options') ?></h3>
 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
@@ -328 +314 @@
 </form>
 
-<?php endif; ?>
-
 <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)) ?>">
@@ -364 +348 @@
 
         if ( isset($file['error']) )
-            die( $file['error'] );
+            wp_die( $file['error'] );
 
         $url = $file['url'];
@@ -373 +357 @@
         // 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
@@ -386 +371 @@
         set_theme_mod('background_image', esc_url($url));
         do_action('wp_create_file_in_uploads', $file, $id); // For replication
+        $this->updated = true;
         return $this->finished();
     }
@@ -395 +381 @@
      */
     function finished() {
-        $_GET['updated'] = 1;
-      $this->step_1();
+        $this->step_1();
     }