From 38bcb99561307e4a7cd15ea6f574d531735b9843 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Sun, 4 May 2008 02:05:18 +0000 Subject: [PATCH] Widget arrangement fix from azaozz. fixes #6876 for trunk git-svn-id: https://develop.svn.wordpress.org/trunk@7881 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/widgets-rtl.css | 9 ++++----- wp-admin/css/widgets.css | 28 ++++++++++------------------ wp-admin/includes/widgets.php | 3 ++- wp-admin/js/widgets.js | 8 ++++---- wp-admin/widgets.php | 2 ++ wp-includes/script-loader.php | 2 +- 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/wp-admin/css/widgets-rtl.css b/wp-admin/css/widgets-rtl.css index e17aadc215..69c877c193 100644 --- a/wp-admin/css/widgets-rtl.css +++ b/wp-admin/css/widgets-rtl.css @@ -38,13 +38,12 @@ li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-contro left:1em; } -li.widget-list-control-item div.widget-control { - padding:0 0 0 10px; -} ul.widget-control-list div.widget-control-actions { margin-right:0; margin-left:-10px; } -ul.widget-control-list .widget-title { - text-align:right; +ul.widget-control-list h4.widget-title, +#dragHelper h4.widget-title { + text-align: right; + padding: 0.4em 0.8em 0.4em 2.5em; } \ No newline at end of file diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css index 5d044cf6dc..baeb851bcf 100644 --- a/wp-admin/css/widgets.css +++ b/wp-admin/css/widgets.css @@ -74,7 +74,6 @@ ul#widget-list li.widget-list-item div.widget-description { font-size: 11px; } - ul#widget-list li.widget-list-item ul.widget-control-info { display: none; } @@ -91,27 +90,26 @@ ul.widget-control-list { padding: 0 1em; } -ul.widget-control-list li { - position: relative; -} - div#current-widgets p.submit { padding: 1em; } li.widget-list-control-item { - margin: 0 0 1em; + margin: 1em 0; -moz-border-radius: 3px; -khtml-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; } -li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4, li.widget-sortable h4 { +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4, +li.widget-sortable h4 { margin: 0; - padding: 0.4em 2.5em 0.4em 0.8em; cursor: move; font-size: 13px; + padding: 0.4em 2.5em 0.4em 0.8em; + position: relative; -moz-border-radius: 3px; -khtml-border-radius: 3px; -webkit-border-radius: 3px; @@ -143,16 +141,16 @@ li.widget-list-control-item h4.widget-title a, } li.widget-list-control-item h4.widget-title a:hover { - text-decoration: none; border-bottom: none; } li.widget-list-control-item div.widget-control { display: none; - margin: 1em; - padding: 0 10px 0 7px; /* Correction for padding, margin, border of inputs */ + padding: 15px; font-size: 11px; + position: relative; + background-color: #CFEBF7; } li.widget-list-control-item div.widget-control p { @@ -161,15 +159,9 @@ li.widget-list-control-item div.widget-control p { } ul.widget-control-list div.widget-control-actions { - margin-right: -10px; /* Correction for padding, margin, border of inputs */ - margin-left: -6px; border-top-width: 1px; border-top-style: solid; - padding: 0.5em 0 0.8em; -} - -ul.widget-control-list .widget-title { - + padding: 0.5em 0 0; } .widget-control-edit { diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index da8b822777..297e2b5831 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -227,6 +227,7 @@ function wp_widget_control( $sidebar_args ) { if ( empty($sidebar_args['_display']) || 'template' != $sidebar_args['_display'] ) echo $sidebar_args['before_widget']; ?> +

@@ -239,7 +240,7 @@ function wp_widget_control( $sidebar_args ) { -

+
> diff --git a/wp-admin/js/widgets.js b/wp-admin/js/widgets.js index 4eb37ee72e..b42812f3f6 100644 --- a/wp-admin/js/widgets.js +++ b/wp-admin/js/widgets.js @@ -13,12 +13,12 @@ jQuery(function($) { if ( t.is(':visible') ) { if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); } li.css( 'marginLeft', 0 ); - t.siblings('h4').children('a').text( widgetsL10n.edit ); + t.siblings('div').children('h4').children('a').text( widgetsL10n.edit ); } else { t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open if ( width > 250 ) li.css( 'marginLeft', ( width - 250 ) * -1 ); - t.siblings('h4').children('a').text( widgetsL10n.cancel ); + t.siblings('div').children('h4').children('a').text( widgetsL10n.cancel ); } t.toggle(); } : function() { @@ -28,12 +28,12 @@ jQuery(function($) { if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); } if ( width > 250 ) li.animate( { marginLeft: 0 } ); - t.siblings('h4').children('a').text( widgetsL10n.edit ); + t.siblings('div').children('h4').children('a').text( widgetsL10n.edit ); } else { t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open if ( width > 250 ) li.animate( { marginLeft: ( width - 250 ) * -1 } ); - t.siblings('h4').children('a').text( widgetsL10n.cancel ); + t.siblings('div').children('h4').children('a').text( widgetsL10n.cancel ); } t.animate( { height: 'toggle' } ); }; diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 83264e4351..5e4659e3a8 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -134,7 +134,9 @@ if ( isset($_GET['add']) && $_GET['add'] ) {