Wordpress 2.8.5-scripts
[autoinstalls/wordpress.git] / wp-admin / widgets.php
index 95e82814882746892e42ea9e8f0536268f06b082..4ead317a74d7fe46e0a86d87140a4a51bb59d265 100644 (file)
@@ -15,7 +15,7 @@ require_once(ABSPATH . 'wp-admin/includes/widgets.php');
 if ( ! current_user_can('switch_themes') )
        wp_die( __( 'Cheatin’ uh?' ));
 
-wp_enqueue_script( array( 'wp-lists', 'admin-widgets' ) );
+wp_enqueue_script('admin-widgets');
 wp_admin_css( 'widgets' );
 
 do_action( 'sidebar_admin_setup' );
@@ -23,20 +23,98 @@ do_action( 'sidebar_admin_setup' );
 $title = __( 'Widgets' );
 $parent_file = 'themes.php';
 
-// $sidebar = What sidebar are we editing?
-if ( isset($_GET['sidebar']) && isset($wp_registered_sidebars[$_GET['sidebar']]) ) {
-       $sidebar = attribute_escape( $_GET['sidebar'] );
-} elseif ( is_array($wp_registered_sidebars) && !empty($wp_registered_sidebars) ) {
-       // By default we look at the first defined sidebar
-       $sidebar = array_shift( $keys = array_keys($wp_registered_sidebars) );
-} else {
-       // If no sidebars, die.
+// register the inactive_widgets area as sidebar
+register_sidebar(array(
+       'name' => __('Inactive Widgets'),
+       'id' => 'wp_inactive_widgets',
+       'before_widget' => '',
+       'after_widget' => '',
+       'before_title' => '',
+       'after_title' => '',
+));
+
+// These are the widgets grouped by sidebar
+$sidebars_widgets = wp_get_sidebars_widgets();
+if ( empty( $sidebars_widgets ) )
+       $sidebars_widgets = wp_get_widget_defaults();
+
+// look for "lost" widgets, this has to run at least on each theme change
+function retrieve_widgets() {
+       global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
+
+       $_sidebars_widgets = array();
+       $sidebars = array_keys($wp_registered_sidebars);
+
+       unset( $sidebars_widgets['array_version'] );
+
+       $old = array_keys($sidebars_widgets);
+       sort($old);
+       sort($sidebars);
+
+       if ( $old == $sidebars )
+               return;
+
+       // Move the known-good ones first
+       foreach ( $sidebars as $id ) {
+               if ( array_key_exists( $id, $sidebars_widgets ) ) {
+                       $_sidebars_widgets[$id] = $sidebars_widgets[$id];
+                       unset($sidebars_widgets[$id], $sidebars[$id]);
+               }
+       }
+
+       // if new theme has less sidebars than the old theme
+       if ( !empty($sidebars_widgets) ) {
+               foreach ( $sidebars_widgets as $lost => $val ) {
+                       if ( is_array($val) )
+                               $_sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $_sidebars_widgets['wp_inactive_widgets'], $val );
+               }
+       }
+
+       // discard invalid, theme-specific widgets from sidebars
+       $shown_widgets = array();
+       foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
+               if ( !is_array($widgets) )
+                       continue;
+
+               $_widgets = array();
+               foreach ( $widgets as $widget ) {
+                       if ( isset($wp_registered_widgets[$widget]) )
+                               $_widgets[] = $widget;
+               }
+               $_sidebars_widgets[$sidebar] = $_widgets;
+               $shown_widgets = array_merge($shown_widgets, $_widgets);
+       }
+
+       $sidebars_widgets = $_sidebars_widgets;
+       unset($_sidebars_widgets, $_widgets);
+
+       // find hidden/lost multi-widget instances
+       $lost_widgets = array();
+       foreach ( $wp_registered_widgets as $key => $val ) {
+               if ( in_array($key, $shown_widgets, true) )
+                       continue;
+
+               $number = preg_replace('/.+?-([0-9]+)$/', '$1', $key);
+
+               if ( 2 > (int) $number )
+                       continue;
+
+               $lost_widgets[] = $key;
+       }
+
+       $sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
+       wp_set_sidebars_widgets($sidebars_widgets);
+}
+retrieve_widgets();
+
+if ( count($wp_registered_sidebars) == 1 ) {
+       // If only "wp_inactive_widgets" is defined the theme has no sidebars, die.
        require_once( 'admin-header.php' );
 ?>
 
        <div class="wrap">
        <?php screen_icon(); ?>
-       <h2><?php echo wp_specialchars( $title ); ?></h2>
+       <h2><?php echo esc_html( $title ); ?></h2>
                <div class="error">
                        <p><?php _e( 'No Sidebars Defined' ); ?></p>
                </div>
@@ -48,279 +126,267 @@ if ( isset($_GET['sidebar']) && isset($wp_registered_sidebars[$_GET['sidebar']])
        exit;
 }
 
-// These are the widgets grouped by sidebar
-$sidebars_widgets = wp_get_sidebars_widgets();
-if ( empty( $sidebars_widgets ) )
-       $sidebars_widgets = wp_get_widget_defaults();
+// We're saving a widget without js
+if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
+       $widget_id = $_POST['widget-id'];
+       check_admin_referer("save-delete-widget-$widget_id");
 
-// for the sake of PHP warnings
-if ( empty( $sidebars_widgets[$sidebar] ) )
-       $sidebars_widgets[$sidebar] = array();
-
-$http_post = 'post' == strtolower($_SERVER['REQUEST_METHOD']);
-
-// We're updating a sidebar
-if ( $http_post && isset($sidebars_widgets[$_POST['sidebar']]) ) {
-       check_admin_referer( 'edit-sidebar_' . $_POST['sidebar'] );
-
-       /* Hack #1
-        * The widget_control is overloaded.  It updates the widget's options AND echoes out the widget's HTML form.
-        * Since we want to update before sending out any headers, we have to catch it with an output buffer,
-        */
-       ob_start();
-               /* There can be multiple widgets of the same type, but the widget_control for that
-                * widget type needs only be called once if it's a multi-widget.
-                */
-               $already_done = array();
-
-               foreach ( $wp_registered_widget_controls as $name => $control ) {
-                       if ( in_array( $control['callback'], $already_done ) )
-                               continue;
-
-                       if ( is_callable( $control['callback'] ) ) {
-                               call_user_func_array( $control['callback'], $control['params'] );
-                               $control_output = ob_get_contents();
-                               if ( false !== strpos( $control_output, '%i%' ) ) // if it's a multi-widget, only call control function once.
-                                       $already_done[] = $control['callback'];
+       $number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : '';
+       if ( $number ) {
+               foreach ( $_POST as $key => $val ) {
+                       if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) {
+                               $_POST[$key] = array( $number => array_shift($val) );
+                               break;
                        }
-
-                       ob_clean();
                }
-       ob_end_clean();
+       }
 
-       // Prophylactic.  Take out empty ids.
-       foreach ( (array) $_POST['widget-id'] as $key => $val )
-               if ( !$val )
-                       unset($_POST['widget-id'][$key]);
+       $sidebar_id = $_POST['sidebar'];
+       $position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
 
-       // Reset the key numbering and store
-       $new_sidebar = isset( $_POST['widget-id'] ) && is_array( $_POST['widget-id'] ) ? array_values( $_POST['widget-id'] ) : array();
-       $sidebars_widgets[$_POST['sidebar']] = $new_sidebar;
-       wp_set_sidebars_widgets( $sidebars_widgets );
+       $id_base = $_POST['id_base'];
+       $sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
 
-       wp_redirect( add_query_arg( 'message', 'updated' ) );
-       exit;
-}
+       // delete
+       if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
 
-// What widget (if any) are we editing
-$edit_widget = -1;
-
-$query_args = array('add', 'remove', 'key', 'edit', '_wpnonce', 'message', 'base' );
-
-if ( isset($_GET['add']) && $_GET['add'] ) {
-       // Add to the end of the sidebar
-       $control_callback;
-       if ( isset($wp_registered_widgets[$_GET['add']]) ) {
-               check_admin_referer( "add-widget_$_GET[add]" );
-               $sidebars_widgets[$sidebar][] = $_GET['add'];
-               wp_set_sidebars_widgets( $sidebars_widgets );
-       } elseif ( isset($_GET['base']) && isset($_GET['key']) ) { // It's a multi-widget
-               check_admin_referer( "add-widget_$_GET[add]" );
-               // Copy minimal info from an existing instance of this widget to a new instance
-               foreach ( $wp_registered_widget_controls as $control ) {
-                       if ( $_GET['base'] === $control['id_base'] ) {
-                               $control_callback = $control['callback'];
-                               $num = (int) $_GET['key'];
-                               $control['params'][0]['number'] = $num;
-                               $control['id'] = $control['id_base'] . '-' . $num;
-                               $wp_registered_widget_controls[$control['id']] = $control;
-                               $sidebars_widgets[$sidebar][] = $control['id'];
-                               break;
-                       }
+               if ( !in_array($widget_id, $sidebar, true) ) {
+                       wp_redirect('widgets.php?error=0');
+                       exit;
                }
-       }
-
-       // it's a multi-widget.  The only way to add multi-widgets without JS is to actually submit POST content...
-       // so here we go
-       if ( is_callable( $control_callback ) ) {
-               require_once( 'admin-header.php' );
-       ?>
-               <div class="wrap">
-               <h2><?php _e( 'Add Widget' ); ?></h2>
-               <br />
-               <form action="<?php echo clean_url( remove_query_arg( $query_args ) ); ?>" method="post">
-
-                       <ul class="widget-control-list">
-                               <li class="widget-list-control-item">
-                                       <div class="widget-top">
-                                       <h4 class="widget-title"><?php echo $control['name']; ?></h4>
-                                       </div>
-                                       <div class="widget-control" style="display: block;">
-       <?php
-                                               call_user_func_array( $control_callback, $control['params'] );
-       ?>
-                                               <div class="widget-control-actions">
-                                                       <input type="submit" class="button" value="<?php _e( 'Add Widget' ); ?>" />
-                                                       <input type="hidden" id='sidebar' name='sidebar' value="<?php echo $sidebar; ?>" />
-       <?php   wp_nonce_field ( 'edit-sidebar_' . $sidebar );
-               foreach ( $sidebars_widgets[$sidebar] as $sidebar_widget_id ) : ?>
-                                                       <input type="hidden" name='widget-id[]' value="<?php echo $sidebar_widget_id; ?>" />
-       <?php   endforeach; ?>
-                                               </div>
-                                       </div>
-                               </li>
-                       </ul>
-               </form>
-               </div>
-       <?php
 
-               require_once( 'admin-footer.php' );
-               exit;
-       }
-       wp_redirect( remove_query_arg( $query_args ) );
-       exit;
-} elseif ( isset($_GET['remove']) && $_GET['remove'] && isset($_GET['key']) && is_numeric($_GET['key']) ) {
-       // Remove from sidebar the widget of type $_GET['remove'] and in position $_GET['key']
-       $key = (int) $_GET['key'];
-       if ( -1 < $key && ( $keys = array_keys($sidebars_widgets[$sidebar], $_GET['remove']) ) && in_array($key, $keys) ) {
-               check_admin_referer( "remove-widget_$_GET[remove]" );
-               unset($sidebars_widgets[$sidebar][$key]);
-               $sidebars_widgets[$sidebar] = array_values($sidebars_widgets[$sidebar]);
-               wp_set_sidebars_widgets( $sidebars_widgets );
+               $sidebar = array_diff( $sidebar, array($widget_id) );
+               $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
        }
-       wp_redirect( remove_query_arg( $query_args ) );
-       exit;
-} elseif ( isset($_GET['edit']) && $_GET['edit'] && isset($_GET['key']) && is_numeric($_GET['key']) ) {
-       // Edit widget of type $_GET['edit'] and position $_GET['key']
-       $key = (int) $_GET['key'];
-       if ( -1 < $key && ( $keys = array_keys($sidebars_widgets[$sidebar], $_GET['edit']) ) && in_array($key, $keys) )
-               $edit_widget = $key;
-}
 
-// Total number of registered sidebars
-$sidebar_widget_count = count($sidebars_widgets[$sidebar]);
+       $_POST['widget-id'] = $sidebar;
 
-// This is sort of lame since "widget" won't be converted to "widgets" in the JS
-if ( 1 < $sidebars_count = count($wp_registered_sidebars) )
-       $sidebar_info_text = __ngettext( 'You are using %1$s widget in the "%2$s" sidebar.', 'You are using %1$s widgets in the "%2$s" sidebar.', $sidebar_widget_count );
-else
-       $sidebar_info_text = __ngettext( 'You are using %1$s widget in the sidebar.', 'You are using %1$s widgets in the sidebar.', $sidebar_widget_count );
+       foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
+               if ( $name != $id_base || !is_callable($control['callback']) )
+                       continue;
 
+               ob_start();
+                       call_user_func_array( $control['callback'], $control['params'] );
+               ob_end_clean();
 
-$sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "<span id='widget-count'>$sidebar_widget_count</span>", $wp_registered_sidebars[$sidebar]['name'] );
+               break;
+       }
 
-$page = isset($_GET['apage']) ? abs( (int) $_GET['apage'] ) : 1;
+       $sidebars_widgets[$sidebar_id] = $sidebar;
 
-/* TODO: Paginate widgets list
-$page_links = paginate_links( array(
-       'base'    => add_query_arg( 'apage', '%#%' ),
-       'format'  => '',
-       'total'   => ceil(($total = 105 )/ 10),
-       'current' => $page
-));
-*/
-$page_links = '&nbsp;';
+       // remove old position
+       if ( !isset($_POST['delete_widget']) ) {
+               foreach ( $sidebars_widgets as $key => $sb ) {
+                       if ( is_array($sb) )
+                               $sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+               }
+               array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
+       }
 
-// Unsanitized!
-$widget_search = isset($_GET['s']) ? $_GET['s'] : false;
+       wp_set_sidebars_widgets($sidebars_widgets);
+       wp_redirect('widgets.php?message=0');
+       exit;
+}
 
