Index: wp-admin/includes/upload.php =================================================================== --- wp-admin/includes/upload.php (revision 7346) +++ wp-admin/includes/upload.php (working copy) @@ -1,402 +0,0 @@ -post_content )); - - $class = 'text'; - $innerHTML = get_attachment_innerHTML( $id, false, $dims ); - if ( $image_src = get_attachment_icon_src() ) { - $image_rel = wp_make_link_relative($image_src); - $innerHTML = ' ' . str_replace($image_src, $image_rel, $innerHTML); - $class = 'image'; - } - - $src_base = wp_get_attachment_url(); - $src = wp_make_link_relative( $src_base ); - $src_base = str_replace($src, '', $src_base); - - if ( !trim($post_title) ) - $post_title = basename($src); - - $r = ''; - - if ( $href ) - $r .= "\n"; - if ( $href || $image_src ) - $r .= "\t\t\t$innerHTML"; - if ( $href ) - $r .= "\n"; - $size = @filesize($filesystem_path); - if ( !empty($size) ) - $r .= "\t\t\t\t".size_format($size)."\n"; - $r .= "\n\t\t
\n\t\t\t

\n"; - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t\t\n"; - - if ( !$thumb_base = wp_get_attachment_thumb_url() ) - $thumb_base = wp_mime_type_icon(); - if ( $thumb_base ) { - $thumb_rel = wp_make_link_relative( $thumb_base ); - $thumb_base = str_replace( $thumb_rel, '', $thumb_base ); - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t\t\n"; - } - - $r .= "\t\t\t\t\n"; - - if ( isset($width) ) { - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t\t\n"; - } - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t

\n\t\t
\n"; - return $r; -} - -function wp_upload_view() { - global $style; - $id = get_the_ID(); - $attachment_data = wp_get_attachment_metadata( $id ); -?> -
-
-

"; - the_title(); - if ( !isset($attachment_data['width']) && 'inline' != $style ) - echo ''; - ?>

- ' . __('view') . ''; - echo ' | '; - echo '' . __('edit') . ''; - echo ' | '; - echo '' . __('cancel') . ''; - echo ' ]'; ?> -
- -
-"; - echo wp_upload_display( array(171, 128) ); - if ( isset($attachment_data['width']) && 'inline' != $style ) - echo ''; ?> -
- -
-\n"; -} - -function wp_upload_form() { - $id = get_the_ID(); - global $post_id, $tab, $style; - $enctype = $id ? '' : ' enctype="multipart/form-data"'; - $post_id = (int) $post_id; -?> - id="upload-file" method="post" action=""> - -
-

"; - the_title(); - if ( !isset($attachment_data['width']) && 'inline' != $style ) - echo ''; - ?>

