enmi-conf.org: comparison wp/wp-admin/includes/widgets.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 /**
 * 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;
 	$sort = $wp_registered_widgets;
 /**
 * Callback to sort array by a 'name' key.
 *
 * @since 3.1.0
 * @access private
+*
+* @return int
 */
 function _sort_name_callback( $a, $b ) {
 	return strnatcasecmp( $a['name'], $b['name'] );
 }
 * Show the widgets and their settings for a sidebar.
 * Used in the admin widget config screen.
 *
 * @since 2.5.0
 *
-* @param string $sidebar id slug of the sidebar
+* @param string $sidebar      Sidebar ID.
-* @param string optional $sidebar_name Include the HTML for the sidebar name
+* @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' );
 	$description = wp_sidebar_description( $sidebar );
 	echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
 	if ( $sidebar_name ) {
 		?>
 		<div class="sidebar-name">
-			<div class="sidebar-name-arrow"><br /></div>
+			<button type="button" class="handlediv hide-if-no-js" aria-expanded="true">
-			<h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
+				<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
+	}
+	dynamic_sidebar( $sidebar );
 	echo '</div>';
+}
-	dynamic_sidebar( $sidebar );
+/**
-	echo '</div>';
+* Retrieves the widget control arguments.
-}
+*
+* @since 2.5.0
-/**
+*
-* {@internal Missing Short Description}}
+* @global array $wp_registered_widgets
 *
-* @since 2.5.0
+* @staticvar int $i
 *
 * @param array $params
 * @return array
 */
 function wp_list_widget_controls_dynamic_sidebar( $params ) {
 	}
 	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;
 	foreach ( $wp_registered_widgets as $widget_id => $widget ) {
 		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
 * Meta widget used to display the control form for a widget.
 *
 * Called from dynamic_sidebar().
 *
 * @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
 */
 function wp_widget_control( $sidebar_args ) {
 	$id_format = $widget['id'];
 	$widget_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $widget_id;
 	$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;
 		if ( $multi_number ) {
 	$has_form = 'noform';
 	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">
+	<?php echo $before_form; ?>
-	<div class="widget-content">
+	<?php echo $before_widget_content; ?>
-<?php
+	<?php
-	if ( isset($control['callback']) )
+	if ( isset( $control['callback'] ) ) {
 		$has_form = call_user_func_array( $control['callback'], $control['params'] );
-	else
+	} else {
-		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n"; ?>
+		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n";
-	</div>
+	}
+	?>
+	<?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']); ?>" />
 	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
 	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
 	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
 	<div class="widget-control-actions">
 		<div class="alignleft">
-		<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
+			<button type="button" class="button-link button-link-delete widget-control-remove"><?php _e( 'Delete' ); ?></button>
-		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
+			<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">
 <?php echo ( $widget_description = wp_widget_description($widget_id) ) ? "$widget_description\n" : "$widget_title\n"; ?>
 	</div>
 <?php
 	echo $sidebar_args['after_widget'];
 	return $sidebar_args;
 }
+/**
+*
+* @param string $classes
+* @return string
+*/
+function wp_widgets_access_body_class($classes) {
+	return "$classes widgets_access ";
+}

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9