<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22364] trunk/wp-admin: Attachment editor improvements.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22364">22364</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-05 14:04:22 +0000 (Mon, 05 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Attachment editor improvements. Put the non-editable metadata into the submit/publish box.
Props helenyhou
see <a href="http://core.trac.wordpress.org/ticket/21391">#21391</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (22363 => 22364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2012-11-05 02:43:47 UTC (rev 22363)
+++ trunk/wp-admin/css/wp-admin.css 2012-11-05 14:04:22 UTC (rev 22364)
</span><span class="lines">@@ -5826,7 +5826,7 @@
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff .postarea {
</del><ins>+#post-body-content {
</ins><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (22363 => 22364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2012-11-05 02:43:47 UTC (rev 22363)
+++ trunk/wp-admin/edit-form-advanced.php 2012-11-05 14:04:22 UTC (rev 22364)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> wp_enqueue_script( 'image-edit' );
</span><span class="cx"> wp_enqueue_style( 'imgareaselect' );
</span><span class="cx"> add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' );
</span><del>- add_meta_box( 'attachmentdata', __('Attachment Page Content'), 'attachment_data_meta_box', null, 'normal', 'core' );
</del><ins>+ add_meta_box( 'attachmentdata', __('Attachment Page Content'), 'attachment_content_meta_box', null, 'normal', 'core' );
</ins><span class="cx"> add_action( 'edit_form_after_title', 'edit_form_image_editor' );
</span><span class="cx"> } else {
</span><span class="cx"> add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (22363 => 22364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2012-11-05 02:43:47 UTC (rev 22363)
+++ trunk/wp-admin/includes/media.php 2012-11-05 14:04:22 UTC (rev 22364)
</span><span class="lines">@@ -2122,6 +2122,7 @@
</span><span class="cx">
</span><span class="cx"> $filename = esc_html( basename( $post->guid ) );
</span><span class="cx"> $title = esc_attr( $post->post_title );
</span><ins>+ $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
</ins><span class="cx">
</span><span class="cx"> $post_mime_types = get_post_mime_types();
</span><span class="cx"> $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
</span><span class="lines">@@ -2151,24 +2152,59 @@
</span><span class="cx"> <p><?php echo $image_edit_button; ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <div style="display:none" class="image-editor" id="image-editor-<?php echo $attachment_id; ?>"></div>
</span><ins>+ </div>
</ins><span class="cx">
</span><del>- <div class="wp_attachment_details">
- <p>
- <label for="attachment_url"><strong><?php _e( 'File URL' ); ?></strong></label><br />
- <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" value="<?php echo esc_attr($att_url); ?>" /><br />
- </p>
- <p><strong><?php _e( 'File name:' ); ?></strong> <?php echo $filename; ?><br />
- <strong><?php _e( 'File type:' ); ?></strong> <?php echo $post->post_mime_type; ?>
- <?php
- if ( $media_dims )
- echo '<br /><strong>' . __( 'Dimensions:' ) . '</strong> ' . $media_dims;
- ?>
- </p>
- </div>
</del><ins>+ <div class="wp_attachment_details">
+ <p>
+ <label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong></label><br />
+ <textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
+ </p>
+ <p>
+ <label for="attachment_alt"><strong><?php _e( 'Alternative Text' ); ?></strong></label><br />
+ <input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" value="<?php echo esc_attr( $alt_text ); ?>" />
+ </p>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><ins>+ // need a filter on this content
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Displays non-editable attachment metadata in the publish metabox
+ *
+ * @since 3.5.0
+ */
+function attachment_submitbox_metadata() {
+ $post = get_post();
+
+ $filename = esc_html( basename( $post->guid ) );
+
+ $media_dims = '';
+ $meta = wp_get_attachment_metadata( $post->ID );
+ if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
+ $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+ $media_dims = apply_filters( 'media_meta', $media_dims, $post );
+
+ $att_url = wp_get_attachment_url( $post->ID );
+?>
+ <div class="misc-pub-section">
+ <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
+ <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" value="<?php echo esc_attr($att_url); ?>" />
+ </div>
+ <div class="misc-pub-section">
+ <?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
+ </div>
+ <div class="misc-pub-section">
+ <?php _e( 'File type:' ); ?> <strong><?php echo $post->post_mime_type; ?></strong>
+ </div>
+
+<?php if ( $media_dims ) : ?>
+ <div class="misc-pub-section">
+ <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
+ </div>
+<?php
+ endif;
+}
+
</ins><span class="cx"> add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
</span><span class="cx"> add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
</span><span class="cx"> add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
</span><span class="lines">@@ -2181,3 +2217,5 @@
</span><span class="cx">
</span><span class="cx"> add_filter( 'media_upload_gallery', 'media_upload_gallery' );
</span><span class="cx"> add_filter( 'media_upload_library', 'media_upload_library' );
</span><ins>+
+add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
</ins></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (22363 => 22364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2012-11-05 02:43:47 UTC (rev 22363)
+++ trunk/wp-admin/includes/meta-boxes.php 2012-11-05 14:04:22 UTC (rev 22364)
</span><span class="lines">@@ -302,8 +302,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param object $post
</span><span class="cx"> */
</span><del>-function attachment_data_meta_box( $post ) {
- $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
</del><ins>+function attachment_content_meta_box( $post ) {
</ins><span class="cx"> $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
</span><span class="cx"> $editor_args = array(
</span><span class="cx"> 'textarea_name' => 'content',
</span><span class="lines">@@ -317,15 +316,6 @@
</span><span class="cx"> <label class="screen-reader-text" for="content"><strong><?php _e( 'Attachment Page Content' ); ?></strong></label>
</span><span class="cx"> <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
</span><span class="cx"> </p>
</span><del>-
-<p>
- <label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong></label><br />
- <textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
-</p>
-<p>
- <label for="attachment_alt"><strong><?php _e( 'Alternative Text' ); ?></strong></label><br />
- <input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" value="<?php echo esc_attr( $alt_text ); ?>" />
-</p>
</del><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>