]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/widgets.php
Wordpress 3.1-scripts
[autoinstalls/wordpress.git] / wp-admin / widgets.php
index a33dc8463b6419c3fd26d41ceedc554c6bcdad99..4ae5478f1f007182e5bf5d2ac9bc6318cc8b8bc5 100644 (file)
 <?php
 <?php
+/**
+ * Widgets administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
 
 
-require_once 'admin.php';
+/** WordPress Administration Bootstrap */
+require_once( './admin.php' );
 
 
-if ( ! current_user_can('switch_themes') )
+/** WordPress Administration Widgets API */
+require_once(ABSPATH . 'wp-admin/includes/widgets.php');
+
+if ( ! current_user_can('edit_theme_options') )
        wp_die( __( 'Cheatin&#8217; uh?' ));
 
        wp_die( __( 'Cheatin&#8217; uh?' ));
 
-wp_enqueue_script('interface');
+wp_admin_css( '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
+$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 );
+}
 
 
-       $cols = array();
-       foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-               $cols[] = '\'' . $index . '\'';
-       }
-       $cols = implode( ', ', $cols );
+if ( 'on' == $widgets_access )
+       add_filter( 'admin_body_class', create_function('', '{return " widgets_access ";}') );
+else
+       wp_enqueue_script('admin-widgets');
 
 
-       $widgets = array();
-       foreach ( $wp_registered_widgets as $name => $widget ) {
-               $widgets[] = '\'' . $widget['id'] . '\'';
-       }
-       $widgets = implode( ', ', $widgets );
-?>
-<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');});
-               jQuery('#<?php echo $widget['id']; ?>control').Draggable({handle: '.controlhandle', zIndex: 1000});
-               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;
+do_action( 'sidebar_admin_setup' );
+
+$title = __( 'Widgets' );
+$parent_file = 'themes.php';
+
+$help = '
+       <p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
+       <p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>
+       <p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
+       <p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
+       <p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>
+       <p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>
+';
+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Widgets_SubPanel" target="_blank">Documentation on Widgets</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
+add_contextual_help($current_screen, $help);
+
+// register the inactive_widgets area as sidebar
+register_sidebar(array(
+       'name' => __('Inactive Widgets'),
+       'id' => 'wp_inactive_widgets',
+       'description' => '',
+       '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]);
                }
                }
-               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();
+
+       // 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 );
+               }
        }
        }
-       jQuery(document).ready( function() {
-               updateAll();
-               initWidgets();
-       });
-// ]]>
-</script>
-<?php
-}
-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;
+       // discard invalid, theme-specific widgets from sidebars
+       $shown_widgets = array();
+       foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
+               if ( !is_array($widgets) )
+                       continue;
 
 
-       if ( !isset( $wp_registered_widgets[$name] ) ) {
-               return;
+               $_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);
        }
 
        }
 
-       $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>'
-               : '';
+       $sidebars_widgets = $_sidebars_widgets;
+       unset($_sidebars_widgets, $_widgets);
 
 
-       $output = '<li class="module" id="widgetprefix-%1$s"><span class="handle">%2$s</span></li>';
+       // find hidden/lost multi-widget instances
+       $lost_widgets = array();
+       foreach ( $wp_registered_widgets as $key => $val ) {
+               if ( in_array($key, $shown_widgets, true) )
+                       continue;
 
 
-       printf( $output, $sanitized_name, $wp_registered_widgets[$name]['name'] . $popper );
-}
+               $number = preg_replace('/.+?-([0-9]+)$/', '$1', $key);
 
 
-$title = __( 'Widgets' );
-$parent_file = 'themes.php';
+               if ( 2 > (int) $number )
+                       continue;
+
+               $lost_widgets[] = $key;
+       }
 
 
-require_once 'admin-header.php';
+       $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 ( 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">
-               <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 class="wrap">
+       <?php screen_icon(); ?>
+       <h2><?php echo esc_html( $title ); ?></h2>
+               <div class="error">
+                       <p><?php _e( 'No Sidebars Defined' ); ?></p>
+               </div>
+               <p><?php _e( '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://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ); ?></p>
        </div>
        </div>
-<?php
 
 
-       require_once 'admin-footer.php';
+<?php
+       require_once( './admin-footer.php' );
        exit;
 }
 
        exit;
 }
 