-// Not entirely sure what all should be here
-$show_values = array(
-       ''       => $widget_search ? __( 'Show any widgets' ) : __( 'Show all widgets' ),
-       'unused' => __( 'Show unused widgets' ),
-       'used'   => __( 'Show used widgets' )
-);
+// Output the widget form without js
+if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
+       $widget_id = $_GET['editwidget'];
+
+       if ( isset($_GET['addnew']) ) {
+               // Default to the first sidebar
+               $sidebar = array_shift( $keys = array_keys($wp_registered_sidebars) );
+
+               if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
+                       // Copy minimal info from an existing instance of this widget to a new instance
+                       foreach ( $wp_registered_widget_controls as $control ) {
+                               if ( $_GET['base'] === $control['id_base'] ) {
+                                       $control_callback = $control['callback'];
+                                       $multi_number = (int) $_GET['num'];
+                                       $control['params'][0]['number'] = -1;
+                                       $widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
+                                       $wp_registered_widget_controls[$control['id']] = $control;
+                                       break;
+                               }
+                       }
+               }
+       }
 
-$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false;
+       if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) {
+               $control = $wp_registered_widget_controls[$widget_id];
+               $control_callback = $control['callback'];
+       } elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) {
+               $name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
+       }
 
-$messages = array(
-       'updated' => __('Changes saved.')
-);
+       if ( !isset($name) )
+               $name = esc_html( strip_tags($control['name']) );
 
