Changeset 4274

Timestamp:

10/03/2006 07:15:13 AM (18 years ago)

Author:

ryan

Message:

Uploader improvements from mdawaffe. fixes #3191

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/upload-functions.php (added)
• wp-admin/upload-js.php (added)
• wp-admin/upload-rtl.css (added)
• wp-admin/upload.css (added)
• wp-admin/upload.php (moved) (moved from trunk/wp-admin/inline-uploading.php) (2 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1974 +1974 @@
 
 ?>
-<p><?php _e('Text linked to file') ?><br />
-<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid) ?></a></textarea></p>
-<p><?php _e('Text linked to subpost') ?><br />
-<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $post->post_title ?></a></textarea></p>
+<form id="the-attachment-links">
+<table>
+    <tr>
+        <th scope="row"><?php _e('Text linked to file') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid) ?></a></textarea></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('Text linked to subpost') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $post->post_title ?></a></textarea></td>
+    </tr>
 <?php if ( $icon ) : ?>
-<p><?php _e('Thumbnail linked to file') ?><br />
-<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo $icon ?></a></textarea></p>
-<p><?php _e('Thumbnail linked to subpost') ?><br />
-<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></p>
+    <tr>
+        <th scope="row"><?php _e('Thumbnail linked to file') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo $icon ?></a></textarea></td>
+    </tr>
+    <tr>
+        <th scope="row"><?php _e('Thumbnail linked to subpost') ?></th>
+        <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></td>
+    </tr>
 <?php endif; ?>
+</table>
+</form>
 <?php
 }

trunk/wp-admin/edit-form-advanced.php