-$sidebars_widgets = wp_get_sidebars_widgets();
+// 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");
+
+       $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;
+                       }
+               }
+       }
 
 
-if ( empty( $sidebars_widgets ) ) {
-       $sidebars_widgets = wp_get_widget_defaults();
-}
+       $sidebar_id = $_POST['sidebar'];
+       $position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
 
 
-if ( isset( $_POST['action'] ) ) {
-       check_admin_referer( 'widgets-save-widget-order' );
+       $id_base = $_POST['id_base'];
+       $sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
 
 
-       switch ( $_POST['action'] ) {
-               case 'default' :
-                       $sidebars_widgets = wp_get_widget_defaults();
-                       wp_set_sidebars_widgets( $sidebars_widgets );
-               break;
+       // delete
+       if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
 
 
-               case 'save_widget_order' :
-                       $sidebars_widgets = array();
+               if ( !in_array($widget_id, $sidebar, true) ) {
+                       wp_redirect( admin_url('widgets.php?error=0') );
+                       exit;
+               }
 
 
-                       foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-                               $postindex = $index . 'order';
+               $sidebar = array_diff( $sidebar, array($widget_id) );
+               $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+       }
 
 
-                               parse_str( $_POST[$postindex], $order );
+       $_POST['widget-id'] = $sidebar;
 
 
-                               $new_order = $order[$index];
+       foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
+               if ( $name != $id_base || !is_callable($control['callback']) )
+                       continue;
 
 
-                               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;
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
+               ob_start();
+                       call_user_func_array( $control['callback'], $control['params'] );
+               ob_end_clean();
 
 
-                       wp_set_sidebars_widgets( $sidebars_widgets );
                break;
        }
                break;
        }
-}
 
 
-ksort( $wp_registered_widgets );
+       $sidebars_widgets[$sidebar_id] = $sidebar;
 
 
-$inactive_widgets = array();
+       // 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 );
+       }
 
 
-foreach ( $wp_registered_widgets as $name => $widget ) {
-       $is_active = false;
+       wp_set_sidebars_widgets($sidebars_widgets);
+       wp_redirect( admin_url('widgets.php?message=0') );
+       exit;
+}
 
 
-       foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-               if ( is_array( $sidebars_widgets[$index] ) && in_array( $name, $sidebars_widgets[$index] ) ) {
-                       $is_active = true;
-                       break;
+// 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;
+                               }
+                       }
                }
        }
 
                }
        }
 
-       if ( !$is_active ) {
-               $inactive_widgets[] = $name;
+       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']) );
        }
        }
-}
 
 
-$containers = array( 'palette' );
+       if ( !isset($name) )
+               $name = esc_html( strip_tags($control['name']) );
 
 
-foreach ( $wp_registered_sidebars as $index => $sidebar ) {
-       $containers[] = $index;
-}
+       if ( !isset($sidebar) )
+               $sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
 
-$c_string = '';
+       if ( !isset($multi_number) )
+               $multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
 
-foreach ( $containers as $container ) {
-       $c_string .= '"' . $container . '",';
-}
+       $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
 
-$c_string = substr( $c_string, 0, -1 );
+       // show the widget form
+       $width = ' style="width:' . max($control['width'], 350) . 'px"';
+       $key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
 
-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>
+       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>
        </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;
+                               $sidebars_widgets[$sbname] = array();
+                       } 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=''>" . __('&mdash; Select &mdash;') . "</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
 <?php
+       } else {
+               submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
+       }
+       submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
+       <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 class="wrap">
-               <h2><?php _e( 'Sidebar Arrangement' ); ?></h2>
-
-               <p><?php _e( 'You can drag and drop widgets onto your sidebar below.' ); ?></p>
-
-               <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>
-
-                                       <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
-                               }
-                       ?>
-
-                       </div>
-
-                       <div id="palettediv">
-                               <h3><?php _e( 'Available Widgets' ); ?></h3>
-
-                               <ul id="palette">
-                               <?php
-                                       foreach ( $inactive_widgets as $name ) {
-                                               wp_widget_draggable( $name );
-                                       }
-                               ?>
-                               </ul>
-                       </div>
-
-                       <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="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>
 
 
+$messages = array(
+       __('Changes saved.')
+);
+
+$errors = array(
+       __('Error while saving.'),
+       __('Error in displaying the widget settings form.')
+);
+
+require_once( './admin-header.php' ); ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?></h2>
+
+<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<div id="message" class="updated"><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 } ?>
+
+<?php do_action( 'widgets_admin_page' ); ?>
+
+<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>
 
                <br class="clear" />
        </div>
 
-       <div id="shadow"> </div>
+       <div class="widgets-holder-wrap">
+               <div class="sidebar-name">
+               <div class="sidebar-name-arrow"><br /></div>
+               <h3><?php _e('Inactive Widgets'); ?>
+               <span><img src="<?php echo esc_url( admin_url( '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>
 
 
-       <?php do_action( 'sidebar_admin_page' ); ?>
+<div class="widget-liquid-right">
+<div id="widgets-right">
+<?php
+$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="<?php echo esc_url( admin_url( '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>
+<?php
+       $i++;
+} ?>
+</div>
+</div>
+<form action="" method="post">
+<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+</form>
+<br class="clear" />
+</div>
 
 
-<?php require_once 'admin-footer.php'; ?>
+<?php
+do_action( 'sidebar_admin_page' );
+require_once( './admin-footer.php' );