-require_once( 'admin-header.php' ); ?>
+       if ( !isset($sidebar) )
+               $sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
+       if ( !isset($multi_number) )
+               $multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
-
-       <form id="widgets-filter" action="" method="get">
-
-       <div class="widget-liquid-left-holder">
-       <div id="available-widgets-filter" class="widget-liquid-left">
-               <h3><label for="show"><?php _e('Available Widgets'); ?></label></h3>
-               <div class="nav">
-                       <select name="show" id="show">
-<?php foreach ( $show_values as $show_value => $show_text ) : $show_value = attribute_escape( $show_value ); ?>
-                               <option value='<?php echo $show_value; ?>'<?php selected( $show_value, $show ); ?>><?php echo wp_specialchars( $show_text ); ?></option>
-<?php endforeach; ?>
-                       </select>
-                       <input type="submit" value="<?php _e('Show' ); ?>" class="button-secondary" />
-                       <p class="pagenav">
-                               <?php echo $page_links; ?>
-                       </p>
-               </div>
-       </div>
-       </div>
+       $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
-       <div id="available-sidebars" class="widget-liquid-right">
-               <h3><label for="sidebar-selector"><?php _e('Current Widgets'); ?></label></h3>
+       // show the widget form
+       $width = ' style="width:' . max($control['width'], 350) . 'px"';
+       $key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
-               <div class="nav">
-                       <select id="sidebar-selector" name="sidebar">
-<?php foreach ( $wp_registered_sidebars as $sidebar_id => $registered_sidebar ) : $sidebar_id = attribute_escape( $sidebar_id ); ?>
-                               <option value='<?php echo $sidebar_id; ?>'<?php selected( $sidebar_id, $sidebar ); ?>><?php echo wp_specialchars( $registered_sidebar['name'] ); ?></option>
-<?php endforeach; ?>
-                       </select>
-                       <input type="submit" value="<?php _e('Show' ); ?>" class="button-secondary" />
-               </div>
+       require_once( 'admin-header.php' ); ?>
+       <div class="wrap">
+       <?php screen_icon(); ?>
+       <h2><?php echo esc_html( $title ); ?></h2>
+       <div class="editwidget"<?php echo $width; ?>>
+       <h3><?php printf( __( 'Widget %s' ), $name ); ?></h3>
 
