<!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>[23926] trunk/wp-admin: Post formats: connect labels with fields, move the two css blocks dealing with formats next to each other, see #23938</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/23926">23926</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-04-06 21:40:58 +0000 (Sat, 06 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Post formats: connect labels with fields, move the two css blocks dealing with formats next to each other, see <a href="http://core.trac.wordpress.org/ticket/23938">#23938</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludespostformatsphp">trunk/wp-admin/includes/post-formats.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 (23925 => 23926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-04-06 20:47:12 UTC (rev 23925)
+++ trunk/wp-admin/css/wp-admin.css 2013-04-06 21:40:58 UTC (rev 23926)
</span><span class="lines">@@ -3141,109 +3141,6 @@
</span><span class="cx"> margin-top: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Post formats form */
-#poststuff .post-format-select {
- margin-top: 0;
- padding-bottom: 0;
-}
-
-.post-formats-fields {
- display: none;
-}
-
-.wp-format-gallery .post-formats-fields,
-.wp-format-image .post-formats-fields,
-.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-gallery .field.wp-format-gallery,
-.wp-format-image .field.wp-format-image,
-.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;
-}
-
-.post-formats-fields .field {
- display: none;
- margin-bottom: 10px;
- overflow: hidden;
-}
-
-.post-formats-fields input,
-.post-formats-fields textarea {
- padding: 5px;
- font-size: 1.2em;
-}
-
-.wp-format-video label,
-.wp-format-audio label {
- float: left;
-}
-
-.wp-format-media-holder {
- float: left;
- overflow: hidden;
- width: 40%;
- height: 200px;
- border: 1px dashed #dfdfdf;
- background: #f5f5f5 url(../images/media-button-2x.png) no-repeat 50% 25%;
-}
-
-.wp-format-media-holder.empty {
- height: auto;
- padding: 55px 0 20px;
-}
-
-.wp-format-media-holder:hover {
- background-color: #eee;
-}
-
-.wp-format-media-preview {
- margin-bottom: 20px;
-}
-
-.mejs-audio audio,
-.mejs-video video {
- display: block;
-}
-
-.wp-format-media-select {
- display: block;
- height: 200px;
- text-align: center;
-}
-
-.wp-format-media-select img {
- max-width: 100%;
- max-height: 100%;
-}
-
-.empty .wp-format-media-select {
- height: 20px;
-}
-
-.empty .wp-format-media-metaedit {
- height: 20px;
- display: block;
- text-align: center;
-}
-
-.edit-format-preview {
- display: block;
- margin: 5px 0;
-}
-
-#wp_format_audio, #wp_format_video {
- float: left;
- margin-right: 23px;
- max-width: 50%;
- min-height: 97px;
-}
-
</del><span class="cx"> /* Post Screen */
</span><span class="cx"> #post-body #normal-sortables {
</span><span class="cx"> min-height: 50px;
</span><span class="lines">@@ -4031,9 +3928,112 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*------------------------------------------------------------------------------
</span><del>- 11.4 - Post format selection
</del><ins>+ 11.4 - Post formats
</ins><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><ins>+#poststuff .post-format-select {
+ margin-top: 0;
+ padding-bottom: 0;
+}
+
+.post-formats-fields {
+ display: none;
+}
+
+.wp-format-gallery .post-formats-fields,
+.wp-format-image .post-formats-fields,
+.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-gallery .field.wp-format-gallery,
+.wp-format-image .field.wp-format-image,
+.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;
+}
+
+.post-formats-fields .field {
+ display: none;
+ margin-bottom: 10px;
+ overflow: hidden;
+}
+
+.post-formats-fields input,
+.post-formats-fields textarea {
+ padding: 5px;
+ font-size: 1.2em;
+}
+
+.wp-format-video label,
+.wp-format-audio label {
+ float: left;
+}
+
+.wp-format-media-holder {
+ float: left;
+ overflow: hidden;
+ width: 40%;
+ height: 200px;
+ border: 1px dashed #dfdfdf;
+ background: #f5f5f5 url(../images/media-button-2x.png) no-repeat 50% 25%;
+}
+
+.wp-format-media-holder.empty {
+ height: auto;
+ padding: 55px 0 20px;
+}
+
+.wp-format-media-holder:hover {
+ background-color: #eee;
+}
+
+.wp-format-media-preview {
+ margin-bottom: 20px;
+}
+
+.mejs-audio audio,
+.mejs-video video {
+ display: block;
+}
+
+.wp-format-media-select {
+ display: block;
+ height: 200px;
+ text-align: center;
+}
+
+.wp-format-media-select img {
+ max-width: 100%;
+ max-height: 100%;
+}
+
+.empty .wp-format-media-select {
+ height: 20px;
+}
+
+.empty .wp-format-media-metaedit {
+ height: 20px;
+ display: block;
+ text-align: center;
+}
+
+.edit-format-preview {
+ display: block;
+ margin: 5px 0;
+}
+
+#wp_format_audio,
+#wp_format_video {
+ float: left;
+ margin-right: 23px;
+ max-width: 50%;
+ min-height: 97px;
+}
+
</ins><span class="cx"> #icon-edit.standard {
</span><span class="cx"> background: url(../images/post-formats32.png) no-repeat -3px -4px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post-formats.php (23925 => 23926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post-formats.php 2013-04-06 20:47:12 UTC (rev 23925)
+++ trunk/wp-admin/includes/post-formats.php 2013-04-06 21:40:58 UTC (rev 23926)
</span><span class="lines">@@ -10,12 +10,12 @@
</span><span class="cx">
</span><span class="cx"> <div class="field wp-format-quote">
</span><span class="cx"> <label for="_wp_format_quote"><?php _e( 'Quote' ); ?></label>
</span><del>- <textarea name="_wp_format_quote" class="widefat"><?php echo esc_textarea( $format_meta['quote'] ); ?></textarea>
</del><ins>+ <textarea id="_wp_format_quote" name="_wp_format_quote" class="widefat"><?php echo esc_textarea( $format_meta['quote'] ); ?></textarea>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="field wp-format-quote">
</span><span class="cx"> <label for="_wp_format_quote_source"><?php _e( 'Quote source' ); ?></label>
</span><del>- <input type="text" name="_wp_format_quote_source" value="<?php echo esc_attr( $format_meta['quote_source'] ); ?>" class="widefat" />
</del><ins>+ <input type="text" id="_wp_format_quote_source" name="_wp_format_quote_source" value="<?php echo esc_attr( $format_meta['quote_source'] ); ?>" class="widefat" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx">
</span><span class="cx"> <div class="field wp-format-link wp-format-quote wp-format-image">
</span><span class="cx"> <label for="_wp_format_url"><?php _e( 'Link URL' ); ?></label>
</span><del>- <input type="text" name="_wp_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat" />
</del><ins>+ <input type="text" id="_wp_format_url" name="_wp_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $show_video_preview = ! empty( $format_meta['video'] );
</span><span class="cx"> ?>
</span><del>- <div class="field wp-format-video<?php if ( $show_video_preview ) echo ' has-media-preview' ?>">
</del><ins>+ <div class="field wp-format-video<?php if ( $show_video_preview ) echo ' has-media-preview'; ?>">
</ins><span class="cx"> <?php if ( $show_video_preview ): ?>
</span><span class="cx"> <div id="video-preview" class="wp-format-media-preview">
</span><span class="cx"> <?php
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>- <?php endif ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> <label for="_wp_format_video"><?php _e( 'Video embed code or URL' ); ?></label>
</span><span class="cx"> <textarea id="wp_format_video" type="text" name="_wp_format_video" class="widefat"><?php esc_html_e( $format_meta['video'] ); ?></textarea>
</span><span class="cx"> <div data-format="video" class="wp-format-media-holder hide-if-no-js<?php if ( ! $image ) echo ' empty'; ?>">
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>- <?php endif ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> <label for="_wp_format_audio"><?php _e( 'Audio embed code or URL' ); ?></label>
</span><span class="cx"> <textarea id="wp_format_audio" name="_wp_format_audio" class="widefat"><?php esc_html_e( $format_meta['audio'] );
</span><span class="cx"> ?></textarea>
</span><span class="lines">@@ -113,4 +113,4 @@
</span><span class="cx"> </a>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-</div>
</del><span class="cx">\ No newline at end of file
</span><ins>+</div>
</ins></span></pre>
</div>
</div>
</body>
</html>