Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 260 insertions, 298 deletions

diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 30d687b..4a8751d 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -1,359 +1,321 @@
 <?php
 
-require_once 'admin.php';
+require_once( 'admin.php' );
+require_once(ABSPATH . 'wp-admin/includes/widgets.php');
 
 if ( ! current_user_can('switch_themes') )
 	wp_die( __( 'Cheatin&#8217; uh?' ));
 
-wp_enqueue_script('interface');
+wp_enqueue_script( array( 'wp-lists', 'admin-widgets' ) );
 
-function wp_widgets_admin_head() {
-	global $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls;
-?>
-	<?php wp_admin_css( 'css/widgets' ); ?>
-	<!--[if IE 7]>
-	<style type="text/css">
-		#palette { float: <?php echo ( get_bloginfo( 'text_direction' ) == 'rtl' ) ? 'right' : 'left'; ?>; }
-	</style>
-	<![endif]-->
-<?php
+do_action( 'sidebar_admin_setup' );
 
-	$cols = array();
-	foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-		$cols[] = '\'' . $index . '\'';
-	}
-	$cols = implode( ', ', $cols );
+$title = __( 'Widgets' );
+$parent_file = 'themes.php';
 
-	$widgets = array();
-	foreach ( $wp_registered_widgets as $name => $widget ) {
-		$widgets[] = '\'' . $widget['id'] . '\'';
-	}
-	$widgets = implode( ', ', $widgets );
+// $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( array_keys($wp_registered_sidebars) );
+} else {
+	// If no sidebars, die.
+	require_once( 'admin-header.php' );
 ?>
-<script type="text/javascript">
-// <![CDATA[
-	var cols = [<?php echo $cols; ?>];
-	var widgets = [<?php echo $widgets; ?>];
-	var controldims = new Array;
-	<?php foreach ( $wp_registered_widget_controls as $name => $widget ) : ?>
-		controldims['#<?php echo $widget['id']; ?>control'] = new Array;
-		controldims['#<?php echo $widget['id']; ?>control']['width'] = <?php echo (int) $widget['width']; ?>;
-		controldims['#<?php echo $widget['id']; ?>control']['height'] = <?php echo (int) $widget['height']; ?>;
-	<?php endforeach; ?>
-	function initWidgets() {
-	<?php foreach ( $wp_registered_widget_controls as $name => $widget ) : ?>
-		jQuery('#<?php echo $widget['id']; ?>popper').click(function() {popControl('#<?php echo $widget['id']; ?>control');});
-		jQuery('#<?php echo $widget['id']; ?>closer').click(function() {unpopControl('#<?php echo $widget['id']; ?>control');});
-		if ( true && window.opera )
-			jQuery('#<?php echo $widget['id']; ?>control').css('border','1px solid #bbb');
-	<?php endforeach; ?>
-		jQuery('#shadow').css('opacity','0');
-		jQuery(widgets).each(function(o) {o='#widgetprefix-'+o; jQuery(o).css('position','relative');} );
-	}
-	function resetDroppableHeights() {
-		var max = 6;
-		jQuery.map(cols, function(o) {
-			var c = jQuery('#' + o + ' li').length;
-			if ( c > max ) max = c;
-		});
-		var maxheight = 35 * ( max + 1);
-		jQuery.map(cols, function(o) {
-			height = 0 == jQuery('#' + o + ' li').length ? maxheight - jQuery('#' + o + 'placemat').height() : maxheight;
-			jQuery('#' + o).height(height);
-		});
-	}
-	function maxHeight(elm) {
-		htmlheight = document.body.parentNode.clientHeight;
-		bodyheight = document.body.clientHeight;
-		var height = htmlheight > bodyheight ? htmlheight : bodyheight;
-		jQuery(elm).height(height);
-	}
-	function getViewportDims() {
-		var x,y;
-		if (self.innerHeight) { // all except Explorer
-			x = self.innerWidth;
-			y = self.innerHeight;
-		} else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
-			x = document.documentElement.clientWidth;
-			y = document.documentElement.clientHeight;
-		} else if (document.body) { // other Explorers
-			x = document.body.clientWidth;
-			y = document.body.clientHeight;
-		}
-		return new Array(x,y);
-	}
-	function dragChange(o) {
-		var p = getViewportDims();
-		var screenWidth = p[0];
-		var screenHeight = p[1];
-		var elWidth = parseInt( jQuery(o).css('width') );
-		var elHeight = parseInt( jQuery(o).css('height') );
-		var elLeft = parseInt( jQuery(o).css('left') );
-		var elTop = parseInt( jQuery(o).css('top') );
-		if ( screenWidth < ( parseInt(elLeft) + parseInt(elWidth) ) )
-			jQuery(o).css('left', ( screenWidth - elWidth ) + 'px' );
-		if ( screenHeight < ( parseInt(elTop) + parseInt(elHeight) ) )
-			jQuery(o).css('top', ( screenHeight - elHeight ) + 'px' );
-		if ( elLeft < 1 )
-			jQuery(o).css('left', '1px');
-		if ( elTop < 1 )
-			jQuery(o).css('top', '1px');
-	}
-	function popControl(elm) {
-		var x = ( document.body.clientWidth - controldims[elm]['width'] ) / 2;
-		var y = ( document.body.parentNode.clientHeight - controldims[elm]['height'] ) / 2;
-		jQuery(elm).css({display: 'block', width: controldims[elm]['width'] + 'px', height: controldims[elm]['height'] + 'px', position: 'absolute', right: x + 'px', top: y + 'px', zIndex: '1000' });
-		jQuery(elm).attr('class','control');
-		jQuery('#shadow').click(function() {unpopControl(elm);});
-		window.onresize = function(){maxHeight('#shadow');dragChange(elm);};
-		popShadow();
-	}
-	function popShadow() {
-		maxHeight('#shadow');
-		jQuery('#shadow').css({zIndex: '999', display: 'block'});
-		jQuery('#shadow').fadeTo('fast', 0.2);
-	}
-	function unpopShadow() {
-		jQuery('#shadow').fadeOut('fast', function() {jQuery('#shadow').hide()});
-	}
-	function unpopControl(el) {
-		jQuery(el).attr('class','hidden');
-		jQuery(el).hide();
-		unpopShadow();
-	}
-	function serializeAll() {
-	<?php $i = 0; foreach ( $wp_registered_sidebars as $index => $sidebar ) : $i++; ?>
-		var serial<?php echo $i ?> = jQuery.SortSerialize('<?php echo $index ?>');
-		jQuery('#<?php echo $index ?>order').attr('value',serial<?php echo $i ?>.hash.replace(/widgetprefix-/g, ''));
-	<?php endforeach; ?>
-	}
-	function updateAll() {
-		jQuery.map(cols, function(o) {
-			if ( jQuery('#' + o + ' li').length )
-				jQuery('#'+o+'placemat span.handle').hide();
-			else
-				jQuery('#'+o+'placemat span.handle').show();
-		});
-		resetDroppableHeights();
-	}
-	jQuery(document).ready( function() {
-		updateAll();
-		initWidgets();
-	});
-// ]]>
-</script>
+
+	<div class="error">
+		<p><?php _e( 'No Sidebars Defined' ); ?></p>
+	</div>
+
+	<div class="wrap">
+		<p><?php _e( 'You are seeing this message because the theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="http://automattic.com/code/widgets/themes/">follow these instructions</a>.' ); /* TODO: article on codex */; ?></p>
+	</div>
+
 <?php