@@ -184 +184 @@
 if (current_user_can('upload_files')) {
     $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
-    $uploading_iframe_src = wp_nonce_url("inline-uploading.php?action=view&post=$uploading_iframe_ID", 'inlineuploading');
+    $uploading_iframe_src = wp_nonce_url("upload.php?style=inline&tab=upload&post_id=$uploading_iframe_ID", 'inlineuploading');
     $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
     if ( false != $uploading_iframe_src )

trunk/wp-admin/edit-page-form.php

@@ -157 +157 @@
 if (current_user_can('upload_files')) {
     $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
-    $uploading_iframe_src = wp_nonce_url("inline-uploading.php?action=view&post=$uploading_iframe_ID", 'inlineuploading');
+    $uploading_iframe_src = wp_nonce_url("upload.php?style=inline&tab=upload&post_id=$uploading_iframe_ID", 'inlineuploading');
     $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
     if ( false != $uploading_iframe_src )

trunk/wp-admin/menu.php

@@ -31 +31 @@
 $submenu['edit.php'][5] = array(__('Posts'), 'edit_posts', 'edit.php');
 $submenu['edit.php'][10] = array(__('Pages'), 'edit_pages', 'edit-pages.php');
+$submenu['edit.php'][12] = array(__('Uploads'), 'upload_files', 'upload.php');
 $submenu['edit.php'][15] = array(__('Categories'), 'manage_categories', 'categories.php');
 $submenu['edit.php'][20] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
@@ -125 +126 @@
 }
 
+unset($id);
+
 ksort($menu); // make it all pretty
 

trunk/wp-admin/upload.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
+
 @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
@@ -6 +7 @@
     wp_die(__('You do not have permission to upload files.'));
 
-wp_reset_vars(array('action', 'post', 'all', 'last', 'link', 'sort', 'start', 'imgtitle', 'descr', 'attachment'));
+wp_reset_vars(array('action', 'tab', 'from_tab', 'style', 'post_id', 'ID', 'paged', 'post_title', 'post_content', 'delete'));
 
-$post = (int) $post;
-$images_width = 1;
+require_once('upload-functions.php');
+if ( !$tab )
+    $tab = 'browse-all';
 
-switch($action) {
-case 'links':
-// Do not pass GO.
-break;
+do_action( "upload_files_$tab" );
 
-case 'delete':
+add_action( 'admin_head', 'wp_upload_admin_head' );
 
-check_admin_referer('inlineuploading');
+$pid = 0;
+if ( $post_id < 0 )
+    $pid = $post_id;
+elseif ( get_post( $post_id ) )
+    $pid = $post_id;
+$wp_upload_tabs = array();
+$all_atts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'attachment'");
+$post_atts = 0;
+if ( $pid ) {
+    $wp_upload_tabs['upload'] = array(__('Upload'), 'upload_files', 'wp_upload_tab_upload');
+    if ( $all_atts && $post_atts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = '$post_id'") )
+        $wp_upload_tabs['browse'] = array(__('Browse'), 'upload_files', "wp_upload_tab_browse");
+    if ( $post_atts < $all_atts )
+        $wp_upload_tabs['browse-all'] = array(__('Browse All'), 'upload_files', 'wp_upload_tab_browse');
+} else
+    $wp_upload_tabs['browse-all'] = array(__('Browse All'), 'upload_files', 'wp_upload_tab_browse');
 
-if ( !current_user_can('edit_post', (int) $attachment) )
-    wp_die(__('You are not allowed to delete this attachment.').' <a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">".__('Go back').'</a>');
+    $wp_upload_tabs = array_merge($wp_upload_tabs, apply_filters( 'wp_upload_tabs', array() ));
 
-wp_delete_attachment($attachment);
-
-wp_redirect(basename(__FILE__) ."?post=$post&all=$all&action=view&start=$start");
-die;
-
-case 'save':
-
-check_admin_referer('inlineuploading');
-
-$overrides = array('action'=>'save');
-
-$file = wp_handle_upload($_FILES['image'], $overrides);
-
-if ( isset($file['error']) )
-    wp_die($file['error'] . '<br /><a href="' . basename(__FILE__) . '?action=upload&post=' . $post . '">'.__('Back to Image Uploading').'</a>');
-
-$url = $file['url'];
-$type = $file['type'];
-$file = $file['file'];
-$filename = basename($file);
-
-// Construct the attachment array
-$attachment = array(
-    'post_title' => $imgtitle ? $imgtitle : $filename,
-    'post_content' => $descr,
-    'post_type' => 'attachment',
-    'post_parent' => $post,
-    'post_mime_type' => $type,
-    'guid' => $url
-    );
-
-// Save the data
-$id = wp_insert_attachment($attachment, $file, $post);
-
-if ( preg_match('!^image/!', $attachment['post_mime_type']) ) {
-    // Generate the attachment's postmeta.
-    $imagesize = getimagesize($file);
-    $imagedata['width'] = $imagesize['0'];
-    $imagedata['height'] = $imagesize['1'];
-    list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']);
-    $imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
-    $imagedata['file'] = $file;
-
-    add_post_meta($id, '_wp_attachment_metadata', $imagedata);
-
-    if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
-        if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )
-            $thumb = wp_create_thumbnail($file, 128);
-        elseif ( $imagedata['height'] > 96 )
-            $thumb = wp_create_thumbnail($file, 96);
-
-        if ( @file_exists($thumb) ) {
-            $newdata = $imagedata;
-            $newdata['thumb'] = basename($thumb);
-            update_post_meta($id, '_wp_attachment_metadata', $newdata, $imagedata);
-        } else {
-            $error = $thumb;
-        }
-    }
-} else {
-    add_post_meta($id, '_wp_attachment_metadata', array());
+if ( !function_exists($wp_upload_tabs[$tab][2]) ) {
+    $to_tab = isset($wp_upload_tabs['upload']) ? 'upload' : 'browse-all';
+    wp_redirect( add_query_arg( 'tab', $to_tab ) );
+    exit;
 }
 
-wp_redirect(basename(__FILE__) . "?post=$post&all=$all&action=view&start=0");
-die();
-
-case 'upload':
-
-$current_1 = ' class="current"';
-$back = $next = false;
-break;
-
-case 'view':
-
-// How many images do we show? How many do we query?
-$num = 5;
-$double = $num * 2;
-
-if ( $post && (empty($all) || $all == 'false') ) {
-    $and_post = "AND post_parent = '$post'";
-    $current_2 = ' class="current"';
-} else {
-    $current_3 = ' class="current"';
-}
-
-if (! current_user_can('edit_others_posts') )
-    $and_user = "AND post_author = " . $user_ID;
-
-if ( $last )
-    $start = $wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = 'attachment' $and_user $and_post") - $num;
-else
-    $start = (int) $start;
-
-if ( $start < 0 )
-    $start = 0;
-
-if ( '' == $sort )
-    $sort = "post_date_gmt DESC";
-
-$attachments = $wpdb->get_results("SELECT ID, post_date, post_title, post_mime_type, guid FROM $wpdb->posts WHERE post_type = 'attachment' $and_type $and_post $and_user ORDER BY $sort LIMIT $start, $double", ARRAY_A);
-
-if ( count($attachments) == 0 ) {
-    wp_redirect( basename(__FILE__) ."?post=$post&action=upload" );
-    die;
-} elseif ( count($attachments) > $num ) {
-    $next = $start + count($attachments) - $num;
-} else {
-    $next = false;
-}
-
-if ( $start > 0 ) {
-    $back = $start - $num;
-    if ( $back < 1 )
-        $back = '0';
-} else {
-    $back = false;
-}
-
-$uwidth_sum = 0;
-$html = '';
-$popups = '';
-$style = '';
-$script = '';
-if ( count($attachments) > 0 ) {
-    $attachments = array_slice( $attachments, 0, $num );
-    $__delete = __('Delete');
-    $__not_linked = __('Not Linked');
-    $__linked_to_page = __('Linked to Page');
-    $__linked_to_image = __('Linked to Image');
-    $__linked_to_file = __('Linked to File');
-    $__using_thumbnail = __('Using Thumbnail');
-    $__using_original = __('Using Original');
-    $__using_title = __('Using Title');
-    $__using_filename = __('Using Filename');
-    $__using_icon = __('Using Icon');
-    $__no_thumbnail = '<del>'.__('No Thumbnail').'</del>';
-    $__send_to_editor = __('Send to editor');
-    $__close = __('Close Options');
-    $__confirmdelete = __('Delete this file from the server?');
-    $__nothumb = __('There is no thumbnail associated with this photo.');
-    $script .= "notlinked = '$__not_linked';
-linkedtoimage = '$__linked_to_image';
-linkedtopage = '$__linked_to_page';
-linkedtofile = '$__linked_to_file';
-usingthumbnail = '$__using_thumbnail';
-usingoriginal = '$__using_original';
-usingtitle = '$__using_title';
-usingfilename = '$__using_filename';
-usingicon = '$__using_icon';
-var aa = new Array();
-var ab = new Array();
-var imga = new Array();
-var imgb = new Array();
-var srca = new Array();
-var srcb = new Array();
-var title = new Array();
-var filename = new Array();
-var icon = new Array();
-";
-    foreach ( $attachments as $key => $attachment ) {
-        $ID = $attachment['ID'];
-        $href = get_attachment_link($ID);
-        $meta = get_post_meta($ID, '_wp_attachment_metadata', true);
-        if (!is_array($meta)) {
-            $meta = get_post_meta($ID, 'imagedata', true); // Try 1.6 Alpha meta key
-            if (!is_array($meta)) {
-                $meta = array();
-            }
-            add_post_meta($ID, '_wp_attachment_metadata', $meta);
-        }
-        $attachment = array_merge($attachment, $meta);
-        $noscript = "<noscript>
-        <div class='caption'><a href=\"".basename(__FILE__)."?action=links&amp;attachment={$ID}&amp;post={$post}&amp;all={$all}&amp;start={$start}\">Choose Links</a></div>
-        </noscript>
-";
-        $send_delete_cancel = "<a onclick=\"sendToEditor({$ID});return false;\" href=\"javascript:void()\">$__send_to_editor</a>
-<a onclick=\"return confirm('$__confirmdelete')\" href=\"" . wp_nonce_url( basename(__FILE__) . "?action=delete&amp;attachment={$ID}&amp;all=$all&amp;start=$start&amp;post=$post", inlineuploading) . "\">$__delete</a>
-        <a onclick=\"popup.style.display='none';return false;\" href=\"javascript:void()\">$__close</a>
-";
-        $uwidth_sum += 128;
-        if ( preg_match('!^image/!', $attachment['post_mime_type'] ) ) {
-            $image = & $attachment;
-            if ( ($image['width'] > 128 || $image['height'] > 96) && !empty($image['thumb']) && file_exists(dirname($image['file']).'/'.$image['thumb']) ) {
-                $src = str_replace(basename($image['guid']), $image['thumb'], $image['guid']);
-                $script .= "srca[{$ID}] = '$src';
-srcb[{$ID}] = '{$image['guid']}';
-";
-                $thumb = 'true';
-                $thumbtext = $__using_thumbnail;
-            } else {
-                $src = $image['guid'];
-                $thumb = 'false';
-                $thumbtext = $__no_thumbnail;
-            }
-            list($image['uwidth'], $image['uheight']) = get_udims($image['width'], $image['height']);
-            $height_width = 'height="'.$image['uheight'].'" width="'.$image['uwidth'].'"';
-            $xpadding = (128 - $image['uwidth']) / 2;
-            $ypadding = (96 - $image['uheight']) / 2;
-            $style .= "#target{$ID} img { padding: {$ypadding}px {$xpadding}px; }\n";
-            $title = wp_specialchars($image['post_title'], ENT_QUOTES);
-            $script .= "aa[{$ID}] = '<a id=\"p{$ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">';
-ab[{$ID}] = '<a class=\"imagelink\" href=\"{$image['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">';
-imga[{$ID}] = '<img id=\"image{$ID}\" src=\"$src\" alt=\"{$title}\" $height_width />';
-imgb[{$ID}] = '<img id=\"image{$ID}\" src=\"{$image['guid']}\" alt=\"{$title}\" $height_width />';
-";
-            $html .= "<div id='target{$ID}' class='attwrap left'>
-    <div id='div{$ID}' class='imagewrap' onclick=\"doPopup({$ID});\">
-        <img id=\"image{$ID}\" src=\"$src\" alt=\"{$title}\" $height_width />
-    </div>
-    {$noscript}
-</div>
-";
-            $popups .= "<div id='popup{$ID}' class='popup'>
-    <a id=\"I{$ID}\" onclick=\"if($thumb)toggleImage({$ID});else alert('$__nothumb');return false;\" href=\"javascript:void()\">$thumbtext</a>
-    <a id=\"L{$ID}\" onclick=\"toggleLink({$ID});return false;\" href=\"javascript:void()\">$__not_linked</a>
-    {$send_delete_cancel}
-</div>
-";
-        } else {
-            $title = wp_specialchars($attachment['post_title'], ENT_QUOTES);
-            $filename = basename($attachment['guid']);
-            $icon = get_attachment_icon($ID);
-            $toggle_icon = "<a id=\"I{$ID}\" onclick=\"toggleOtherIcon({$ID});return false;\" href=\"javascript:void()\">$__using_title</a>";
-            $script .= "aa[{$ID}] = '<a id=\"p{$ID}\" rel=\"attachment\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">';
-ab[{$ID}] = '<a id=\"p{$ID}\" href=\"{$filename}\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">';
-title[{$ID}] = '{$title}';
-filename[{$ID}] = '{$filename}';
-icon[{$ID}] = '{$icon}';
-";
-            $html .= "<div id='target{$ID}' class='attwrap left'>
-    <div id='div{$ID}' class='otherwrap usingtext' onmousedown=\"selectLink({$ID})\" onclick=\"doPopup({$ID});return false;\">
-        <a id=\"p{$ID}\" href=\"{$attachment['guid']}\" onmousedown=\"selectLink({$ID});\" onclick=\"return false;\">{$title}</a>
-    </div>
-    {$noscript}
-</div>
-";
-            $popups .= "<div id='popup{$ID}' class='popup'>
-    <div class='filetype'>".__('File Type:').' '.str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
-    <a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
-    {$toggle_icon}
-    {$send_delete_cancel}
-</div>
-";
-        }
+foreach ( $wp_upload_tabs as $t => $tab_array ) {
+    if ( !current_user_can( $tab_array[1] ) ) {
+        unset($wp_upload_tabs[$t]);
+        if ( $tab == $t )
+            wp_die(__("You are not allowed to be here"));
     }
 }
 
-$images_width = $uwidth_sum + ( count($images) * 6 ) + 35;
+include_once('admin-header.php');
 
-break;
+echo "<ul id='upload-menu'>\n";
+foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the current_user_can check
+    $class = 'upload-tab';
+    $href = add_query_arg( array('tab' => $t, 'ID' => '', 'action' => '') );
+    if ( isset($tab_array[3]) && is_array($tab_array[3]) )
+        add_query_arg( $tab_array[3], $href );
+    $_href = wp_specialchars( $href, 1 );
+    if ( $tab == $t )
+        $class .= ' current';
+    echo "\t<li class='$class left'><a href='$_href' title='{$tab_array[0]}'>{$tab_array[0]}</a></li>\n";
+}
+echo "</ul>\n\n";
 
-default:
-    wp_die(__('This script was not meant to be called directly.'));
-}
+echo "<div id='upload-content'>\n";
 
+call_user_func( $wp_upload_tabs[$tab][2] );
+
+echo "</div>\n";
+
+include_once('admin-footer.php');
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title></title>
-<meta http-equiv="imagetoolbar" content="no" />
-<script type="text/javascript">
-// <![CDATA[
-/* Define any variables we'll need, such as alternate URLs. */
-<?php echo $script; ?>
-function htmldecode(st) {
-    o = document.getElementById('htmldecode');
-    if (! o) {
-        o = document.createElement("A");
-        o.id = "htmldecode"
-    }
-    o.innerHTML = st;
-    r = o.innerHTML;
-    return r;
-}
-function cancelUpload() {
-    o = document.getElementById('uploadForm');
-    o.method = 'GET';
-    o.action.value = 'view';
-    o.submit();
-}
-function doPopup(i) {
-    if ( popup )
-    popup.style.display = 'none';
-    target = document.getElementById('target'+i);
-    popup = document.getElementById('popup'+i);
-    popup.style.left = (target.offsetLeft) + 'px';
-    popup.style.top = (target.offsetTop) + 'px';
-    popup.style.display = 'block';
-}
-popup = false;
-function selectLink(n) {
-    o=document.getElementById('div'+n);
-    if ( typeof document.body.createTextRange == 'undefined' || typeof win.tinyMCE == 'undefined' || win.tinyMCE.configs.length < 1 )
-        return;
-    r = document.body.createTextRange();
-    if ( typeof r != 'undefined' ) {
-        r.moveToElementText(o);
-        r.select();
-    }
-}
-function toggleLink(n) {
-    ol=document.getElementById('L'+n);
-    if ( ol.innerHTML == htmldecode(notlinked) ) {
-        ol.innerHTML = linkedtoimage;
-    } else if ( ol.innerHTML == htmldecode(linkedtoimage) ) {
-        ol.innerHTML = linkedtopage;
-    } else {
-        ol.innerHTML = notlinked;
-    }
-    updateImage(n);
-}
-function toggleOtherLink(n) {
-    ol=document.getElementById('L'+n);
-    if ( ol.innerHTML == htmldecode(linkedtofile) ) {
-        ol.innerHTML = linkedtopage;
-    } else {
-        ol.innerHTML = linkedtofile;
-    }
-    updateOtherIcon(n);
-}
-function toggleImage(n) {
-    oi = document.getElementById('I'+n);
-    if ( oi.innerHTML == htmldecode(usingthumbnail) ) {
-        oi.innerHTML = usingoriginal;
-    } else {
-        oi.innerHTML = usingthumbnail;
-    }
-    updateImage(n);
-}
-function toggleOtherIcon(n) {
-    od = document.getElementById('div'+n);
-    oi = document.getElementById('I'+n);
-    if ( oi.innerHTML == htmldecode(usingtitle) ) {
-        oi.innerHTML = usingfilename;
-        od.className = 'otherwrap usingtext';
-    } else if ( oi.innerHTML == htmldecode(usingfilename) && icon[n] != '' ) {
-        oi.innerHTML = usingicon;
-        od.className = 'otherwrap usingicon';
-    } else {
-        oi.innerHTML = usingtitle;
-        od.className = 'otherwrap usingtext';
-    }
-    updateOtherIcon(n);
-}
-function updateImage(n) {
-    od=document.getElementById('div'+n);
-    ol=document.getElementById('L'+n);
-    oi=document.getElementById('I'+n);
-    if ( oi.innerHTML == htmldecode(usingthumbnail) ) {
-        img = imga[n];
-    } else {
-        img = imgb[n];
-    }
-    if ( ol.innerHTML == htmldecode(linkedtoimage) ) {
-        od.innerHTML = ab[n]+img+'</a>';
-    } else if ( ol.innerHTML == htmldecode(linkedtopage) ) {
-        od.innerHTML = aa[n]+img+'</a>';
-    } else {
-        od.innerHTML = img;
-    }
-}
-function updateOtherIcon(n) {
-    od=document.getElementById('div'+n);
-    ol=document.getElementById('L'+n);
-    oi=document.getElementById('I'+n);
-    if ( oi.innerHTML == htmldecode(usingfilename) ) {
-        txt = filename[n];
-    } else if ( oi.innerHTML == htmldecode(usingicon) ) {
-        txt = icon[n];
-    } else {
-        txt = title[n];
-    }
-    if ( ol.innerHTML == htmldecode(linkedtofile) ) {
-        od.innerHTML = ab[n]+txt+'</a>';
-    } else if ( ol.innerHTML == htmldecode(linkedtopage) ) {
-        od.innerHTML = aa[n]+txt+'</a>';
-    } else {
-        od.innerHTML = txt;
-    }
-}
-
-var win = window.opener ? window.opener : window.dialogArguments;
-if (!win) win = top;
-tinyMCE = win.tinyMCE;
-function sendToEditor(n) {
-    o = document.getElementById('div'+n);
-    h = o.innerHTML.replace(new RegExp('^\\s*(.*?)\\s*$', ''), '$1'); // Trim
-    h = h.replace(new RegExp(' (class|title|width|height|id|onclick|onmousedown)=([^\'"][^ ]*)( |/|>)', 'g'), ' $1="$2"$3'); // Enclose attribs in quotes
-    h = h.replace(new RegExp(' (width|height)=".*?"', 'g'), ''); // Drop size constraints
-    h = h.replace(new RegExp(' on(click|mousedown)="[^"]*"', 'g'), ''); // Drop menu events
-    h = h.replace(new RegExp('<(/?)A', 'g'), '<$1a'); // Lowercase tagnames
-    h = h.replace(new RegExp('<IMG', 'g'), '<img'); // Lowercase again
-    h = h.replace(new RegExp('(<img .+?")>', 'g'), '$1 />'); // XHTML
-    if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') )
-        win.tinyMCE.execCommand('mceInsertContent', false, h);
-    else
-        win.edInsertContent(win.edCanvas, h);
-}
-// ]]>
-</script>
-<style type="text/css">
-    <?php if ( $action == 'links' ) : ?>
-    * html { overflow-x: hidden; }
-    <?php else : ?>
-    * html { overflow-y: hidden; }
-    <?php endif; ?>
-
-    body {
-        font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
-        border: none;
-        margin: 0px;
-        height: 150px;
-        background: #dfe8f1;
-    }
-
-    form { margin: 3px 2px 0px 6px; }
-
-    #wrap {
-        clear: both;
-        padding: 0px;
-        width: 100%;
-    }
-
-    #images {
-        position: absolute;
-        clear: both;
-        margin: 0px;
-        padding: 15px 15px;
-        width: <?php echo $images_width; ?>px;
-    }
-
-    #images img { background-color: rgb(209, 226, 239); }
-
-    <?php echo $style; ?>
-
-    .attwrap, .attwrap * {
-        margin: 0px;
-        padding: 0px;
-        border: 0px;
-    }
-
-    .imagewrap {
-        margin-right: 5px;
-        overflow: hidden;
-        width: 128px;
-    }
-
-    .otherwrap {
-        margin-right: 5px;
-        overflow: hidden;
-        background-color: #f9fcfe;
-    }
-
-    .otherwrap a { display: block; }
-
-    .otherwrap a, .otherwrap a:hover, .otherwrap a:active, .otherwrap a:visited { color: blue; }
-
-    .usingicon {
-        padding: 0px;
-        height: 96px;
-        text-align: center;
-        width: 128px;
-    }
-
-    .usingtext {
-        padding: 3px;
-        height: 90px;
-        text-align: left;
-        width: 122px;
-    }
-
-    .filetype {
-        font-size: 80%;
-        border-bottom: 3px double #89a;
-    }
-
-    .imagewrap, .imagewrap img, .imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img { text-decoration: none; }
-
-    #upload-menu {
-        background: #fff;
-        margin: 0px;
-        padding: 0;
-        list-style: none;
-        height: 2em;
-        border-bottom: 1px solid #448abd;
-        width: 100%;
-    }
-
-    #upload-menu li {
-        float: left;
-        margin: 0 0 0 .75em;
-    }
-
-    #upload-menu a {
-        display: block;
-        padding: 5px;
-        text-decoration: none;
-        color: #000;
-        border-top: 3px solid #fff;
-    }
-
-    #upload-menu .current a {
-        background: #dfe8f1;
-        border-right: 2px solid #448abd;
-    }
-
-    #upload-menu a:hover {
-        background: #dfe8f1;
-        color: #000;
-    }
-
-    .tip {
-        color: rgb(68, 138, 189);
-        padding: 2px 1em;
-    }
-
-    .inactive {
-        color: #fff;
-        padding: 1px 3px;
-    }
-
-    .left { float: left; }
-
-    .right { float: right; }
-
-    .center { text-align: center; }
-
-    #upload-menu li.spacer { margin-left: 40px; }
-
-    #title, #descr {
-        width: 99%;
-        margin-top: 1px;
-    }
-
-    th {
-        text-align: right;
-        width: 4.5em;
-    }
-
-    #descr { height: 36px; }
-
-    #buttons {
-        margin-top: 2px;
-        text-align: right;
-    }
-
-    .popup {
-        margin: 4px 4px;
-        padding: 1px;
-        position: absolute;
-        width: 114px;
-        display: none;
-        background-color: rgb(240, 240, 238);
-        border-top: 2px solid #fff;
-        border-right: 2px solid #ddd;
-        border-bottom: 2px solid #ddd;
-        border-left: 2px solid #fff;
-        text-align: center;
-    }
-
-    .imagewrap .popup {
-        opacity: .90;
-        filter:alpha(opacity=90);
-    }
-
-    .otherwrap .popup { padding-top: 20px; }
-
-    .popup a, .popup a:visited, .popup a:active {
-        background-color: transparent;
-        display: block;
-        width: 100%;
-        text-decoration: none;
-        color: #246;
-    }
-
-    .popup a:hover {
-        background-color: #fff;
-        color: #000;
-    }
-
-    .caption { text-align: center; }
-
-    #submit {
-        margin: 1px;
-        width: 99%;
-    }
-
-    #submit input, #submit input:focus {
-        background: url( images/fade-butt.png );
-        border: 3px double #999;
-        border-left-color: #ccc;
-        border-top-color: #ccc;
-        color: #333;
-        padding: 0.25em;
-    }
-
-    #submit input:active {
-        background: #f4f4f4;
-        border: 3px double #ccc;
-        border-left-color: #999;
-        border-top-color: #999;
-    }
-
-    .zerosize {
-        width: 0px;
-        height: 0px;
-        overflow: hidden;
-        position: absolute;
-    }
-
-    #links {
-        margin: 3px 8px;
-        line-height: 2em;
-    }
-
-    #links textarea {
-        width: 95%;
-        height: 4.5em;
-    }
-</style>
-<?php if ( ('rtl' == $wp_locale->text_direction) ): ?>
-<style type="text/css">
-    body { font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; }
-
-    .usingtext { text-align: right; }
-
-    th { text-align: left; }
-
-    .left, #upload-menu li { float: right; }
-
-    .right { float: left; }
-
-    .popup {
-        border-right: 2px solid #fff;
-        border-left: 2px solid #ddd;
-    }
-
-    #upload-menu .current a {
-        border-right: 0;
-        border-left: 2px solid #448abd;
-    }
-
-    #submit input, #submit input:focus {
-        border-left: 0;
-        border-right-color: #ccc;
-    }
-
-    #submit input:active {
-        border-left: 0;
-        border-right-color: #999;
-    }
-</style>
-<?php endif; ?> 
-</head>
-<body>
-<ul id="upload-menu">
-    <li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__) . "?action=upload&amp;post=$post&amp;all=$all&amp;start=$start"; ?>"><?php _e('Upload'); ?></a></li>
-
-    <?php if ( $attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$post'") ): ?>
-        <li<?php echo $current_2; ?>><a href="<?php echo basename(__FILE__) . "?action=view&amp;post=$post&amp;all=false"; ?>"><?php _e('Browse'); ?></a></li>
-    <?php endif; ?>
-
-    <?php if ($wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = 'attachment'")): ?>
-        <li<?php echo $current_3; ?>><a href="<?php echo basename(__FILE__) . "?action=view&amp;post=$post&amp;all=true"; ?>"><?php _e('Browse All'); ?></a></li>
-    <?php endif; ?>
-
-    <li> </li>
-
-    <?php if ( $action == 'view' ): ?>
-        <?php if ( false !== $back ): ?>
-            <li class="spacer"><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=0"; ?>" title="<?php _e('First'); ?>">|&laquo;</a></li>
-            <li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=$back"; ?>">&laquo; <?php _e('Back'); ?></a></li>
-        <?php else: ?>
-            <li class="inactive spacer">|&laquo;</li>
-            <li class="inactive">&laquo; <?php _e('Back'); ?></li>
-        <?php endif; ?>
-
-        <?php if ( false !== $next ): ?>
-            <li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;start=$next"; ?>"><?php _e('Next &raquo;'); ?></a></li>
-            <li><a href="<?php echo basename(__FILE__) . "?action=$action&amp;post=$post&amp;all=$all&amp;last=true"; ?>" title="<?php _e('Last'); ?>">&raquo;|</a></li>
-        <?php else: ?>
-            <li class="inactive"><?php _e('Next &raquo;'); ?></li>
-            <li class="inactive">&raquo;|</li>
-        <?php endif; ?>
-    <?php endif; ?>
-</ul>
-
-<?php if ( $action == 'view' ): ?>
-    <div id="wrap">
-        <!--<div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div>-->
-        <div id="images">
-            <?php echo $html; ?>
-            <?php echo $popups; ?>
-        </div>
-    </div>
-<?php elseif ( $action == 'upload' ): ?>
-    <div class="tip"></div>
-    <form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo basename(__FILE__); ?>">
-        <table style="width: 99%">
-            <tr>
-                <th scope="row"><label for="upload"><?php _e('File:'); ?></label></th>
-                <td><input type="file" id="upload" name="image" /></td>
-            </tr>
-            <tr>
-                <th scope="row"><label for="title"><?php _e('Title:'); ?></label></th>
-                <td><input type="text" id="title" name="imgtitle" /></td>
-            </tr>
-            <tr>
-                <th scope="row"><label for="descr"><?php _e('Description:'); ?></label></th>
-                <td><input type="textarea" name="descr" id="descr" value="" /></td>
-            </tr>
-            <tr id="buttons">
-                <th></th>
-                <td>
-                    <input type="hidden" name="action" value="save" />
-                    <input type="hidden" name="post" value="<?php echo $post; ?>" />
-                    <input type="hidden" name="all" value="<?php echo $all; ?>" />
-                    <input type="hidden" name="start" value="<?php echo $start; ?>" />
-                    <?php wp_nonce_field( 'inlineuploading' ); ?>
-                    <div id="submit">
-                        <input type="submit" value="<?php _e('Upload'); ?>" />
-                        <?php if ( !empty($all) ): ?>
-                            <input type="button" value="<?php _e('Cancel'); ?>" onclick="cancelUpload()" />
-                        <?php endif; ?>
-                    </div>
-                </td>
-            </tr>
-        </table>
-    </form>
-<?php elseif ( $action == 'links' ): ?>
-    <div id="links">
-        <?php the_attachment_links($attachment); ?>
-    </div>
-<?php endif; ?>
-</body>
-</html>

trunk/wp-admin/wp-admin.css

@@ -187 +187 @@
     padding: 0px;
     margin-bottom: 16px;
-    height: 15em;
+    height: 16em;
     width: 100%;
 /*  overflow-y: hidden;*/

trunk/wp-includes/script-loader.php

@@ -30 +30 @@
             $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '3684' );
             $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
+            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), mt_rand() );
         }
     }