Changeset 8998

Timestamp:

09/27/08 08:17:55 (2 months ago)

Author:

azaozz

Message:

Upload media from the Media Library page.

Files:

• trunk/wp-admin/async-upload.php (modified) (1 diff)
• trunk/wp-admin/css/colors-classic.css (modified) (2 diffs)
• trunk/wp-admin/css/colors-fresh.css (modified) (2 diffs)
• trunk/wp-admin/includes/media.php (modified) (3 diffs)
• trunk/wp-admin/media-upload.php (modified) (3 diffs)
• trunk/wp-admin/media.php (modified) (2 diffs)
• trunk/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-admin/upload.php (modified) (3 diffs)
• trunk/wp-admin/wp-admin.css (modified) (5 diffs)
• trunk/wp-includes/js/swfupload/handlers.js (modified) (2 diffs)

trunk/wp-admin/async-upload.php

@@ -27 +27 @@
-// just fetch the detail form for that attachment
-if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
-
+
+
+
+
+
+
-    exit;
-}

trunk/wp-admin/css/colors-classic.css

@@ -63 +63 @@
-li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-ul.view-switch li.current, .form-table tr, #poststuff h3, #replyhandle,
-
+
+
-    background-color: #cfebf7;
-}
@@ -147 +148 @@
-}
-
-
+
+
+
+
-    border-bottom-color: #fff;
-}

trunk/wp-admin/css/colors-fresh.css

@@ -63 +63 @@
-li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-ul.view-switch li.current, .form-table tr, #poststuff h3, #replyhandle,
-
+
+
-    background-color: #eaf3fa;
-}
@@ -147 +148 @@
-}
-
-
+
+
+
+
-    border-bottom-color: #fff;
-}

trunk/wp-admin/includes/media.php

@@ -759 +759 @@
-    global $redir_tab;
-
-
+, 'show_title' => true
-    $args = wp_parse_args( $args, $default_args );
-    extract( $args, EXTR_SKIP );
@@ -806 +806 @@
-
-    $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-wp_html_excerpt($display_title, 60)
+$show_title ? "<div class='filename new'>" . wp_html_excerpt($display_title, 60) . "</div>" : ''
-
-    $gallery = ( (isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab) ) ? true : false;
@@ -827 +827 @@
-    $toggle_links
-    $order
-<div class='filename new'>$display_title</div>
+$display_title
-    <table class='slidetoggle describe $class'>
-        <thead class='media-item-info'>

trunk/wp-admin/media-upload.php

@@ -12 +12 @@
-/** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+
+if (!current_user_can('upload_files'))
+    wp_die(__('You do not have permission to upload files.'));
+
-wp_enqueue_script('swfupload');
-wp_enqueue_script('swfupload-degrade');
@@ -18 +22 @@
-
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-
-if (!current_user_can('upload_files'))
-    wp_die(__('You do not have permission to upload files.'));
-
-// IDs should be integers
@@ -30 +31 @@
-    wp_die(__("You are not allowed to be here"));
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-do_action("media_upload_$type");
-
-do_action("media_upload_$tab");
+
+
+require_once('admin-header.php'); ?>
+
+<h2><?php _e('Upload Media') ?></h2>
-
+    <form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&upload-page-form=" class="media-upload-form type-form validate" id="file-form">
+    
+    <?php media_upload_form(); ?>
+    
+    <script type="text/javascript">
+    jQuery(function($){
+        var preloaded = $(".media-item.preloaded");
+        if ( preloaded.length > 0 ) {
+            preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+        }
+        updateMediaForm();
+        post_id = 0;
+        shortform = 1;
+        $('body:last div:has(embed), body:last div:has(object)').css({'visibility':'hidden','marginTop':'-1px'});
+    });
+    </script>
+    <input type="hidden" name="post_id" id="post_id" value="0" />
+    <?php wp_nonce_field('media-form'); ?>
+    <div id="media-items"> </div>
+    <p>
+    <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+    </p>
+    </form>
+    </div>
+
+<?php
+    include('admin-footer.php');
+
+} else {
+
+    // upload type: image, video, file, ..?
+    if ( isset($_GET['type']) )
+        $type = strval($_GET['type']);
+    else
+        $type = apply_filters('media_upload_default_type', 'file');
+    
+    // tab: gallery, library, or type-specific
+    if ( isset($_GET['tab']) )
+        $tab = strval($_GET['tab']);
+    else
+        $tab = apply_filters('media_upload_default_tab', 'type');
+    
+    $body_id = 'media-upload';
+    
+    // let the action code decide how to handle the request
+    if ( $tab == 'type' )
+        do_action("media_upload_$type");
+    else
+        do_action("media_upload_$tab");
+}
-?>

trunk/wp-admin/media.php

@@ -24 +24 @@
-
-    $errors = media_upload_form_handler();
-
-
-    check_admin_referer('media-form');
-
-    if ( !current_user_can('edit_post', $attachment_id) )
-        wp_die ( __('You are not allowed to edit this attachment.') );
-
-    if ( empty($errors) ) {
@@ -93 +87 @@
-
-<form method="post" action="<?php echo clean_url( remove_query_arg( 'message' ) ); ?>" class="media-upload-form" id="media-single-form">
-id="media-items" 
+
-<div id='media-item-<?php echo $att_id; ?>' class='media-item'>
-
+show_title' => false, '
-</div>
-</div>

trunk/wp-admin/menu.php

@@ -50 +50 @@
-
-$menu[10] = array( __('Media'), 'upload_files', 'upload.php' );
-
+?inline
-    $submenu['upload.php'][10] = array( __('View All'), 'upload_files', 'upload.php');
-

trunk/wp-admin/upload.php

@@ -9 +9 @@
-/** WordPress Administration Bootstrap */
-require_once('admin.php');
-
+//
-wp_enqueue_script( 'media-upload' );
-wp_enqueue_script( 'wp-ajax-response' );
@@ -183 +183 @@
-    $h2_tag    = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with “%s”'), single_tag_title('', false) ) : '';
-    $h2_month  = isset($_GET['m'])   && $_GET['m']   ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
- class="thickbox">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'media-upload.php?library=false&TB_iframe=tru
+>Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'media-upload.php?inlin
-}
-?></h2>
@@ -225 +225 @@
-endif;
-
-
+attachment 
-$messages[2] = __('Media deleted.');
+$messages[3] = __('Error saving media attachment.');
-
-if ( isset($_GET['message']) && (int) $_GET['message'] )

trunk/wp-admin/wp-admin.css

@@ -965 +965 @@
-}
-
-
+
+
-    margin-bottom: 9px;
-    padding: 10px;
@@ -974 +975 @@
-}
-
-
+
+
-    vertical-align: top;
-    text-align: left;
@@ -987 +989 @@
-}
-
-
+
+
+
+
-    border-width: 1px;
-    border-style: solid;
@@ -2345 +2350 @@
-
-/* Media library */
-
+
+
+
+
+
+
+
+
+
+
+
+
-    background-color: transparent;
-}
@@ -2370 +2386 @@
-}
-
-media-singl
-media-singl
+describ
+describ
-    width: 460px;
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-includes/js/swfupload/handlers.js

@@ -36 +36 @@
-    jQuery('#media-item-' + fileObj.id + ' .progress').hide();
-
+    var f = ( typeof shortform == 'undefined' ) ? 1 : 2;
-    // Old style: Append the HTML returned by the server -- thumbnail and form inputs
-    if ( isNaN(serverData) || !serverData ) {
@@ -43 +44 @@
-    // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
-    else {
-1
+f
-    }
-}