+	require_once( 'admin-footer.php' );
+	exit;
 }
-add_action( 'admin_head', 'wp_widgets_admin_head' );
-do_action( 'sidebar_admin_setup' );
 
-function wp_widget_draggable( $name ) {
-	global $wp_registered_widgets, $wp_registered_widget_controls;
+// These are the widgets grouped by sidebar
+$sidebars_widgets = wp_get_sidebars_widgets();
+if ( empty( $sidebars_widgets ) )
+	$sidebars_widgets = wp_get_widget_defaults();
 
-	if ( !isset( $wp_registered_widgets[$name] ) ) {
-		return;
-	}
+// 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'];
+			}
+
+			ob_clean();
+		}
+	ob_end_clean();
 
-	$sanitized_name = sanitize_title( $wp_registered_widgets[$name]['id'] );
-	$link_title = __( 'Configure' );
-	$popper = ( isset( $wp_registered_widget_controls[$name] ) )
-		? ' <div class="popper" id="' . $sanitized_name . 'popper" title="' . $link_title . '">&#8801;</div>'
-		: '';
+	// Prophylactic.  Take out empty ids.
+	foreach ( (array) $_POST['widget-id'] as $key => $val )
+		if ( !$val )
+			unset($_POST['widget-id'][$key]);
 
-	$output = '<li class="module" id="widgetprefix-%1$s"><span class="handle">%2$s</span></li>';
+	// 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 );
 
