Changeset 7676

Timestamp:

04/14/2008 08:47:51 PM (18 years ago)

Author:

ryan

Message:

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

Location:

branches/2.5

Files:

• wp-admin/css/media.css (modified) (5 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/js/swfupload/handlers.js (modified) (3 diffs)

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

@@ -93 +93 @@
 
 .filename.original {
-    z-index: 10;
-    position: absolute;
+    float: left;
 }
 .crunching {
@@ -126 +125 @@
     border-right-style: solid;
 }
+
+#library-form .progress, #gallery-form .progress {
+    display: none;
+}
+
 .media-item .thumbnail {
     max-width: 128px;
@@ -131 +135 @@
 }
 .media-item .pinkynail {
-    position: absolute;
-    top: 2px;
-    left: 2px;
+    float: left;
+    margin: 2px;
     height: 32px;
     max-width: 40px;
@@ -172 +175 @@
     display: block;
     line-height: 36px;
-    z-index: 2;
-    position: absolute;
-    top: 0px;
-    right: 20px;
+    float: right;
+    margin-right: 20px;
 }
 .describe-toggle-off {
     display: none;
 }
+
 .clickmask {
-    background: transparent;
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    cursor: pointer;
-    border: none;
-    z-index: 3;
-    height: 36px;
 }
 
@@ -218 +212 @@
 
 #media-upload .media-item {
+    position: relative;
     border-bottom-width: 1px;
     border-bottom-style: solid;
-    width: 623px;
-    position: relative;
     min-height: 36px;
+    width: 100%;
 }
 .filename {
-    display: block;
     line-height: 36px;
-    margin-left: 50px;
-    z-index: 2;
+    margin-left: 10px;
+    float: left;
 }
 #media-upload .describe {

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

@@ -608 +608 @@
     foreach ( $attachments as $id => $attachment )
         if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
-            $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>";
+            $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>";
 
     return $output;

branches/2.5/wp-includes/js/swfupload/handlers.js

@@ -13 +13 @@
     }
     // Create a progress bar containing the filename
-    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>');
+    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>');
+    // Display the progress div
+    jQuery('#media-item-' + fileObj.id + ' .progress').show();
 
     // Disable the submit button
@@ -32 +34 @@
     // Move the progress bar to 100%
     jQuery('#media-item-' + fileObj.id + ' .bar').remove();
+    jQuery('#media-item-' + fileObj.id + ' .progress').hide();
 
     // Append the HTML returned by the server -- thumbnail and form inputs
@@ -41 +44 @@
     // Replace the original filename with the new (unique) one assigned during upload
     jQuery('#media-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#media-item-' + fileObj.id + ' .filename.new'));
-
-    // Bind toggle function to a new mask over the progress bar area
-    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);
 
     // Also bind toggle to the links