Widget admin redesign from mdawaffe. see #5583

git-svn-id: http://svn.automattic.com/wordpress/trunk@6556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-01-04 23:34:33 +00:00
parent c397ae61cc
commit 4f56c35980
6 changed files with 867 additions and 636 deletions

View File

@ -1,9 +1,9 @@
<?php <?php
define('DOING_AJAX', true);
require_once('../wp-config.php'); require_once('../wp-config.php');
require_once('includes/admin.php'); require_once('includes/admin.php');
define('DOING_AJAX', true);
if ( !is_user_logged_in() ) if ( !is_user_logged_in() )
die('-1'); die('-1');

View File

@ -13,6 +13,7 @@ require_once(ABSPATH . 'wp-admin/includes/template.php');
require_once(ABSPATH . 'wp-admin/includes/theme.php'); require_once(ABSPATH . 'wp-admin/includes/theme.php');
require_once(ABSPATH . 'wp-admin/includes/user.php'); require_once(ABSPATH . 'wp-admin/includes/user.php');
require_once(ABSPATH . 'wp-admin/includes/update.php'); require_once(ABSPATH . 'wp-admin/includes/update.php');
require_once(ABSPATH . 'wp-admin/includes/widgets.php');
require_once(ABSPATH . WPINC . '/registration.php'); require_once(ABSPATH . WPINC . '/registration.php');

112
wp-admin/js/widgets.js Normal file
View File

@ -0,0 +1,112 @@
jQuery(function($) {
$('.noscript-action').remove();
// TODO: i18n
var addText = 'Add';
var editText = 'Edit';
var cancText = 'Cancel';
var increment = 1;
// Open or close widget control form
var toggleWidget = function( li ) {
var width = li.find('input.widget-width').val();
return li.children('div.widget-control').each( function() {
var t = $(this);
if ( t.is(':visible') ) {
t.animate( { height: 'hide' } );
if ( width > 250 )
li.animate( { marginLeft: 0 } );
t.siblings('h4').children('a').text( editText );
} else {
t.animate( { height: 'show' } );
if ( width > 250 )
li.animate( { marginLeft: ( width - 250 ) * -1 } );
t.siblings('h4').children('a').text( cancText );
}
} ).end();
};
// onclick for edit links
var editClick = function() {
var q = wpAjax.unserialize( this.href );
// if link is in available widgets list, make sure it points to the current sidebar
if ( ( q.sidebar && q.sidebar == $('#sidebar').val() ) || q.add ) {
var w = q.edit || q.add;
toggleWidget( $('#current-sidebar .widget-control-list input[@name^="widget-id"][@value=' + w + ']').parents('li:first') ).blur();
return false;
} else if ( q.sidebar ) { // otherwise, redirect to correct page
return true;
}
// If link is in current widgets list, just open the form
toggleWidget( $(this).parents('li:first') ).blur();
return false;
};
// onclick for add links
var addClick = function() {
var oldLi = $(this).parents('li:first').find('ul.widget-control-info li');
var newLi = oldLi.clone();
if ( newLi.html().match( /%i%/ ) ) {
// supplid form is a template, replace %i% by unique id
var i = $('#generated-time').val() + increment.toString();
increment++;
newLi.html( newLi.html().replace( /%i%/g, i ) );
} else {
$(this).text( editText ).unbind().click( editClick );
// save form content in textarea so we don't have any conflicting HTML ids
oldLi.html( '<textarea>' + oldLi.html() + '</textarea>' );
}
// add event handlers
addWidgetControls( newLi );
// add widget to sidebar sortable
widgetSortable.append( newLi ).SortableAddItem( newLi[0] );
// increment widget counter
var n = parseInt( $('#widget-count').text(), 10 ) + 1;
$('#widget-count').text( n.toString() )
return false;
};
// add event handlers to all links found in context
var addWidgetControls = function( context ) {
if ( !context )
context = document;
$('a.widget-control-edit', context).click( editClick );
// onclick for save links
$('a.widget-control-save', context).click( function() {
toggleWidget( $(this).parents('li:first') ).blur()
return false;
} );
// onclick for remove links
$('a.widget-control-remove', context).click( function() {
var w = $(this).parents('li:first').find('input[@name^="widget-id"]').val();
$(this).parents('li:first').remove();
var t = $('#widget-list ul#widget-control-info-' + w + ' textarea');
t.parent().html( t.text() ).parents('li.widget-list-item:first').children( 'h4' ).children('a.widget-action')
.show().text( addText ).unbind().click( addClick );
var n = parseInt( $('#widget-count').text(), 10 ) - 1;
$('#widget-count').text( n.toString() )
return false;
} );
}
addWidgetControls();
$('a.widget-control-add').click( addClick );
// initialize sortable
var widgetSortable = $('#current-sidebar .widget-control-list').Sortable( {
accept: 'widget-sortable',
helperclass: 'sorthelper',
handle: 'h4.widget-title'
} );
});

View File

