<!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>[27622] trunk/src: On attachment pages for audio and video, display players.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/27622">27622</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-19 18:59:31 +0000 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>On attachment pages for audio and video, display players. Currently, only a link is displayed. Add minimal CSS rules for compatibility with 2011, 2012, and 2013 themes.
In `prepend_attachment`, add logic to support attachment types that are not `image`.
In `get_post_class()`, don't add the `has-post-thumbnail` class for attachment pages.
Fixes <a href="http://core.trac.wordpress.org/ticket/27243">#27243</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyelevenstylecss">trunk/src/wp-content/themes/twentyeleven/style.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenstylecss">trunk/src/wp-content/themes/twentythirteen/style.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvestylecss">trunk/src/wp-content/themes/twentytwelve/style.css</a></li>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyelevenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyeleven/style.css (27621 => 27622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyeleven/style.css 2014-03-19 18:26:05 UTC (rev 27621)
+++ trunk/src/wp-content/themes/twentyeleven/style.css 2014-03-19 18:59:31 UTC (rev 27622)
</span><span class="lines">@@ -1706,7 +1706,19 @@
</span><span class="cx"> text-transform: uppercase;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* =Media
+-------------------------------------------------------------- */
</ins><span class="cx">
</span><ins>+audio,
+video {
+ display: inline-block;
+ max-width: 100%;
+}
+
+.attachment .entry-content .mejs-container {
+ margin-bottom: 24px;
+}
+
</ins><span class="cx"> /* =Navigation
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentythirteen/style.css (27621 => 27622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentythirteen/style.css 2014-03-19 18:26:05 UTC (rev 27621)
+++ trunk/src/wp-content/themes/twentythirteen/style.css 2014-03-19 18:59:31 UTC (rev 27622)
</span><span class="lines">@@ -1837,7 +1837,19 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.attachment .entry-content .mejs-audio {
+ max-width: 400px;
+ margin: 0 auto;
+}
</ins><span class="cx">
</span><ins>+.attachment .entry-content .wp-video {
+ margin: 0 auto;
+}
+
+.attachment .entry-content .mejs-container {
+ margin-bottom: 24px;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * 5.7 Post/Paging Navigation
</span><span class="cx"> * ----------------------------------------------------------------------------
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/style.css (27621 => 27622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/style.css 2014-03-19 18:26:05 UTC (rev 27621)
+++ trunk/src/wp-content/themes/twentytwelve/style.css 2014-03-19 18:59:31 UTC (rev 27622)
</span><span class="lines">@@ -1007,7 +1007,18 @@
</span><span class="cx"> margin-top: 1.571428571rem;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* =Single audio/video attachment view
+-------------------------------------------------------------- */
</ins><span class="cx">
</span><ins>+.attachment .entry-content .mejs-audio {
+ max-width: 400px;
+}
+
+.attachment .entry-content .mejs-container {
+ margin-bottom: 24px;
+}
+
+
</ins><span class="cx"> /* =Single image attachment view
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post-template.php (27621 => 27622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post-template.php 2014-03-19 18:26:05 UTC (rev 27621)
+++ trunk/src/wp-includes/post-template.php 2014-03-19 18:59:31 UTC (rev 27622)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> if ( post_password_required( $post->ID ) ) {
</span><span class="cx"> $classes[] = 'post-password-required';
</span><span class="cx"> // Post thumbnails
</span><del>- } elseif ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) ) {
</del><ins>+ } elseif ( ! is_attachment( $post ) && current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) ) {
</ins><span class="cx"> $classes[] = 'has-post-thumbnail';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1241,10 +1241,23 @@
</span><span class="cx"> if ( empty($post->post_type) || $post->post_type != 'attachment' )
</span><span class="cx"> return $content;
</span><span class="cx">
</span><del>- $p = '<p class="attachment">';
- // show the medium sized image representation of the attachment if available, and link to the raw file
- $p .= wp_get_attachment_link(0, 'medium', false);
- $p .= '</p>';
</del><ins>+ if ( wp_attachment_is_image() ):
+ $p = '<p class="attachment">';
+ // show the medium sized image representation of the attachment if available, and link to the raw file
+ $p .= wp_get_attachment_link(0, 'medium', false);
+ $p .= '</p>';
+ elseif ( 0 === strpos( $post->post_mime_type, 'video' ) ):
+ $meta = wp_get_attachment_metadata( get_the_ID() );
+ $atts = array( 'src' => wp_get_attachment_url() );
+ if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+ $atts['width'] = (int) $meta['width'];
+ $atts['height'] = (int) $meta['height'];
+ }
+ $p = wp_video_shortcode( $atts );
+ elseif ( 0 === strpos( $post->post_mime_type, 'audio' ) ):
+ $p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) );
+ endif;
+
</ins><span class="cx"> $p = apply_filters('prepend_attachment', $p);
</span><span class="cx">
</span><span class="cx"> return "$p\n$content";
</span></span></pre>
</div>
</div>
</body>
</html>