WordPress 4.6.1
[autoinstalls/wordpress.git] / wp-admin / widgets.php
index 95e82814882746892e42ea9e8f0536268f06b082..a9876b891cef4d6dd6eb5a76440c8a1d9945c1e0 100644 (file)
 <?php
 /**
- * Widgets administration panel.
+ * Widget administration panel
  *
  * @package WordPress
  * @subpackage Administration
  */
 
 /** WordPress Administration Bootstrap */
-require_once( 'admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 /** WordPress Administration Widgets API */
 require_once(ABSPATH . 'wp-admin/includes/widgets.php');
 
-if ( ! current_user_can('switch_themes') )
-       wp_die( __( 'Cheatin&#8217; uh?' ));
+if ( ! current_user_can( 'edit_theme_options' ) ) {
+       wp_die(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+               403
+       );
+}
 
-wp_enqueue_script( array( 'wp-lists', 'admin-widgets' ) );
-wp_admin_css( 'widgets' );
+$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 );
+}
 
+if ( 'on' == $widgets_access ) {
+       add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
+} else {
+       wp_enqueue_script('admin-widgets');
+
+       if ( wp_is_mobile() )
+               wp_enqueue_script( 'jquery-touch-punch' );
+}
+
+/**
+ * Fires early before the Widgets administration screen loads,
+ * after scripts are enqueued.
+ *
+ * @since 2.2.0
+ */
 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.
-       require_once( 'admin-header.php' );
-?>
-
-       <div class="wrap">
-       <?php screen_icon(); ?>
-       <h2><?php echo wp_specialchars( $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>
+get_current_screen()->add_help_tab( array(
+'id'           => 'overview',
+'title'                => __('Overview'),
+'content'      =>
+       '<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>'
+) );
+get_current_screen()->add_help_tab( array(
+'id'           => 'removing-reusing',
+'title'                => __('Removing and Reusing'),
+'content'      =>
+       '<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>'
+) );
+get_current_screen()->add_help_tab( array(
+'id'           => 'missing-widgets',
+'title'                => __('Missing Widgets'),
+'content'      =>
+       '<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>' .
+               '<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(
+       '<p><strong>' . __('For more information:') . '</strong></p>' .
+       '<p>' . __('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
 
-<?php
-       require_once( 'admin-footer.php' );
-       exit;
+if ( ! current_theme_supports( 'widgets' ) ) {
+       wp_die( __( '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="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ) );
 }
 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
+
 if ( empty( $sidebars_widgets ) )
        $sidebars_widgets = wp_get_widget_defaults();
 
-// for the sake of PHP warnings
-if ( empty( $sidebars_widgets[$sidebar] ) )
-       $sidebars_widgets[$sidebar] = array();
-
-$http_post = 'post' == strtolower($_SERVER['REQUEST_METHOD']);
+foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
+       if ( 'wp_inactive_widgets' == $sidebar_id )
+               continue;
+
+       if ( ! is_registered_sidebar( $sidebar_id ) ) {
+               if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
+                       register_sidebar(array(
+                               'name' => __( 'Inactive Sidebar (not used)' ),
+                               'id' => $sidebar_id,
+                               'class' => 'inactive-sidebar orphan-sidebar',
+                               'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+                               'before_widget' => '',
+                               'after_widget' => '',
+                               'before_title' => '',
+                               'after_title' => '',
+                       ));
+               } else {
+                       unset( $sidebars_widgets[ $sidebar_id ] );
+               }
+       }
+}
 
-// We're updating a sidebar
-if ( $http_post && isset($sidebars_widgets[$_POST['sidebar']]) ) {
-       check_admin_referer( 'edit-sidebar_' . $_POST['sidebar'] );
+// register the inactive_widgets area as sidebar
+register_sidebar(array(
+       'name' => __('Inactive Widgets'),
+       'id' => 'wp_inactive_widgets',
+       'class' => 'inactive-sidebar',
+       'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+       'before_widget' => '',
+       'after_widget' => '',
+       'before_title' => '',
+       'after_title' => '',
+));
 
-       /* 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();
+retrieve_widgets();
 
-               foreach ( $wp_registered_widget_controls as $name => $control ) {
-                       if ( in_array( $control['callback'], $already_done ) )
-                               continue;
+// 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");
 
-                       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;
+               if ( !in_array($widget_id, $sidebar, true) ) {
+                       wp_redirect( admin_url('widgets.php?error=0') );
+                       exit;
+               }
 
-$query_args = array('add', 'remove', 'key', 'edit', '_wpnonce', 'message', 'base' );
+               $sidebar = array_diff( $sidebar, array($widget_id) );
+               $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+
+               /**
+                * Fires immediately after a widget has been marked for deletion.
+                *
+                * @since 4.4.0
+                *
+                * @param string $widget_id  ID of the widget marked for deletion.
+                * @param string $sidebar_id ID of the sidebar the widget was deleted from.
+                * @param string $id_base    ID base for the widget.
+                */
+               do_action( 'delete_widget', $widget_id, $sidebar_id, $id_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;
-                       }
-               }
+       $_POST['widget-id'] = $sidebar;
+
+       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();
+
+               break;
        }
 
-       // 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
+       $sidebars_widgets[$sidebar_id] = $sidebar;
 
-               require_once( 'admin-footer.php' );
-               exit;
+       // 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 );
        }
-       wp_redirect( remove_query_arg( $query_args ) );
+
+       wp_set_sidebars_widgets($sidebars_widgets);
+       wp_redirect( admin_url('widgets.php?message=0') );
        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]);
