<!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>[23449] trunk: Edit screen UI for post formats: a first run for functionality.</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/23449">23449</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2013-02-18 19:11:24 +0000 (Mon, 18 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Edit screen UI for post formats: a first run for functionality.
* Adds a very basic tabbed interface for selecting a post format (requires JS).
* Extra fields, which are post meta, are shown/hidden based on the selected format.
* Introduce a helper function for retrieving formats-specific metadata: `get_post_format_meta()`.
* Image selection uses the media modal, although without filtering or from URL support at the moment.
props rachelbaker, wonderboymusic, aaroncampbell, helen. see <a href="http://core.trac.wordpress.org/ticket/19570">#19570</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="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminjspostformatsjs">trunk/wp-admin/js/post-formats.js</a></li>
<li><a href="#trunkwpadminjspostformatsminjs">trunk/wp-admin/js/post-formats.min.js</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 (23448 => 23449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-02-18 18:56:51 UTC (rev 23448)
+++ trunk/wp-admin/css/wp-admin.css 2013-02-18 19:11:24 UTC (rev 23449)
</span><span class="lines">@@ -747,7 +747,8 @@
</span><span class="cx"> background-color: #eee;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-:-moz-placeholder {
</del><ins>+:-moz-placeholder,
+.wp-core-ui :-moz-placeholder {
</ins><span class="cx"> color: #a9a9a9;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3080,11 +3081,78 @@
</span><span class="cx"> margin: 2px 0 2px -2px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-status-select, #post-format {
</del><ins>+#post-status-select {
</ins><span class="cx"> line-height: 2.5em;
</span><span class="cx"> margin-top: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Post formats form */
+#poststuff .post-format-select {
+ margin-top: 0;
+ padding-bottom: 0;
+}
+
+.post-formats-fields {
+ margin-bottom: 20px;
+}
+
+.wp-format-standard .post-formats-fields,
+.wp-format-aside .post-formats-fields,
+.wp-format-chat .post-formats-fields,
+.wp-format-status .post-formats-fields {
+ display: none;
+}
+
+.post-formats-fields .field {
+ display: none;
+ margin-bottom: 10px;
+}
+
+.post-formats-fields input,
+.post-formats-fields textarea {
+ 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;
+}
+
</ins><span class="cx"> /* Post Screen */
</span><span class="cx"> #post-body #normal-sortables {
</span><span class="cx"> min-height: 50px;
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (23448 => 23449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2013-02-18 18:56:51 UTC (rev 23448)
+++ trunk/wp-admin/edit-form-advanced.php 2013-02-18 19:11:24 UTC (rev 23449)
</span><span class="lines">@@ -112,9 +112,6 @@
</span><span class="cx"> add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
- add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
-
</del><span class="cx"> // all taxonomies
</span><span class="cx"> foreach ( get_object_taxonomies( $post ) as $tax_name ) {
</span><span class="cx"> $taxonomy = get_taxonomy($tax_name);
</span><span class="lines">@@ -129,6 +126,17 @@
</span><span class="cx"> add_meta_box($tax_name . 'div', $label, 'post_categories_meta_box', null, 'side', 'core', array( 'taxonomy' => $tax_name ));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// post format
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+ wp_enqueue_script( 'post-formats' );
+ $post_format = get_post_format();
+ $format_class = '';
+ if ( ! $post_format )
+ $post_format = 'standard';
+
+ $format_class = " class='wp-format-{$post_format}'";
+}
+
</ins><span class="cx"> if ( post_type_supports($post_type, 'page-attributes') )
</span><span class="cx"> add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
</span><span class="cx">
</span><span class="lines">@@ -321,8 +329,28 @@
</span><span class="cx">
</span><span class="cx"> <div id="poststuff">
</span><span class="cx">
</span><ins>+<?php
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+ $all_post_formats = get_post_format_strings();
+
+ echo '<h2 class="nav-tab-wrapper post-format-select">';
+
+ foreach ( $all_post_formats as $slug => $label ) {
+ if ( $post_format == $slug )
+ $class = 'nav-tab nav-tab-active';
+ else
+ $class = 'nav-tab';
+
+ echo '<a class="' . $class . '" href="?format=' . $slug . '" data-wp-format="' . $slug . '">' . $label . '</a>';
+ }
+
+ echo '</h2>';
+}
+?>
+
</ins><span class="cx"> <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
</span><del>-<div id="post-body-content">
</del><ins>+<div id="post-body-content"<?php echo $format_class; ?>>
+
</ins><span class="cx"> <?php if ( post_type_supports($post_type, 'title') ) { ?>
</span><span class="cx"> <div id="titlediv">
</span><span class="cx"> <div id="titlewrap">
</span><span class="lines">@@ -356,6 +384,65 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'edit_form_after_title' );
</span><span class="cx">
</span><ins>+// post format fields
+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">
+
+<input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
+
+<div class="field wp-format-quote">
+ <label for="_wp_format_quote" class="screen-reader-text"><?php _e( 'Quote' ); ?>:</label>
+ <textarea name="_wp_format_quote" placeholder="<?php esc_attr_e( 'Quote' ); ?>" class="widefat"><?php echo esc_textarea( $format_meta['quote'] ); ?></textarea>
+</div>
+
+<div class="field wp-format-quote">
+ <label for="_wp_format_quote_source" class="screen-reader-text"><?php _e( 'Quote source' ); ?>:</label>
+ <input type="text" name="_wp_format_quote_source" value="<?php echo esc_attr( $format_meta['quote_source'] ); ?>" placeholder="<?php esc_attr_e( 'Quote source' ); ?>" class="widefat" />
+</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">
+ <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>
+
+<div class="field wp-format-audio wp-format-video">
+ <label for="_wp_format_media" class="screen-reader-text"><?php _e( 'Embed code or URL' ); ?>:</label>
+ <textarea name="_wp_format_media" placeholder="<?php esc_attr_e( 'Embed code or URL' ); ?>" class="widefat"><?php echo esc_textarea( $format_meta['media'] ); ?></textarea>
+</div>
+
+</div>
+<?php
+}
+
</ins><span class="cx"> if ( post_type_supports($post_type, 'editor') ) {
</span><span class="cx"> ?>
</span><span class="cx"> <div id="postdivrich" class="postarea">
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (23448 => 23449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2013-02-18 18:56:51 UTC (rev 23448)
+++ trunk/wp-admin/includes/post.php 2013-02-18 19:11:24 UTC (rev 23449)
</span><span class="lines">@@ -193,12 +193,20 @@
</span><span class="cx">
</span><span class="cx"> // Post Formats
</span><span class="cx"> if ( isset( $post_data['post_format'] ) ) {
</span><del>- if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) )
- set_post_format( $post_ID, $post_data['post_format'] );
- elseif ( '0' == $post_data['post_format'] )
- set_post_format( $post_ID, false );
</del><ins>+ set_post_format( $post_ID, $post_data['post_format'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( isset( $post_data[ '_wp_format_url' ] ) ) {
+ update_post_meta( $post_ID, '_wp_format_url', addslashes( esc_url_raw( stripslashes( $post_data['_wp_format_url'] ) ) ) );
+ }
+
+ $format_keys = array( 'quote', 'quote_source', 'image', 'gallery', 'media' );
+
+ foreach ( $format_keys as $key ) {
+ if ( isset( $post_data[ '_wp_format_' . $key ] ) )
+ update_post_meta( $post_ID, '_wp_format_' . $key, wp_filter_post_kses( $post_data[ '_wp_format_' . $key ] ) );
+ }
+
</ins><span class="cx"> // Meta Stuff
</span><span class="cx"> if ( isset($post_data['meta']) && $post_data['meta'] ) {
</span><span class="cx"> foreach ( $post_data['meta'] as $key => $value ) {
</span></span></pre></div>
<a id="trunkwpadminjspostformatsjs"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/js/post-formats.js (0 => 23449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.js (rev 0)
+++ trunk/wp-admin/js/post-formats.js 2013-02-18 19:11:24 UTC (rev 23449)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+window.wp = window.wp || {};
+
+(function($){
+ var imageFrame;
+
+ // Post formats selection
+ $('.post-format-select a').on( 'click', function(e){
+ e.preventDefault();
+ var $this = $(this),
+ format = $this.data('wpFormat');
+ $('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
+ $this.addClass('nav-tab-active').blur();
+ $('#post_format').val(format);
+ $('#post-body-content').attr('class', 'wp-format-' + format );
+ });
+
+ // 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);
</ins></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (23448 => 23449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2013-02-18 18:56:51 UTC (rev 23448)
+++ trunk/wp-includes/post.php 2013-02-18 19:11:24 UTC (rev 23449)
</span><span class="lines">@@ -1951,6 +1951,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Retrieve post format metadata for a post
+ *
+ * @since 3.6.0
+ *
+ * @param int $post_id
+ * @return null
+ */
+function get_post_format_meta( $post_id = 0 ) {
+ $values = array(
+ 'quote' => '',
+ 'quote_source' => '',
+ 'image' => '',
+ 'url' => '',
+ 'gallery' => '',
+ 'media' => '',
+ );
+
+ foreach ( $values as $key => $value )
+ $values[$key] = get_post_meta( $post_id, '_wp_format_' . $key, true );
+
+ return $values;
+}
+
+/**
</ins><span class="cx"> * Check if post is sticky.
</span><span class="cx"> *
</span><span class="cx"> * Sticky posts should remain at the top of The Loop. If the post ID is not
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (23448 => 23449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2013-02-18 18:56:51 UTC (rev 23448)
+++ trunk/wp-includes/script-loader.php 2013-02-18 19:11:24 UTC (rev 23449)
</span><span class="lines">@@ -397,6 +397,8 @@
</span><span class="cx"> 'comma' => _x( ',', 'tag delimiter' ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ $scripts->add( 'post-formats', "/wp-admin/js/post-formats$suffix.js", array( 'media-models' ), false, 1 );
+
</ins><span class="cx"> $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
</span></span></pre>
</div>
</div>
</body>
</html>