WordPress.org

Make WordPress Core

Changeset 7882


Ignore:
Timestamp:
05/04/2008 02:05:38 AM (10 years ago)
Author:
ryan
Message:

Widget arrangement fix from azaozz. fixes #6876 for 2.5

Location:
branches/2.5
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/wp-admin/css/widgets-rtl.css

    r7779 r7882  
    3939}
    4040
    41 li.widget-list-control-item div.widget-control {
    42     padding:0 0 0 10px;
    43 }
    4441ul.widget-control-list div.widget-control-actions {
    4542    margin-right:0;
    4643    margin-left:-10px;
    4744}
    48 ul.widget-control-list .widget-title {
    49     text-align:right;
     45ul.widget-control-list h4.widget-title,
     46#dragHelper h4.widget-title {
     47    text-align: right;
     48    padding: 0.4em 0.8em 0.4em 2.5em;
    5049}
  • branches/2.5/wp-admin/css/widgets.css

    r7779 r7882  
    7575}
    7676
    77 
    7877ul#widget-list li.widget-list-item ul.widget-control-info {
    7978    display: none;
     
    9291}
    9392
    94 ul.widget-control-list li {
    95     position: relative;
    96 }
    97 
    9893div#current-widgets p.submit {
    9994    padding: 1em;
     
    10196
    10297li.widget-list-control-item {
    103     margin: 0 0 1em;
     98    margin: 1em 0;
    10499    -moz-border-radius: 3px;
    105100    -khtml-border-radius: 3px;
     
    108103}
    109104
    110 li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4, li.widget-sortable h4 {
     105li.widget-list-control-item h4,
     106#dragHelper li.widget-list-control-item h4,
     107li.widget-sortable h4 {
    111108    margin: 0;
    112     padding: 0.4em 2.5em 0.4em 0.8em;
    113109    cursor: move;
    114110    font-size: 13px;
     111    padding: 0.4em 2.5em 0.4em 0.8em;
     112    position: relative;
    115113    -moz-border-radius: 3px;
    116114    -khtml-border-radius: 3px;
     
    144142
    145143li.widget-list-control-item h4.widget-title a:hover {
    146 
    147144    text-decoration: none;
    148145    border-bottom: none;
     
    151148li.widget-list-control-item div.widget-control {
    152149    display: none;
    153     margin: 1em;
    154     padding: 0 10px 0 7px; /* Correction for padding, margin, border of inputs */
     150    padding: 15px;
    155151    font-size: 11px;
     152    position: relative;
     153    background-color: #CFEBF7;
    156154}
    157155
     
    162160
    163161ul.widget-control-list div.widget-control-actions {
    164     margin-right: -10px; /* Correction for padding, margin, border of inputs */
    165     margin-left: -6px;
    166162    border-top-width: 1px;
    167163    border-top-style: solid;
    168     padding: 0.5em 0 0.8em;
    169 }
    170 
    171 ul.widget-control-list .widget-title {
    172    
     164    padding: 0.5em 0 0;
    173165}
    174166
  • branches/2.5/wp-admin/includes/widgets.php

    r7725 r7882  
    228228        echo $sidebar_args['before_widget'];
    229229?>
     230        <div class="widget-top">
    230231        <h4 class="widget-title"><?php echo $widget_title ?>
    231232
     
    240241            <?php endif; ?>
    241242
    242         </h4>
     243        </h4></div>
    243244
    244245        <div class="widget-control"<?php if ( $edit ) echo ' style="display: block;"'; ?>>
  • branches/2.5/wp-admin/js/widgets.js

    r7621 r7882  
    1414                if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
    1515                li.css( 'marginLeft', 0 );
    16                 t.siblings('h4').children('a').text( widgetsL10n.edit );
     16                t.siblings('div').children('h4').children('a').text( widgetsL10n.edit );
    1717            } else {
    1818                t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
    1919                if ( width > 250 )
    2020                    li.css( 'marginLeft', ( width - 250 ) * -1 );
    21                 t.siblings('h4').children('a').text( widgetsL10n.cancel );
     21                t.siblings('div').children('h4').children('a').text( widgetsL10n.cancel );
    2222            }
    2323            t.toggle();
     
    2929                if ( width > 250 )
    3030                    li.animate( { marginLeft: 0 } );
    31                 t.siblings('h4').children('a').text( widgetsL10n.edit );
     31                t.siblings('div').children('h4').children('a').text( widgetsL10n.edit );
    3232            } else {
    3333                t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
    3434                if ( width > 250 )
    3535                    li.animate( { marginLeft: ( width - 250 ) * -1 } );
    36                 t.siblings('h4').children('a').text( widgetsL10n.cancel );
     36                t.siblings('div').children('h4').children('a').text( widgetsL10n.cancel );
    3737            }
    3838            t.animate( { height: 'toggle' } );
  • branches/2.5/wp-admin/widgets.php

    r7779 r7882  
    135135            <ul class="widget-control-list">
    136136                <li class="widget-list-control-item">
     137                    <div class="widget-top">
    137138                    <h4 class="widget-title"><?php echo $control['name']; ?></h4>
     139                    </div>
    138140                    <div class="widget-control" style="display: block;">
    139141    <?php
  • branches/2.5/wp-includes/script-loader.php

    r7865 r7882  
    188188                'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
    189189            ) );
    190             $this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20080407c' );
     190            $this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20080503' );
    191191            $this->localize( 'admin-widgets', 'widgetsL10n', array(
    192192                'add' => __('Add'),
Note: See TracChangeset for help on using the changeset viewer.