Changeset 7228

Timestamp:

03/11/08 01:30:15 (6 months ago)

Author:

matt

Message:

See #5911. Hat tip: andy.

Files:

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

trunk/wp-admin/includes/media.php

@@ -824 +824 @@
-<?php media_upload_form( $errors ); ?>
-
+<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();
+});
+-->
+</script>
-<?php if ( $id && !is_wp_error($id) ) : ?>
+<div id="media-items">
+<?php echo get_media_items( $id, $errors ); ?>
+</div>
+<input type="submit" class="button savebutton" name="save" value="<?php _e('Save all changes'); ?>" />
+
+<?php elseif ( is_callable($callback) ) : ?>
+
+<div class="media-blank">
+<p style="text-align:center"><?php _e('&mdash; OR &mdash;'); ?></p>
+<h3><?php _e('From URL'); ?></h3>
+</div>
+
+<div id="media-items">
+<div class="media-item media-blank">
+<?php echo call_user_func($callback); ?>
+</div>
+</div>
+<input type="submit" class="button savebutton" name="save" value="<?php _e('Save all changes'); ?>" />
+<?php
+    endif;
+}
+
+function media_upload_gallery_form($errors) {
+    media_upload_header();
+
+    $post_id = intval($_REQUEST['post_id']);
+
+    $form_action_url = get_option('siteurl') . "/wp-admin/media-upload.php?type={$GLOBALS['type']}&tab=gallery&post_id=$post_id";
+
+?>
+
-<script type="text/javascript">
-<!--
@@ -836 +878 @@
--->
-</script>
+
+<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form" id="gallery-form">
+<?php wp_nonce_field('media-form'); ?>
+<?php //media_upload_form( $errors ); ?>
+
-<div id="media-items">
-
-
-
+
-</div>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
+
+<br style="clear:both;" />
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-<script type="text/javascript">
@@ -879 +1025 @@
-</script>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form" id="gallery-form">
-<?php wp_nonce_field('media-form'); ?>
-<?php //media_upload_form( $errors ); ?>
-
-<div id="media-items">
-<?php echo get_media_items($post_id, $errors); ?>
-</div>
-<p class="submit">
-    <input type="submit" class="submit insert-gallery" name="insert-gallery" value="<?php _e('Insert gallery into post'); ?>" />
-</p>
-<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
-</form>
-<?php
-}
-
-function media_upload_library_form($errors) {
-    global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
-
-    media_upload_header();
-
-    $post_id = intval($_REQUEST['post_id']);
-
-    $form_action_url = get_option('siteurl') . "/wp-admin/media-upload.php";
-
-    $_GET['paged'] = intval($_GET['paged']);
-    if ( $_GET['paged'] < 1 )
-        $_GET['paged'] = 1;
-    $start = ( $_GET['paged'] - 1 ) * 10;
-    if ( $start < 1 )
-        $start = 0;
-    add_filter( 'post_limits', $limit_filter = create_function( '$a', "return 'LIMIT $start, 10';" ) );
-
-    list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-
-?>
-
-<form id="filter" action="" method="get">
-<input type="hidden" name="type" value="<?php echo $type; ?>" />
-<input type="hidden" name="tab" value="<?php echo $tab; ?>" />
-<input type="hidden" name="post_id" value="<?php echo $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo wp_specialchars($_GET['post_mime_type'], true); ?>" />
-
-<div id="search-filter">
-    <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
-    <input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
-</div>
-
-<p>
-<ul class="subsubsub">
-<?php
-$type_links = array();
-$_num_posts = (array) wp_count_attachments();
-$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
-foreach ( $matches as $type => $reals )
-    foreach ( $reals as $real )
-        $num_posts[$type] += $_num_posts[$real];
-$class = empty($_GET['post_mime_type']) ? ' class="current"' : '';
-$type_links[] = "<li><a href='" . remove_query_arg(array('post_mime_type', 'paged', 'm')) . "'$class>".__('All Types')."</a>";
-foreach ( $post_mime_types as $mime_type => $label ) {
-    $class = '';
-
-    if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
-        continue;
-
-    if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
-        $class = ' class="current"';
-
-    $type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false)) . "'$class>" . sprintf($label[2], "<span id='$mime_type-counter'>{$num_posts[$mime_type]}</span>") . '</a>';
-}
-echo implode(' | </li>', $type_links) . '</li>';
-unset($type_links);
-?>
-</ul>
-</p>
-
-<div class="tablenav">
-
-<?php
-$page_links = paginate_links( array(
-    'base' => add_query_arg( 'paged', '%#%' ),
-    'format' => '',
-    'total' => ceil($wp_query->found_posts / 10),
-    'current' => $_GET['paged']
-));
-
-if ( $page_links )
-    echo "<div class='tablenav-pages'>$page_links</div>";
-?>
-
-<div style="float: left">
-<?php
-
-$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
-
-$arc_result = $wpdb->get_results( $arc_query );
-
-$month_count = count($arc_result);
-
-if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?>
-<select name='m'>
-<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option>
-<?php
-foreach ($arc_result as $arc_row) {
-    if ( $arc_row->yyear == 0 )
-        continue;
-    $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
-
-    if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
-        $default = ' selected="selected"';
-    else
-        $default = '';
-
-    echo "<option$default value='$arc_row->yyear$arc_row->mmonth'>";
-    echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
-    echo "</option>\n";
-}
-?>
-</select>
-<?php } ?>
-
-<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button-secondary" />
-
-</div>
-
-<br style="clear:both;" />
-</div>
-</form>
-
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form" id="library-form">
-
-<?php wp_nonce_field('media-form'); ?>
-<?php //media_upload_form( $errors ); ?>
-
-<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();
-    }
-});
--->
-</script>
-
-<div id="media-items">
-<?php echo get_media_items(null, $errors); ?>
-</div>
+<input type="submit" class="button savebutton" name="save" value="<?php _e('Save all changes'); ?>" />
-<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
-</form>

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

@@ -86 +86 @@
-        jQuery('.type-form .slidetoggle').siblings().addClass('hidden');
-    }
+
+    // Only show Save buttons when there is at least one file.
+    if ( jQuery('#media-items>*').not('.media-blank').length > 0 )
+        jQuery('.savebutton').show();
+    else
+        jQuery('.savebutton').hide();
-
-    // Only show Gallery button when there are at least two files.