- ' . __('view') . ''; - echo ' | '; - echo '' . __('links') . ''; - echo ' | '; - echo '' . __('cancel') . ''; - echo ' ]'; ?> -
- -
-"; - echo wp_upload_display( array(171, 128) ); - if ( isset($attachment_data['width']) && 'inline' != $style ) - echo ''; ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
f/
mm
0.0 and $secs < 1.0) ? ("1/" . round(1/$secs)) : ($secs); ?>s
- - - - - - - - - - - -
- -
-
- -" - . __('Browse Files') . '' - ); - - $overrides = array('action'=>'upload'); - - $file = wp_handle_upload($_FILES['image'], $overrides); - - if ( isset($file['error']) ) - wp_die($file['error'] . "
" . __('Back to Image Uploading') . '' - ); - - $url = $file['url']; - $type = $file['type']; - $file = $file['file']; - - // Construct the attachment array - $attachment = array( - 'post_title' => $post_title, - 'post_content' => $post_content, - 'post_type' => 'attachment', - 'post_parent' => $post_id, - 'post_mime_type' => $type, - 'guid' => $url - ); - - // Save the data - $id = wp_insert_attachment($attachment, $file, $post_id); - - wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); - - wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=browse&action=view&ID=$id&post_id=$post_id"); - die; - break; - - case 'save' : - global $from_tab, $post_id, $style; - if ( !$from_tab ) - $from_tab = 'upload'; - check_admin_referer( 'inlineuploading' ); - - wp_update_post($_POST); - wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id"); - die; - break; - - case 'delete' : - global $ID, $post_id, $from_tab, $style; - if ( !$from_tab ) - $from_tab = 'upload'; - - check_admin_referer( 'inlineuploading' ); - - if ( !current_user_can('edit_post', (int) $ID) ) - wp_die( __('You are not allowed to delete this attachment.') - . " " - . __('Go back') . '' - ); - - wp_delete_attachment($ID); - - wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id" ); - die; - break; - - endswitch; -} - -add_action( 'upload_files_upload', 'wp_upload_tab_upload_action' ); - -function wp_upload_grab_attachments( $obj ) { - $obj->is_attachment = true; -} - -function wp_upload_posts_where( $where ) { - global $post_id; - return $where . " AND post_parent = '" . (int) $post_id . "'"; -} - -function wp_upload_tab_browse() { - global $action, $paged; - $old_vars = compact( 'paged' ); - - switch ( $action ) : - case 'edit' : - case 'view' : - global $ID; - $attachments = query_posts("attachment_id=$ID"); - if ( have_posts() ) : while ( have_posts() ) : the_post(); - 'edit' == $action ? wp_upload_form() : wp_upload_view(); - endwhile; endif; - break; - default : - global $tab, $post_id, $style; - add_action( 'pre_get_posts', 'wp_upload_grab_attachments' ); - if ( 'browse' == $tab && $post_id ) - add_filter( 'posts_where', 'wp_upload_posts_where' ); - $attachments = query_posts("what_to_show=posts&post_status=any&posts_per_page=10&paged=$paged"); - - echo "\n\n"; - - echo "
\n"; - break; - endswitch; - - extract($old_vars); -} - - -function wp_upload_tab_browse_action() { - global $style; - if ( 'inline' == $style ) - wp_enqueue_script('upload'); -} - -add_action( 'upload_files_browse', 'wp_upload_tab_browse_action' ); -add_action( 'upload_files_browse-all', 'wp_upload_tab_browse_action' ); - -function wp_upload_admin_head() { - wp_admin_css( 'css/upload' ); - if ( 'inline' == @$_GET['style'] ) { - echo ""; - } -} - -?> Index: wp-admin/css/upload-rtl.css =================================================================== --- wp-admin/css/upload-rtl.css (revision 7346) +++ wp-admin/css/upload-rtl.css (working copy) @@ -1,12 +0,0 @@ -html { - direction: ltr; - } -#uploadoptions, table { - direction: rtl; - } -td { - padding: 1px 6px 0; - } -.submit { - text-align: left; - } \ No newline at end of file Index: wp-admin/css/upload.css =================================================================== --- wp-admin/css/upload.css (revision 7346) +++ wp-admin/css/upload.css (working copy) @@ -1,198 +0,0 @@ -body { background: #f9fcfe; } - -.upload-file-data { display: none; } - -#upload-menu { - border-top-width: 2em; - border-top-style: solid; - margin: 0; - padding: 0; - height: 0; - list-style: none; - width: 100%; -} - -body > #upload-menu { border-bottom-width: 7px; -border-bottom-style: solid;} - -#upload-menu li { - margin: 0; - position: relative; - top: -2em; - padding-bottom: 5px; - border: none; - border-top-width: 3px; - border-top-style:solid; -} - -#upload-menu li a.upload-tab-link { - margin-left: 0.75em; - padding: 5px 5px 0; - display: block; - float: left; - height: 100%; - text-decoration: none; - border-bottom: none; -} - -#upload-menu li.current { - border-right-width: 2px; - border-right-style: solid; -} - -#upload-menu li #current-tab-nav { - float: left; - padding: 5px 5px 0 0; - margin-left: -5px; -} - -#upload-menu li span .page-numbers { - padding: 0; - border: none; -} - -#upload-menu li span a.page-numbers:hover { text-decoration: underline; } - -#upload-content { - position: relative; - clear: both; - margin: 0; - padding: 0; - border: none; - width: 100%; - height: 100%; - background: none; -} - -#upload-file { - margin: 0 auto; - top: 0; - left: 0; - width: 95%; - height: 100%; -} - -#upload-file th { - width: 8em; -} - -form#upload-file input, form#upload-file textarea, div#upload-content.upload table { width: 100%; } - -form#upload-file .submit input { width: auto; } - -#upload-file-view { padding: 0 0 0 75px; } - -#file-title { - margin: 0 0 .2em 75px; - padding: 0; - display: block; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 16px; -} - -h2 { - margin: 0 .2em 0 0; - padding: 0; - display: inline; - border: none; - font-size: 1.4em; - line-height: 1.4em; -} - -.wrap h2 { - margin: .4em 0 .5em; - display: block; - border-bottom-width: .5em; - border-bottom-style: solid; - font: normal 32px/5px serif; - clear: both; -} - -* html .wrap h2 { - margin-top: 1em; -} - -.back { - display: block; - position: absolute; - left: 14px; - top: 10px; -} - -#upload-files { - list-style-type: none; - margin: 0; - padding: 15px 0 0; -} - -#upload-files li { margin: 0 0 15px 15px; } - -#upload-files a, #upload-file-view a, a.file-link { - border: none; - text-decoration: none; -} - -#upload-file-view a img { -padding-bottom: .2em; -border-bottom-width: 1px; -border-bottom-style: solid; -} - -#upload-files a.file-link { - display: block; - width: 130px; - height: 128px; - text-align: center; - overflow: hidden; -} - -#upload-files a.text { - padding-top: 40px; - height: 88px; - font-size: 16px; -} - -#upload-files a.file-link.image { - font-size: 2px; - letter-spacing: 0; -} - -#upload-files a.file-link img { vertical-align: middle; } - -#the-attachment-links textarea { - font-size: 10px; - overflow: hidden; -} - -form table { float: none; padding: 0 15px; } - -table { - float: left; - margin: 0; - padding: 0; -} - -th { text-align: right; vertical-align: text-top; } - -tr, td, th { - margin-top: 0; - padding-top: 0; -} - -#uploadoptions th { - width: 80px; -} - -#uploadoptions p { - margin: 0; - padding: 0; -} - -#uploadoptions td { - padding-left: 1em; - line-height: 140%; -} - -#uploadoptions table { - width: 300px; -}