WordPress.org

Make WordPress Core

Changeset 7677


Ignore:
Timestamp:
04/14/08 20:48:11 (7 years ago)
Author:
ryan
Message:

Fix IE6 overlap and remove unnecessary markup. Props tellyworth. fixes #6661 for trunk

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/media.css

    r7654 r7677  
    9393 
    9494.filename.original { 
    95     z-index: 10; 
    96     position: absolute; 
     95    float: left; 
    9796} 
    9897.crunching { 
     
    126125    border-right-style: solid; 
    127126} 
     127 
     128#library-form .progress, #gallery-form .progress { 
     129    display: none; 
     130} 
     131 
    128132.media-item .thumbnail { 
    129133    max-width: 128px; 
     
    131135} 
    132136.media-item .pinkynail { 
    133     position: absolute; 
    134     top: 2px; 
    135     left: 2px; 
     137    float: left; 
     138    margin: 2px; 
    136139    height: 32px; 
    137140    max-width: 40px; 
     
    172175    display: block; 
    173176    line-height: 36px; 
    174     z-index: 2; 
    175     position: absolute; 
    176     top: 0px; 
    177     right: 20px; 
     177    float: right; 
     178    margin-right: 20px; 
    178179} 
    179180.describe-toggle-off { 
    180181    display: none; 
    181182} 
     183 
    182184.clickmask { 
    183     background: transparent; 
    184     position: absolute; 
    185     top: 0px; 
    186     left: 0px; 
    187     cursor: pointer; 
    188     border: none; 
    189     z-index: 3; 
    190     height: 36px; 
    191185} 
    192186 
     
    218212 
    219213#media-upload .media-item { 
     214    position: relative; 
    220215    border-bottom-width: 1px; 
    221216    border-bottom-style: solid; 
    222     width: 623px; 
    223     position: relative; 
    224217    min-height: 36px; 
     218    width: 100%; 
    225219} 
    226220.filename { 
    227     display: block; 
    228221    line-height: 36px; 
    229     margin-left: 50px; 
    230     z-index: 2; 
     222    margin-left: 10px; 
     223    float: left; 
    231224} 
    232225#media-upload .describe { 
  • trunk/wp-admin/includes/media.php

    r7671 r7677  
    608608    foreach ( $attachments as $id => $attachment ) 
    609609        if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) ) 
    610             $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div id='media-upload-error-$id'></div><div class='filename'></div><div class='progress'><div class='bar'></div></div>$item<div class='progress clickmask'></div>\n</div>"; 
     610            $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress'><div class='bar'></div></div><div id='media-upload-error-$id'></div><div class='filename'></div>$item\n</div>"; 
    611611 
    612612    return $output; 
  • trunk/wp-includes/js/swfupload/handlers.js

    r7584 r7677  
    1313    } 
    1414    // Create a progress bar containing the filename 
    15     jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><div class="filename original">' + fileObj.name + '</div><div class="progress"><div class="bar"></div></div></div>'); 
     15    jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><div class="progress"><div class="bar"></div></div><div class="filename original">' + fileObj.name + '</div></div>'); 
     16    // Display the progress div 
     17    jQuery('#media-item-' + fileObj.id + ' .progress').show(); 
    1618 
    1719    // Disable the submit button 
     
    3234    // Move the progress bar to 100% 
    3335    jQuery('#media-item-' + fileObj.id + ' .bar').remove(); 
     36    jQuery('#media-item-' + fileObj.id + ' .progress').hide(); 
    3437 
    3538    // Append the HTML returned by the server -- thumbnail and form inputs 
     
    4144    // Replace the original filename with the new (unique) one assigned during upload 
    4245    jQuery('#media-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#media-item-' + fileObj.id + ' .filename.new')); 
    43  
    44     // Bind toggle function to a new mask over the progress bar area 
    45     jQuery('#media-item-' + fileObj.id + ' .progress').clone().empty().addClass('clickmask').bind('click', function(){jQuery(this).siblings('.slidetoggle').slideToggle(150);jQuery(this).siblings('.toggle').toggle();}).appendTo('#media-item-' + fileObj.id); 
    4646 
    4747    // Also bind toggle to the links 
Note: See TracChangeset for help on using the changeset viewer.