Changeset 23753

Timestamp:

03/19/2013 05:18:07 PM (12 years ago)

Author:

helen

Message:

Remove separate meta fields for image and gallery post formats. These are proving to be more confusing and labor-intensive from both a user and dev perspective than entering into the regular content editor. We will rely on good content parsing instead. See #19570, #23347.

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (2 diffs)
• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/js/post-formats.js (modified) (2 diffs)
• wp-includes/post-formats.php (modified) (3 diffs)

trunk/wp-admin/css/wp-admin.css

@@ -3098 +3098 @@
 }
 
-.wp-format-standard .post-formats-fields,
-.wp-format-aside .post-formats-fields,
-.wp-format-chat .post-formats-fields,
-.wp-format-status .post-formats-fields {
+.post-formats-fields {
     display: none;
+}
+
+.wp-format-link .post-formats-fields,
+.wp-format-quote .post-formats-fields,
+.wp-format-video .post-formats-fields,
+.wp-format-audio .post-formats-fields,
+.wp-format-chat .field.wp-format-chat,
+.wp-format-link .field.wp-format-link,
+.wp-format-quote .field.wp-format-quote,
+.wp-format-video .field.wp-format-video,
+.wp-format-audio .field.wp-format-audio {
+    display: block;
 }
 
@@ -3114 +3123 @@
     padding: 5px;
     font-size: 1.2em;
-}
-
-.wp-format-chat .field.wp-format-chat,
-.wp-format-gallery .field.wp-format-gallery,
-.wp-format-link .field.wp-format-link,
-.wp-format-image .field.wp-format-image,
-.wp-format-quote .field.wp-format-quote,
-.wp-format-video .field.wp-format-video,
-.wp-format-audio .field.wp-format-audio {
-    display: block;
-}
-
-#wp-format-image-holder {
-    overflow: hidden;
-    width: 300px;
-    height: 200px;
-    border: 1px solid #dfdfdf;
-    background: #f5f5f5;
-}
-
-#wp-format-image-holder:hover {
-    background-color: #eee;
-}
-
-#wp-format-image-select {
-    display: block;
-    height: 200px;
-    text-align: center;
-}
-
-#wp-format-image-select img {
-    max-width: 100%;
-    max-height: 100%;
-}
-
-.empty #wp-format-image-select {
-    padding-top: 120px;
-    height: 80px;
-    background: url(../images/media-button-2x.png) no-repeat center;
 }
 

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

