Changeset 7160 for trunk/wp-admin/includes/media.php

Timestamp:

03/05/2008 06:46:42 AM (18 years ago)

Author:

ryan

Message:

Improve upload_max_filesize error. Improve error display for long messages. New uploads now added to bottom, not top. Fix align class. Remove redundant header text. Props andy. see #5911

File:

• trunk/wp-admin/includes/media.php (modified) (6 diffs)

trunk/wp-admin/includes/media.php

@@ -271 +271 @@
         if ( isset($_POST['insertonly']['align']) ) {
             $align = attribute_escape($_POST['insertonly']['align']);
-            $class = " class='align-$align'";
+            $class = " class='align$align'";
         }
         $html = "<img src='$src' alt='$alt'$class />";
@@ -603 +603 @@
     foreach ( $attachments as $id => $attachment )
         if ( $item = get_media_item($id, 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><span class='filename'></span><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 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>";
 
     return $output;
@@ -646 +646 @@
     <a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
     <a class='toggle describe-toggle-off' href='#'>$toggle_off</a>
-    <span class='filename new'>$filename</span>
+    <div class='filename new'>$filename</div>
     <table class='slidetoggle describe $class'><tbody>
         <tr>
@@ -731 +731 @@
 }
 
-function media_upload_header($title = false) {
-    if ( empty($title) )
-        $title = __('Choose a File');
+function media_upload_header() {
     ?>
     <script type="text/javascript">post_id = <?php echo intval($_REQUEST['post_id']); ?>;</script>
     <div id="media-upload-header">
-    <h3><?php echo $title ?></h3>
     <?php the_media_upload_tabs(); ?>
     </div>
@@ -857 +854 @@
 
 function media_upload_gallery_form($errors) {
-    media_upload_header(__('Browse attached files'));
+    media_upload_header();
 
     $post_id = intval($_REQUEST['post_id']);
@@ -895 +892 @@
     global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
 
-    media_upload_header(__('Browse Media Library'));
+    media_upload_header();
 
     $post_id = intval($_REQUEST['post_id']);