+}
+
+// Remove inactive widgets without js
+if ( isset( $_POST['removeinactivewidgets'] ) ) {
+       check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
+
+       if ( $_POST['removeinactivewidgets'] ) {
+               foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
+                       $pieces = explode( '-', $widget_id );
+                       $multi_number = array_pop( $pieces );
+                       $id_base = implode( '-', $pieces );
+                       $widget = get_option( 'widget_' . $id_base );
+                       unset( $widget[$multi_number] );
+                       update_option( 'widget_' . $id_base, $widget );
+                       unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+               }
+
                wp_set_sidebars_widgets( $sidebars_widgets );
        }
-       wp_redirect( remove_query_arg( $query_args ) );
+
+       wp_redirect( admin_url( 'widgets.php?message=0' ) );
        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]);
+// 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
+               $keys = array_keys( $wp_registered_sidebars );
+               $sidebar = reset( $keys );
+
+               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;
+                               }
+                       }
+               }
+       }
 
-// 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($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']) );
+       }
 
+       if ( !isset($name) )
+               $name = esc_html( strip_tags($control['name']) );
 
-$sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "<span id='widget-count'>$sidebar_widget_count</span>", $wp_registered_sidebars[$sidebar]['name'] );
+       if ( !isset($sidebar) )
+               $sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
-$page = isset($_GET['apage']) ? abs( (int) $_GET['apage'] ) : 1;
+       if ( !isset($multi_number) )
+               $multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
-/* 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;';
+       $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
-// Unsanitized!
-$widget_search = isset($_GET['s']) ? $_GET['s'] : false;
+       // Show the widget form.
+       $width = ' style="width:' . max($control['width'], 350) . 'px"';
+       $key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
-// 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' )
-);
+       require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+       <div class="wrap">
+       <h1><?php echo esc_html( $title ); ?></h1>
+       <div class="editwidget"<?php echo $width; ?>>
+       <h2><?php printf( __( 'Widget %s' ), $name ); ?></h2>
 
-$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false;
+       <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 || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+                       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
+       } 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( ABSPATH . 'wp-admin/admin-footer.php' );
+       exit;
+}
 
 $messages = array(
-       'updated' => __('Changes saved.')
+       __('Changes saved.')
 );
 
-require_once( 'admin-header.php' ); ?>
+$errors = array(
+       __('Error while saving.'),
+       __('Error in displaying the widget settings form.')
+);
 
-<?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; ?>
+require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <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>
+<h1>
+<?php
+       echo esc_html( $title );
+       if ( current_user_can( 'customize' ) ) {
+               printf(
+                       ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
+                       esc_url( add_query_arg(
+                               array(
+                                       array( 'autofocus' => array( 'panel' => 'widgets' ) ),
+                                       'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+                               ),
+                               admin_url( 'customize.php' )
+                       ) ),
+                       __( 'Manage with Live Preview' )
+               );
+       }
+?>
+</h1>
 
-       <div id="available-sidebars" class="widget-liquid-right">
-               <h3><label for="sidebar-selector"><?php _e('Current Widgets'); ?></label></h3>
+<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<div id="message" class="updated notice is-dismissible"><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="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" />
+<?php
+/**
+ * Fires before the Widgets administration page content loads.
+ *
+ * @since 3.0.0
+ */
+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>
+                       <h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
                </div>