+       <form action="widgets.php" method="post">
+       <div class="widget-inside">
+<?php
+       if ( is_callable( $control_callback ) )
+               call_user_func_array( $control_callback, $control['params'] );
+       else
+               echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
        </div>
 
+       <p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
+       <div class="widget-position">
+       <table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
+<?php  foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
+               echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
+               if ( 'wp_inactive_widgets' == $sbname ) {
+                       echo '&nbsp;';
+               } else {
+                       if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
+                               $j = 1;
+                       } else {
+                               $j = count($sidebars_widgets[$sbname]);
+                               if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
+                                       $j++;
+                       }
+                       $selected = '';
+                       echo "\t\t<select name='{$sbname}_position'>\n";
+                       echo "\t\t<option value=''>" . __('-- select --') . "</option>\n";
+                       for ( $i = 1; $i <= $j; $i++ ) {
+                               if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
+                                       $selected = selected( $i, $key + 1, false );
+                               echo "\t\t<option value='$i'$selected> $i </option>\n";
+                       }
+                       echo "\t\t</select>\n";
+               }
+               echo "</td></tr>\n";
+       } ?>
+       </tbody></table>
+       </div>
+
+       <div class="widget-control-actions">
+<?php  if ( isset($_GET['addnew']) ) { ?>
+       <a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
+<?php  } else { ?>
+       <input type="submit" name="removewidget" class="button alignleft" value="<?php esc_attr_e('Remove'); ?>" />
+<?php  } ?>
+       <input type="submit" name="savewidget" class="button-primary alignright" value="<?php esc_attr_e('Save Widget'); ?>" />
+       <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
+       <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
+       <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
+<?php  wp_nonce_field("save-delete-widget-$widget_id"); ?>
+       <br class="clear" />
+       </div>
        </form>
