Changeset 7086

Timestamp:

02/28/2008 09:11:11 AM (17 years ago)

Author:

ryan

Message:

Widget admin layout fixes from mdawaffe. fixes #5997

Location:

trunk

Files:

• wp-admin/css/widgets-rtl.css (modified) (1 diff)
• wp-admin/css/widgets.css (modified) (3 diffs)
• wp-admin/includes/widgets.php (modified) (1 diff)
• wp-admin/js/widgets.js (modified) (1 diff)
• wp-includes/js/wp-lists.js (modified) (1 diff)

trunk/wp-admin/css/widgets-rtl.css

@@ -35 +35 @@
 }
 
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
+    right: auto;
+    left: 2em;
+}
+
 li.widget-list-control-item div.widget-control {
     padding: 0 0 0 10px;

trunk/wp-admin/css/widgets.css

@@ -15 +15 @@
     clear: right;
     width: 300px;
+    position: relative;
 }
 
@@ -96 +97 @@
 
 li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 {
-    position: relative;
     margin: 0;
     background-color: #2683ae;
@@ -114 +114 @@
 }
 
-li.widget-list-control-item h4.widget-title a, li.widget-list-control-item h4.widget-title a:visited {
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
     color: #fff;
+    right: 2em;
 }
 

trunk/wp-admin/includes/widgets.php

@@ -64 +64 @@
             } else {
                 $action = 'edit';
-                $edit_url = add_query_arg( array(
+                $edit_url = clean_url( add_query_arg( array(
                     'sidebar' => $sidebar,
                     'edit' => $widget['id'],
                     'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ),
-                ) );
-                $widget_control_template = '<textarea>' . htmlspecialchars( $widget_control_template ) . '</textarea>';
+                ) ) );
+                $widget_control_template = '<li><textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea></li>';
             }
 

trunk/wp-admin/js/widgets.js

@@ -7 +7 @@
     var toggleWidget = function( li ) {
         var width = li.find('input.widget-width').val();
-        return li.children('div.widget-control').each( function() {
+
+        // it seems IE chokes on these animations because of the positioning/floating
+        var widgetAnim = $.browser.msie ? function() {
             var t = $(this);
             if ( t.is(':visible') ) {
-                t.animate( { height: 'hide' } );
+                li.css( 'marginLeft', 0 );
+                t.siblings('h4').children('a').text( widgetsL10n.edit );
+            } else {
+                if ( width > 250 )
+                    li.css( 'marginLeft', ( width - 250 ) * -1 );
+                t.siblings('h4').children('a').text( widgetsL10n.cancel );
+            }
+            t.toggle();
+        } : function() {
+            var t = $(this);
+
+            if ( t.is(':visible') ) {
                 if ( width > 250 )
                     li.animate( { marginLeft: 0 } );
                 t.siblings('h4').children('a').text( widgetsL10n.edit );
             } else {
-                t.animate( { height: 'show' } );
                 if ( width > 250 )
                     li.animate( { marginLeft: ( width - 250 ) * -1 } );
                 t.siblings('h4').children('a').text( widgetsL10n.cancel );
             }
-        } ).end();
+            t.animate( { height: 'toggle' } );
+        };
+
+        return li.children('div.widget-control').each( widgetAnim ).end();
     };
 

trunk/wp-includes/js/wp-lists.js

@@ -9 +9 @@
         var pp = s.split('&');
         for ( var i in pp ) {
+            if ( $.isFunction(pp.hasOwnProperty) && !pp.hasOwnProperty(i) ) { continue; }
             var p = pp[i].split('=');
             r[p[0]] = p[1];