-	printf( $output, $sanitized_name, $wp_registered_widgets[$name]['name'] . $popper );
+	wp_redirect( add_query_arg( 'message', 'updated' ) );
+	exit;
 }
 
-$title = __( 'Widgets' );
-$parent_file = 'themes.php';
 
-require_once 'admin-header.php';
 
-if ( count( $wp_registered_sidebars ) < 1 ) {
-?>
-	<div class="wrap">
-		<h2><?php _e( 'No Sidebars Defined' ); ?></h2>
 
-		<p><?php _e( 'You are seeing this message because the theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="http://automattic.com/code/widgets/themes/">follow these instructions</a>.' ); /* TODO: article on codex */; ?></p>
-	</div>
-<?php
+// 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;
+			}
+		}
+	}
 
-	require_once 'admin-footer.php';
+	// 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">
+					<h4 class="widget-title"><?php echo $control['name']; ?></h4>
+					<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 );
+	}
+	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;
 }
 
-$sidebars_widgets = wp_get_sidebars_widgets();
+// Total number of registered sidebars
+$sidebar_widget_count = count($sidebars_widgets[$sidebar]);
 
-if ( empty( $sidebars_widgets ) ) {
-	$sidebars_widgets = wp_get_widget_defaults();
-}
+// 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 );
 