@ -1,360 +1,272 @@
<?php <?php
require_once 'admin.php'; require_once( 'admin.php' );
if ( ! current_user_can('switch_themes') ) if ( ! current_user_can('switch_themes') )
wp_die( __( 'Cheatin&#8217; uh?' )); 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
$cols = array();
foreach ( $wp_registered_sidebars as $index => $sidebar ) {
$cols[] = '\'' . $index . '\'';
}
$cols = implode( ', ', $cols );
$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;
}
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>
<?php
}
add_action( 'admin_head', 'wp_widgets_admin_head' );
do_action( 'sidebar_admin_setup' ); do_action( 'sidebar_admin_setup' );
function wp_widget_draggable( $name ) {
global $wp_registered_widgets, $wp_registered_widget_controls;
if ( !isset( $wp_registered_widgets[$name] ) ) {
return;
}
$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>'
: '';
$output = '<li class="module" id="widgetprefix-%1$s"><span class="handle">%2$s</span></li>';
printf( $output, $sanitized_name, $wp_registered_widgets[$name]['name'] . $popper );
}
$title = __( 'Widgets' ); $title = __( 'Widgets' );
$parent_file = 'themes.php'; $parent_file = 'themes.php';
require_once 'admin-header.php'; // $sidebar = What sidebar are we editing?
if ( isset($_GET['sidebar']) && isset($wp_registered_sidebars[$_GET['sidebar']]) ) {
if ( count( $wp_registered_sidebars ) < 1 ) { $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' );
?> ?>
<div class="wrap">
<h2><?php _e( 'No Sidebars Defined' ); ?></h2>
<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> <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> </div>
<?php
require_once 'admin-footer.php'; <?php
require_once( 'admin-footer.php' );
exit; exit;
} }
// These are the widgets grouped by sidebar
$sidebars_widgets = wp_get_sidebars_widgets(); $sidebars_widgets = wp_get_sidebars_widgets();
if ( empty( $sidebars_widgets ) )
if ( empty( $sidebars_widgets ) ) {
$sidebars_widgets = wp_get_widget_defaults(); $sidebars_widgets = wp_get_widget_defaults();
}
if ( isset( $_POST['action'] ) ) { // for the sake of PHP warnings
check_admin_referer( 'widgets-save-widget-order' ); if ( empty( $sidebars_widgets[$sidebar] ) )
$sidebars_widgets[$sidebar] = array();
switch ( $_POST['action'] ) { $http_post = ( 'POST' == $_SERVER['REQUEST_METHOD'] );
case 'default' :
$sidebars_widgets = wp_get_widget_defaults();
wp_set_sidebars_widgets( $sidebars_widgets );
break;
case 'save_widget_order' : // We're updating a sidebar
$sidebars_widgets = array(); if ( $http_post && isset($sidebars_widgets[$_POST['sidebar']]) ) {
foreach ( $wp_registered_sidebars as $index => $sidebar ) { /* Hack #1
$postindex = $index . 'order'; * 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 catchi 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.
*/
$already_done = array();
parse_str( $_POST[$postindex], $order ); foreach ( $wp_registered_widget_controls as $name => $control ) {
if ( in_array( $control['callback'], $already_done ) )
continue;
$new_order = $order[$index]; if ( is_callable( $control['callback'] ) )
call_user_func_array( $control['callback'], $control['params'] );
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;
}
}
}
}
}
wp_set_sidebars_widgets( $sidebars_widgets );
break;
}
}
ksort( $wp_registered_widgets );
$inactive_widgets = array();
foreach ( $wp_registered_widgets as $name => $widget ) {
$is_active = false;
foreach ( $wp_registered_sidebars as $index => $sidebar ) {
if ( is_array( $sidebars_widgets[$index] ) && in_array( $name, $sidebars_widgets[$index] ) ) {
$is_active = true;
break;
} }
ob_end_clean();
// Prophylactic. Take out empty ids.
foreach ( (array) $_POST['widget-id'] as $key => $val )
if ( !$val )
unset($_POST['widget-id'][$key]);
// Reset the key numbering and stare
$new_sidebar = array_values( $_POST['widget-id'] );
$sidebars_widgets[$_POST['sidebar']] = $new_sidebar;
wp_set_sidebars_widgets( $sidebars_widgets );
// Re-register just in case
wp_widgets_init();
wp_redirect( add_query_arg( 'message', 'updated' ) );
exit;
}
// What widget (if any) are we editing
$edit_widget = -1;
$query_args = array('add', 'remove', 'key', 'edit', '_wpnonce', 'message' );
if ( isset($_GET['add']) && $_GET['add'] ) {
// Add to the end of the sidebar
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 );
} }
wp_redirect( remove_query_arg( $query_args ) );
if ( !$is_active ) { exit;
$inactive_widgets[] = $name; } 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;
} }
$containers = array( 'palette' ); // Total number of registered sidebars
$sidebar_widget_count = count($sidebars_widgets[$sidebar]);
foreach ( $wp_registered_sidebars as $index => $sidebar ) { // This is sort of lame since "widget" won't be converted to "widgets" in the JS
$containers[] = $index; 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 );
$c_string = '';
foreach ( $containers as $container ) { $sidebar_info_text = sprintf( wp_specialchars( $sidebar_info_text ), "<span id='widget-count'>$sidebar_widget_count</span>", $wp_registered_sidebars[$sidebar]['name'] );
$c_string .= '"' . $container . '",';
}
$c_string = substr( $c_string, 0, -1 ); $page = isset($_GET['apage']) ? abs( (int) $_GET['apage'] ) : 1;
if ( isset( $_POST['action'] ) ) { /* TODO: Paginate widgets list
?> $page_links = paginate_links( array(
<div class="fade updated" id="message"> 'base' => add_query_arg( 'apage', '%#%' ),
<p><?php printf( __( 'Sidebar updated. <a href="%s">View site &raquo;</a>' ), get_bloginfo( 'url' ) . '/' ); ?></p> 'format' => '',
'total' => ceil(($total = 105 )/ 10),
'current' => $page
));
*/
$page_links = false;
// Unsanitized!
$widget_search = isset($_GET['s']) ? $_GET['s'] : false;
// 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' )
);
$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false;
$messages = array(
'updated' => __('Changes saved.')
);
require_once( 'admin-header.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; ?>
<div class="wrap">
<form id="widgets-filter" action="" method="get">
<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" value="<?php _e( 'Search Widgets' ); ?>" />
</p>
<div class="widget-liquid-left-holder">
<div id="available-widgets-filter" class="widget-liquid-left">
<h3><?php printf( __('Available Widgets %s'), '<a href="#help:avaliable-widgets" class="wp-context-help">?</a>' ); ?></h3>
<p>
<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' ); ?>" />
</p>
<?php if ( $page_links ) : ?>
<p class="pagenav">
<?php echo $page_links; ?>
</p>
<?php endif; ?>
</div> </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 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>
<br class="clear" />
</div> </div>
<div id="shadow"> </div> <div id="available-sidebars" class="widget-liquid-right">
<h3><?php printf( __('Current Widgets %s'), '<a href="#help:current-widgets" class="wp-context-help">?</a>' ); ?></h3>
<?php do_action( 'sidebar_admin_page' ); ?> <?php if ( 1 < $sidebars_count ) : ?>
<p>
<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('Go' ); ?>" />
</p>
<?php endif; ?>
</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 if ( $page_links ) : ?>
<p class="pagenav">
<?php echo $page_links; ?>
</p>
<?php endif; ?>
</div>
</div>
<form id="widget-controls" action="" method="post">
<div id="current-widgets-head" class="widget-liquid-right">
<div id="sidebar-info">
<p><?php echo $sidebar_info_text; ?></p>
<p><?php _e( 'Add more from the Available Widgets section.' ); ?></p>
</div>
</div>
<div id="current-widgets" class="widget-liquid-right">
<input type="hidden" id='sidebar' name='sidebar' value="<?php echo $sidebar; ?>" />
<div id="current-sidebar">
<?php wp_list_widget_controls( $sidebars_widgets[$sidebar], $edit_widget ); // Show the control forms for each of the widgets in this sidebar ?>
</div>
</div>
<p class="submit">
<input type="hidden" id="generated-time" name="generated-time" value="<?php echo time(); ?>" />
<input type="submit" name="save-widgets" value="<?php _e( 'Save Changes' ); ?>" />
</p>
</form>
</div>
<?php do_action( 'sidebar_admin_page' ); ?>
<?php require_once( 'admin-footer.php' ); ?>
<?php require_once 'admin-footer.php'; ?>

View File

@ -79,7 +79,7 @@ class WP_Scripts {
$this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.1.4'); $this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.1.4');
$this->add( 'jquery-form', '/wp-includes/js/jquery/jquery.form.js', array('jquery'), '1.0.3'); $this->add( 'jquery-form', '/wp-includes/js/jquery/jquery.form.js', array('jquery'), '1.0.3');
$this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2'); $this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2' );
$this->add( 'dimensions', '/wp-includes/js/jquery/jquery.dimensions.min.js', array('jquery'), '1.1.2'); $this->add( 'dimensions', '/wp-includes/js/jquery/jquery.dimensions.min.js', array('jquery'), '1.1.2');
$this->add( 'suggest', '/wp-includes/js/jquery/suggest.js', array('dimensions'), '1.1'); $this->add( 'suggest', '/wp-includes/js/jquery/suggest.js', array('dimensions'), '1.1');
$this->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20'); $this->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
@ -143,6 +143,7 @@ class WP_Scripts {
'saveText' => attribute_escape(__('Save &raquo;')), 'saveText' => attribute_escape(__('Save &raquo;')),
'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.") 'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
) ); ) );
$this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), mt_rand() );
} }
} }

File diff suppressed because it is too large Load Diff