-
+               <div class="widget-holder">
+                       <div class="sidebar-description">
+                               <p class="description"><?php _e('To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back.'); ?></p>
+                       </div>
+                       <div id="widget-list">
+                               <?php wp_list_widgets(); ?>
+                       </div>
+                       <br class='clear' />
+               </div>
+               <br class="clear" />
        </div>
 
-       </form>
-
-       <div id="widget-content" class="widget-liquid-left-holder">
-
-               <div id="available-widgets" class="widget-liquid-left">
-
-                       <?php wp_list_widgets( $show, $widget_search ); // This lists all the widgets for the query ( $show, $search ) ?>
+<?php
 
-                       <div class="nav">
-                               <p class="pagenav">
-                                       <?php echo $page_links; ?>
-                               </p>
+$theme_sidebars = array();
+foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
+       if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+               $wrap_class = 'widgets-holder-wrap';
+               if ( !empty( $registered_sidebar['class'] ) )
+                       $wrap_class .= ' ' . $registered_sidebar['class'];
+
+               $is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
+               ?>
+               <div class="<?php echo esc_attr( $wrap_class ); ?>">
+                       <div class="widget-holder inactive">
+                               <?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
+
+                               <?php if ( $is_inactive_widgets ) { ?>
+                               <div class="remove-inactive-widgets">
+                                       <form action="" method="post">
+                                               <p>
+                                                       <?php
+                                                       $attributes = array( 'id' => 'inactive-widgets-control-remove' );
+
+                                                       if ( empty($sidebars_widgets['wp_inactive_widgets']) ) {
+                                                               $attributes['disabled'] = '';
+                                                       }
+
+                                                       submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, $attributes );
+                                                       ?>
+                                                       <span class="spinner"></span>
+                                               </p>
+                                               <?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+                                       </form>
+                               </div>
+                               <?php } ?>
                        </div>
+                       <?php if ( $is_inactive_widgets ) { ?>
+                       <p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
+                       <?php } ?>
                </div>
-       </div>
+               <?php
 
-       <form id="widget-controls" action="" method="post">
+       } else {
+               $theme_sidebars[$sidebar] = $registered_sidebar;
+       }
+}
 
-       <div id="current-widgets-head" class="widget-liquid-right">
+?>
+</div>
+</div>
+<?php
 
-               <div id="sidebar-info">
-                       <p><?php echo $sidebar_info_text; ?></p>
-                       <p><?php _e( 'Add more from the Available Widgets section.' ); ?></p>
-               </div>
+$i = $split = 0;
+$single_sidebar_class = '';
+$sidebars_count = count( $theme_sidebars );
 
-       </div>
+if ( $sidebars_count > 1 ) {
+       $split = ceil( $sidebars_count / 2 );
+} else {
+       $single_sidebar_class = ' single-sidebar';
+}
 
-       <div id="current-widgets" class="widget-liquid-right">
-               <div id="current-sidebar">
+?>
+<div class="widget-liquid-right">
+<div id="widgets-right" class="wp-clearfix<?php echo $single_sidebar_class; ?>">
+<div class="sidebars-column-1">
+<?php
 
-                       <?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
+foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
+       $wrap_class = 'widgets-holder-wrap';
+       if ( !empty( $registered_sidebar['class'] ) )
+               $wrap_class .= ' sidebar-' . $registered_sidebar['class'];
 
-               </div>
+       if ( $i > 0 )
+               $wrap_class .= ' closed';
 
-               <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' ); ?>" />
-<?php
-                       wp_nonce_field( 'edit-sidebar_' . $sidebar );
-?>
-               </p>
+       if ( $split && $i == $split ) {
+               ?>
+               </div><div class="sidebars-column-2">
+               <?php
+       }
+
+       ?>
+       <div class="<?php echo esc_attr( $wrap_class ); ?>">
+               <?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>
        </div>
+       <?php
 
-       </form>
-       <br class="clear" />
+       $i++;
+}
 
+?>
+</div>
+</div>
+</div>
+<form 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' ); ?>
+<div class="widgets-chooser">
+       <ul class="widgets-chooser-sidebars"></ul>
+       <div class="widgets-chooser-actions">
+               <button class="button-secondary"><?php _e( 'Cancel' ); ?></button>
+               <button class="button-primary"><?php _e( 'Add Widget' ); ?></button>
+       </div>
+</div>
 
+<?php
 
+/**
+ * Fires after the available widgets and sidebars have loaded, before the admin footer.
+ *
+ * @since 2.2.0
+ */
+do_action( 'sidebar_admin_page' );
+require_once( ABSPATH . 'wp-admin/admin-footer.php' );