Changeset 7882

Timestamp:

05/04/2008 02:05:38 AM (17 years ago)

Author:

ryan

Message:

Widget arrangement fix from azaozz. fixes #6876 for 2.5

Location:

branches/2.5

Files:

• wp-admin/css/widgets-rtl.css (modified) (1 diff)
• wp-admin/css/widgets.css (modified) (7 diffs)
• wp-admin/includes/widgets.php (modified) (2 diffs)
• wp-admin/js/widgets.js (modified) (2 diffs)
• wp-admin/widgets.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

branches/2.5/wp-admin/css/widgets-rtl.css

@@ -39 +39 @@
 }
 
-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;
 }

branches/2.5/wp-admin/css/widgets.css

@@ -75 +75 @@
 }
 
-
 ul#widget-list li.widget-list-item ul.widget-control-info {
     display: none;
@@ -92 +91 @@
 }
 
-ul.widget-control-list li {
-    position: relative;
-}
-
 div#current-widgets p.submit {
     padding: 1em;
@@ -101 +96 @@
 
 li.widget-list-control-item {
-    margin: 0 0 1em;
+    margin: 1em 0;
     -moz-border-radius: 3px;
     -khtml-border-radius: 3px;
@@ -108 +103 @@
 }
 
-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;
@@ -144 +142 @@
 
 li.widget-list-control-item h4.widget-title a:hover {
-
     text-decoration: none;
     border-bottom: none;
@@ -151 +148 @@
 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;
 }
 
@@ -162 +160 @@
 
 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;
 }
 

branches/2.5/wp-admin/includes/widgets.php

@@ -228 +228 @@
         echo $sidebar_args['before_widget'];
 ?>
+        <div class="widget-top">
         <h4 class="widget-title"><?php echo $widget_title ?>
 
@@ -240 +241 @@
             <?php endif; ?>
 
-        </h4>
+        </h4></div>
 
         <div class="widget-control"<?php if ( $edit ) echo ' style="display: block;"'; ?>>

branches/2.5/wp-admin/js/widgets.js

@@ -14 +14 @@
                 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();
@@ -29 +29 @@
                 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' } );

branches/2.5/wp-admin/widgets.php

@@ -135 +135 @@
             <ul class="widget-control-list">
                 <li class="widget-list-control-item">
+                    <div class="widget-top">
                     <h4 class="widget-title"><?php echo $control['name']; ?></h4>
+                    </div>
                     <div class="widget-control" style="display: block;">
     <?php

branches/2.5/wp-includes/script-loader.php

@@ -188 +188 @@
                 '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' ), '20080407c' );
+            $this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20080503' );
             $this->localize( 'admin-widgets', 'widgetsL10n', array(
                 'add' => __('Add'),