+       </div>
+       </div>
+<?php
+       require_once( 'admin-footer.php' );
+       exit;
+}
 
-       <div id="widget-content" class="widget-liquid-left-holder">
+$widgets_access = get_user_setting( 'widgets_access' );
+if ( isset($_GET['widgets-access']) ) {
+       $widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off';
+       set_user_setting( 'widgets_access', $widgets_access );
+}
 
-               <div id="available-widgets" class="widget-liquid-left">
+if ( 'on' == $widgets_access )
+       add_filter( 'admin_body_class', create_function('', '{return " widgets_access ";}') );
 
-                       <?php wp_list_widgets( $show, $widget_search ); // This lists all the widgets for the query ( $show, $search ) ?>
+$messages = array(
+       __('Changes saved.')
+);
 
-                       <div class="nav">
-                               <p class="pagenav">
-                                       <?php echo $page_links; ?>
-                               </p>
-                       </div>
-               </div>
-       </div>
+$errors = array(
+       __('Error while saving.'),
+       __('Error in displaying the widget settings form.')
+);
 
-       <form id="widget-controls" action="" method="post">
+require_once( 'admin-header.php' ); ?>
 
-       <div id="current-widgets-head" class="widget-liquid-right">
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?></h2>
 
-               <div id="sidebar-info">
-                       <p><?php echo $sidebar_info_text; ?></p>
-                       <p><?php _e( 'Add more from the Available Widgets section.' ); ?></p>
+<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php } ?>
+<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
+<div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
+<?php } ?>
+
+<div class="widget-liquid-left">
+<div id="widgets-left">
+       <div id="available-widgets" class="widgets-holder-wrap">
+               <div class="sidebar-name">
+               <div class="sidebar-name-arrow"><br /></div>
+               <h3><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _e('Deactivate'); ?> <span></span></span></h3></div>
+               <div class="widget-holder">
+               <p class="description"><?php _e('Drag widgets from here to a sidebar on the right to activate them. Drag widgets back here to deactivate them and delete their settings.'); ?></p>
+               <div id="widget-list">
+               <?php wp_list_widgets(); ?>
                </div>
