Changeset 12890

Timestamp:

01/28/2010 07:00:16 PM (15 years ago)

Author:

ryan

Message:

Send user back to main custom header page after cropping and setting image. Add support for a custom image div callback for greather theme flexibility. Props dphiffer. see #11855

Location:

trunk

Files:

• wp-admin/custom-header.php (modified) (4 diffs)
• wp-includes/theme.php (modified) (2 diffs)

trunk/wp-admin/custom-header.php

@@ -26 +26 @@
 
     /**
+     * Callback for header div.
+     *
+     * @var callback
+     * @since unknown
+     * @access private
+     */
+    var $admin_image_div_callback;
+
+    /**
      * PHP4 Constructor - Register administration header callback.
      *
      * @since unknown
      * @param callback $admin_header_callback
+     * @param callback $admin_image_div_callback Optional custom image div output callback.
      * @return Custom_Image_Header
      */
-    function Custom_Image_Header($admin_header_callback) {
+    function Custom_Image_Header($admin_header_callback, $admin_image_div_callback = '') {
         $this->admin_header_callback = $admin_header_callback;
+        $this->admin_image_div_callback = $admin_image_div_callback;
     }
 
@@ -268 +279 @@
      */
     function step_1() {
-        if ( $_GET['updated'] ) { ?>
+        if ( isset($_GET['updated']) && $_GET['updated'] ) { ?>
 <div id="message" class="updated">
-<p><?php _e('Header updated.') ?></p>
+<p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url()); ?></p>
 </div>
         <?php } ?>
@@ -278 +289 @@
 <h2><?php _e('Your Header Image'); ?></h2>
 <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
-
+<?php
+
+if ( $this->admin_image_div_callback ) {
+  call_user_func($this->admin_image_div_callback);
+} else {
+?>
 <div id="headimg" style="background-image: url(<?php esc_url(header_image()) ?>);">
 <h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
 <div id="desc"><?php bloginfo('description');?></div>
 </div>
+<?php } ?>
+
 <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
 <form method="post" action="<?php echo admin_url('themes.php?page=custom-header&amp;updated=true') ?>">
@@ -456 +474 @@
      */
     function finished() {
-        ?>
-<div class="wrap">
-<h2><?php _e('Header complete!'); ?></h2>
-
-<p><?php _e('Visit your site and you should see the new header now.'); ?></p>
-
-</div>
-        <?php
+        $_GET['updated'] = 1;
+      $this->step_1();
     }
 

trunk/wp-includes/theme.php

@@ -1299 +1299 @@
  *
  * @param callback $header_callback Call on 'wp_head' action.
- * @param callback $admin_header_callback Call on administration panels.
- */
-function add_custom_image_header($header_callback, $admin_header_callback) {
+ * @param callback $admin_header_callback Call on custom header administration screen.
+ * @param callback $admin_image_div_callback Output a custom header image div on the custom header administration screen. Optional.
+ */
+function add_custom_image_header($header_callback, $admin_header_callback, $admin_image_div_callback = '') {
     if ( ! empty($header_callback) )
         add_action('wp_head', $header_callback);
@@ -1308 +1309 @@
         return;
     require_once(ABSPATH . 'wp-admin/custom-header.php');
-    $GLOBALS['custom_image_header'] =& new Custom_Image_Header($admin_header_callback);
+    $GLOBALS['custom_image_header'] =& new Custom_Image_Header($admin_header_callback, $admin_image_div_callback);
     add_action('admin_menu', array(&$GLOBALS['custom_image_header'], 'init'));
 }