-if ( isset( $_POST['action'] ) ) {
-	check_admin_referer( 'widgets-save-widget-order' );
 
-	switch ( $_POST['action'] ) {
-		case 'default' :
-			$sidebars_widgets = wp_get_widget_defaults();
-			wp_set_sidebars_widgets( $sidebars_widgets );
-		break;
+$sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "<span id='widget-count'>$sidebar_widget_count</span>", $wp_registered_sidebars[$sidebar]['name'] );
 
-		case 'save_widget_order' :
-			$sidebars_widgets = array();
+$page = isset($_GET['apage']) ? abs( (int) $_GET['apage'] ) : 1;
 
-			foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-				$postindex = $index . 'order';
+/* 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;';
 
-				parse_str( $_POST[$postindex], $order );
+// Unsanitized!
+$widget_search = isset($_GET['s']) ? $_GET['s'] : false;
 
-				$new_order = $order[$index];
+// 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' )
+);
 
-				if ( is_array( $new_order ) ) {
-					foreach ( $new_order as $sanitized_name ) {
-						foreach ( $wp_registered_widgets as $name => $widget ) {
-							if ( $sanitized_name == $widget['id'] ) {
-								$sidebars_widgets[$index][] = $name;
-							}
-						}
-					}
-				}
-			}
+$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false;
 
-			wp_set_sidebars_widgets( $sidebars_widgets );
-		break;
-	}
-}
 
-ksort( $wp_registered_widgets );
+$messages = array(
+	'updated' => __('Changes saved.')
+);
 
-$inactive_widgets = array();
+require_once( 'admin-header.php' );
 
-foreach ( $wp_registered_widgets as $name => $widget ) {
-	$is_active = false;
+if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
 
-	foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-		if ( is_array( $sidebars_widgets[$index] ) && in_array( $name, $sidebars_widgets[$index] ) ) {
-			$is_active = true;
-			break;
-		}
-	}
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 
-	if ( !$is_active ) {
-		$inactive_widgets[] = $name;
-	}
-}
+<?php endif; ?>
 
-$containers = array( 'palette' );
+<div class="wrap">
 
-foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-	$containers[] = $index;
-}
+	<form id="widgets-filter" action="" method="get">
 
-$c_string = '';
+	<h2><?php _e( 'Widgets' ); ?></h2>
+	<p id="widget-search">
+		<input type="text" id="widget-search-input" name="s" value="<?php echo attribute_escape( $widget_search ); ?>" />
+		<input type="submit" class="button" value="<?php _e( 'Search Widgets' ); ?>" />
+	</p>
 
-foreach ( $containers as $container ) {
-	$c_string .= '"' . $container . '",';
-}
+	<div class="widget-liquid-left-holder">
+	<div id="available-widgets-filter" class="widget-liquid-left">
+		<h3><?php _e('Available Widgets'); ?></h3>
+		<div class="nav">
+			<select name="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>
 
-$c_string = substr( $c_string, 0, -1 );
+	<div id="available-sidebars" class="widget-liquid-right">
+		<h3><?php _e('Current Widgets'); ?></h3>
+
+		<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>
 
-if ( isset( $_POST['action'] ) ) {
-?>
-	<div class="fade updated" id="message">
-		<p><?php printf( __( 'Sidebar updated. <a href="%s">View site &raquo;</a>' ), get_bloginfo( 'url' ) . '/' ); ?></p>
 	</div>
-<?php
-}
-?>
-	<div class="wrap">
-		<h2><?php _e( 'Sidebar Arrangement' ); ?></h2>
 
-		<p><?php _e( 'You can drag and drop widgets onto your sidebar below.' ); ?></p>
+	</form>
 
-		<form id="sbadmin" method="post" onsubmit="serializeAll();">
-			<p class="submit">
-				<input type="submit" value="<?php _e( 'Save Changes &raquo;' ); ?>" />
-			</p>
-			<div id="zones">
-			<?php
-				foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-			?>
-				<input type="hidden" id="<?php echo $index; ?>order" name="<?php echo $index; ?>order" value="" />
-
-				<div class="dropzone">
-					<h3><?php echo $sidebar['name']; ?></h3>
-
-					<div id="<?php echo $index; ?>placemat" class="placemat">
-						<span class="handle">
-							<h4><?php _e( 'Default Sidebar' ); ?></h4>
-							<?php _e( 'Your theme will display its usual sidebar when this box is empty. Dragging widgets into this box will replace the usual sidebar with your customized sidebar.' ); ?>
-						</span>
-					</div>
+	<div id="widget-content" class="widget-liquid-left-holder">
+
+		<div id="available-widgets" class="widget-liquid-left">
 
-					<ul id="<?php echo $index; ?>">
-					<?php
-						if ( is_array( $sidebars_widgets[$index] ) ) {
-							foreach ( $sidebars_widgets[$index] as $name ) {
-								wp_widget_draggable( $name );
-							}
-						}
-					?>
-					</ul>
-				</div>
-			<?php
-				}
-			?>
+			<?php wp_list_widgets( $show, $widget_search ); // This lists all the widgets for the query ( $show, $search ) ?>
 
+			<div class="nav">
+				<p class="pagenav">
+					<?php echo $page_links; ?>
+				</p>
 			</div>
+		</div>
+	</div>
 
-			<div id="palettediv">
-				<h3><?php _e( 'Available Widgets' ); ?></h3>
+	<form id="widget-controls" action="" method="post">
 
-				<ul id="palette">
-				<?php
-					foreach ( $inactive_widgets as $name ) {
-						wp_widget_draggable( $name );
-					}
-				?>
-				</ul>
-			</div>
+	<div id="current-widgets-head" class="widget-liquid-right">
 
-			<script type="text/javascript">
-			// <![CDATA[
-				jQuery(document).ready(function(){
-			<?php foreach ( $containers as $container ) { ?>
-					jQuery('ul#<?php echo $container; ?>').Sortable({
-						accept: 'module', activeclass: 'activeDraggable', opacity: 0.8, revert: true, onStop: updateAll
-					});
-			<?php } ?>
-				});
-			// ]]>
-			</script>
-
-			<p class="submit">
-			<?php wp_nonce_field( 'widgets-save-widget-order' ); ?>
-				<input type="hidden" name="action" id="action" value="save_widget_order" />
-				<input type="submit" value="<?php _e( 'Save Changes &raquo;' ); ?>" />
-			</p>
+		<div id="sidebar-info">
+			<p><?php echo $sidebar_info_text; ?></p>
+			<p><?php _e( 'Add more from the Available Widgets section.' ); ?></p>
+		</div>
 
-			<div id="controls">
-			<?php foreach ( $wp_registered_widget_controls as $name => $widget ) { ?>
-				<div class="hidden" id="<?php echo $widget['id']; ?>control">
-					<span class="controlhandle"><?php echo $widget['name']; ?></span>
-					<span id="<?php echo $widget['id']; ?>closer" class="controlcloser">&#215;</span>
-					<div class="controlform">
-					<?php call_user_func_array( $widget['callback'], $widget['params'] ); ?>
-					</div>
-				</div>
-			<?php } ?>
-			</div>
-		</form>
+	</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 ?>
 
-		<br class="clear" />
+		</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" value="<?php _e( 'Save Changes' ); ?>" />
+<?php
+			wp_nonce_field( 'edit-sidebar_' . $sidebar );
+?>
+		</p>
 	</div>
 
-	<div id="shadow"> </div>
+	</form>
+
+</div>
+
+<?php do_action( 'sidebar_admin_page' ); ?>
 
-	<?php do_action( 'sidebar_admin_page' ); ?>
+<?php require_once( 'admin-footer.php' ); ?>
 
-<?php require_once 'admin-footer.php'; ?>