-
+               <br class='clear' />
+               </div>
+               <br class="clear" />
        </div>
 
-       <div id="current-widgets" class="widget-liquid-right">
-               <div id="current-sidebar">
-
-                       <?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
-
+       <div class="widgets-holder-wrap">
+               <div class="sidebar-name">
+               <div class="sidebar-name-arrow"><br /></div>
+               <h3><?php _e('Inactive Widgets'); ?>
+               <span><img src="images/wpspin_light.gif" class="ajax-feedback" title="" alt="" /></span></h3></div>
+               <div class="widget-holder inactive">
+               <p class="description"><?php _e('Drag widgets here to remove them from the sidebar but keep their settings.'); ?></p>
+               <?php wp_list_widget_controls('wp_inactive_widgets'); ?>
+               <br class="clear" />
                </div>
+       </div>
+</div>
+</div>
 
-               <p class="submit">
-                       <input type="hidden" id='sidebar' name='sidebar' value="<?php echo $sidebar; ?>" />
-                       <input type="hidden" id="generated-time" name="generated-time" value="<?php echo time() - 1199145600; // Jan 1, 2008 ?>" />
-                       <input type="submit" name="save-widgets" class="button-primary" value="<?php _e( 'Save Changes' ); ?>" />
+<div class="widget-liquid-right">
+<div id="widgets-right">
 <?php
-                       wp_nonce_field( 'edit-sidebar_' . $sidebar );
-?>
-               </p>
+$i = 0;
+foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
+       if ( 'wp_inactive_widgets' == $sidebar )
+               continue;
+       $closed = $i ? ' closed' : ''; ?>
+       <div class="widgets-holder-wrap<?php echo $closed; ?>">
+       <div class="sidebar-name">
+       <div class="sidebar-name-arrow"><br /></div>
+       <h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
+       <span><img src="images/wpspin_dark.gif" class="ajax-feedback" title="" alt="" /></span></h3></div>
+       <?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
        </div>
-
-       </form>
-       <br class="clear" />
-
+<?php
+       $i++;
+} ?>
+</div>
+</div>
+<form action="" method="post">
+<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+</form>
+<br class="clear" />
 </div>
 
-<?php do_action( 'sidebar_admin_page' ); ?>
-
-<?php require_once( 'admin-footer.php' ); ?>
-
-
+<?php
+do_action( 'sidebar_admin_page' );
+require_once( 'admin-footer.php' );