@@ -394 +394 @@
 if ( post_type_supports( $post_type, 'post-formats' ) ) {
     $format_meta = get_post_format_meta( $post_ID );
-
-if ( isset( $format_meta['image'] ) )
-    $image = is_numeric( $format_meta['image'] ) ? wp_get_attachment_url( $format_meta['image'] ) : $format_meta['image'];
-else
-    $image = false;
 ?>
 <div class="post-formats-fields edit-form-section">
@@ -414 +409 @@
 </div>
 
-<div class="field wp-format-image">
-    <div id="wp-format-image-holder" class="hide-if-no-js<?php if ( ! $image ) echo ' empty'; ?>">
-        <a href="#" id="wp-format-image-select"
-            data-choose="<?php esc_attr_e( 'Choose an Image' ); ?>"
-            data-update="<?php esc_attr_e( 'Select Image' ); ?>">
-            <?php
-                if ( $image )
-                    echo '<img src="' . esc_url( $image ) . '" />';
-                else
-                    _e( 'Select Image' );
-            ?>
-        </a>
-    </div>
-    <label for="_wp_format_image" class="screen-reader-text"><?php _e( 'Image ID or URL' ); ?>:</label>
-    <input type="text" name="_wp_format_image" id="wp_format_image" value="<?php echo esc_attr( $format_meta['image'] ); ?>" placeholder="<?php esc_attr_e( 'Image ID or URL' ); ?>" class="widefat hide-if-js" />
-</div>
-
-<div class="field wp-format-link wp-format-quote wp-format-image">
+<div class="field wp-format-link wp-format-quote">
     <label for="_wp_format_url" class="screen-reader-text"><?php _e( 'Link URL' ); ?>:</label>
     <input type="text" name="_wp_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" placeholder="<?php esc_attr_e( 'Link URL' ); ?>" class="widefat" />
-</div>
-
-<div class="field wp-format-gallery">
-    <label for="_wp_format_gallery" class="screen-reader-text"><?php _e( 'Gallery shortcode' ); ?>:</label>
-    <input type="text" name="_wp_format_gallery" id="wp_format_gallery" value="<?php echo esc_attr( $format_meta['gallery'] ); ?>" placeholder="<?php esc_attr_e( 'Gallery shortcode' ); ?>" class="widefat" />
 </div>
 

trunk/wp-admin/js/post-formats.js

@@ -1 @@
-window.wp = window.wp || {};
-
 (function($){
-    var imageFrame;
 
     // Post formats selection
     $('.post-format-select a').on( 'click.post-format', function(e) {
-        var $this = $(this), editor, body,
-            format = $this.data('wp-format'), container = $('#post-body-content');
+        var $this = $(this),
+            editor,
+            body,
+            format = $this.data('wp-format'),
+            container = $('#post-body-content');
 
         $('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
@@ -29 +29 @@
     });
 
-    // Image selection
-    $('#wp-format-image-select').click( function( event ) {
-        var $el = $(this),
-            $holder = $('#wp-format-image-holder'),
-            $field = $('#wp_format_image');
-        event.preventDefault();
-
-        // If the media frame already exists, reopen it.
-        if ( imageFrame ) {
-            imageFrame.open();
-            return;
-        }
-
-        // Create the media frame.
-        imageFrame = wp.media.frames.formatImage = wp.media({
-            // Set the title of the modal.
-            title: $el.data('choose'),
-
-            // Tell the modal to show only images.
-            library: {
-                type: 'image'
-            },
-
-            // Customize the submit button.
-            button: {
-                // Set the text of the button.
-                text: $el.data('update')
-            }
-        });
-
-        // When an image is selected, run a callback.
-        imageFrame.on( 'select', function() {
-            // Grab the selected attachment.
-            var attachment = imageFrame.state().get('selection').first(),
-                imageUrl = attachment.get('url');
-
-            // set the hidden input's value
-            $field.attr('value', attachment.id);
-
-            // Show the image in the placeholder
-            $el.html('<img src="' + imageUrl + '" />');
-            $holder.removeClass('empty');
-        });
-
-        imageFrame.open();
-    });
 })(jQuery);

trunk/wp-includes/post-formats.php

@@ -84 +84 @@
         'quote'        => '',
         'quote_source' => '',
-        'image'        => '',
         'url'          => '',
-        'gallery'      => '',
         'media'        => '',
     );
@@ -300 +298 @@
         'class' => get_post_format_content_class( $format ),
         'link_class' => '',
-        'image_class' => '',
     );
 
@@ -344 +341 @@
             break;
 
-        case 'image':
-            if ( ! empty( $meta['image'] ) ) {
-                $image = is_numeric( $meta['image'] ) ? wp_get_attachment_url( $meta['image'] ) : $meta['image'];
-
-                if ( ! empty( $image ) && ! stristr( $content, $image ) ) {
-                    $image_html = sprintf(
-                        '<img %ssrc="%s" alt="" />',
-                        empty( $compat['image_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['image_class'] ) ),
-                        $image
-                    );
-                    if ( empty( $meta['url'] ) ) {
-                        $format_output .= $image_html;
-                    } else {
-                        $format_output .= sprintf(
-                            '<a href="%s">%s</a>',
-                            esc_url( $meta['url'] ),
-                            $image_html
-                        );
-                    }
-                }
-            }
-            break;
-
-        case 'gallery':
-            if ( ! has_shortcode( $post->post_content, $format ) && ! empty( $meta['gallery'] ) )
-                $format_output .= $meta['gallery'];
-            break;
-
         case 'video':
         case 'audio':