--- a/wp/wp-admin/includes/widgets.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/widgets.php Mon Oct 14 17:39:30 2019 +0200
@@ -10,6 +10,9 @@
* Display list of the available widgets.
*
* @since 2.5.0
+ *
+ * @global array $wp_registered_widgets
+ * @global array $wp_registered_widget_controls
*/
function wp_list_widgets() {
global $wp_registered_widgets, $wp_registered_widget_controls;
@@ -51,6 +54,8 @@
*
* @since 3.1.0
* @access private
+ *
+ * @return int
*/
function _sort_name_callback( $a, $b ) {
return strnatcasecmp( $a['name'], $b['name'] );
@@ -62,8 +67,8 @@
*
* @since 2.5.0
*
- * @param string $sidebar id slug of the sidebar
- * @param string optional $sidebar_name Include the HTML for the sidebar name
+ * @param string $sidebar Sidebar ID.
+ * @param string $sidebar_name Optional. Sidebar name. Default empty.
*/
function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) {
add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
@@ -75,30 +80,37 @@
if ( $sidebar_name ) {
?>
<div class="sidebar-name">
- <div class="sidebar-name-arrow"><br /></div>
- <h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
+ <button type="button" class="handlediv hide-if-no-js" aria-expanded="true">
+ <span class="screen-reader-text"><?php echo esc_html( $sidebar_name ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
+ <h2><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h2>
</div>
<?php
}
- echo '<div class="sidebar-description">';
-
if ( ! empty( $description ) ) {
- echo '<p class="description">' . $description . '</p>';
+ ?>
+ <div class="sidebar-description">
+ <p class="description"><?php echo $description; ?></p>
+ </div>
+ <?php
}
- echo '</div>';
-
dynamic_sidebar( $sidebar );
echo '</div>';
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the widget control arguments.
*
* @since 2.5.0
*
+ * @global array $wp_registered_widgets
+ *
+ * @staticvar int $i
+ *
* @param array $params
* @return array
*/
@@ -123,7 +135,14 @@
return $params;
}
-function next_widget_id_number($id_base) {
+/**
+ *
+ * @global array $wp_registered_widgets
+ *
+ * @param string $id_base
+ * @return int
+ */
+function next_widget_id_number( $id_base ) {
global $wp_registered_widgets;
$number = 1;
@@ -143,6 +162,10 @@
*
* @since 2.5.0
*
+ * @global array $wp_registered_widgets
+ * @global array $wp_registered_widget_controls
+ * @global array $sidebars_widgets
+ *
* @param array $sidebar_args
* @return array
*/
@@ -161,6 +184,11 @@
$multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
$add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
+ $before_form = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : '<form method="post">';
+ $after_form = isset( $sidebar_args['after_form'] ) ? $sidebar_args['after_form'] : '</form>';
+ $before_widget_content = isset( $sidebar_args['before_widget_content'] ) ? $sidebar_args['before_widget_content'] : '<div class="widget-content">';
+ $after_widget_content = isset( $sidebar_args['after_widget_content'] ) ? $sidebar_args['after_widget_content'] : '</div>';
+
$query_arg = array( 'editwidget' => $widget['id'] );
if ( $add_new ) {
$query_arg['addnew'] = 1;
@@ -194,25 +222,30 @@
echo $sidebar_args['before_widget']; ?>
<div class="widget-top">
<div class="widget-title-action">
- <a class="widget-action hide-if-no-js" href="#available-widgets"></a>
+ <button type="button" class="widget-action hide-if-no-js" aria-expanded="false">
+ <span class="screen-reader-text"><?php printf( __( 'Edit widget: %s' ), $widget_title ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
<a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
<span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span>
<span class="add"><?php _ex( 'Add', 'widget' ); ?></span>
<span class="screen-reader-text"><?php echo $widget_title; ?></span>
</a>
</div>
- <div class="widget-title"><h4><?php echo $widget_title ?><span class="in-widget-title"></span></h4></div>
+ <div class="widget-title"><h3><?php echo $widget_title; ?><span class="in-widget-title"></span></h3></div>
</div>
<div class="widget-inside">
- <form method="post">
- <div class="widget-content">
-<?php
- if ( isset($control['callback']) )
+ <?php echo $before_form; ?>
+ <?php echo $before_widget_content; ?>
+ <?php
+ if ( isset( $control['callback'] ) ) {
$has_form = call_user_func_array( $control['callback'], $control['params'] );
- else
- echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n"; ?>
- </div>
+ } else {
+ echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n";
+ }
+ ?>
+ <?php echo $after_widget_content; ?>
<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
@@ -223,16 +256,19 @@
<div class="widget-control-actions">
<div class="alignleft">
- <a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
- <a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
+ <button type="button" class="button-link button-link-delete widget-control-remove"><?php _e( 'Delete' ); ?></button>
+ <span class="widget-control-close-wrapper">
+ |
+ <button type="button" class="button-link widget-control-close"><?php _e( 'Done' ); ?></button>
+ </span>
</div>
<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
- <?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+ <?php submit_button( __( 'Save' ), 'primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
<span class="spinner"></span>
</div>
<br class="clear" />
</div>
- </form>
+ <?php echo $after_form; ?>
</div>
<div class="widget-description">
@@ -243,3 +279,12 @@
return $sidebar_args;
}
+
+/**
+ *
+ * @param string $classes
+ * @return string
+ */
+function wp_widgets_access_body_class($classes) {
+ return "$classes widgets_access ";
+}