<!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>[29088] trunk/src: Media Grid, in the Edit Attachment modal: </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/29088">29088</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-11 06:14:31 +0000 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid, in the Edit Attachment modal:
* Label the fields under the attachment a la the Edit Media page
* Move the audio and video previews above the info
* Remove the audio / video icon display. Unnecessary.
* Ensure that `width` and `max-width` are set for `.mejs-container`
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssmediacss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/media.css (29087 => 29088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/media.css 2014-07-11 05:43:26 UTC (rev 29087)
+++ trunk/src/wp-admin/css/media.css 2014-07-11 06:14:31 UTC (rev 29088)
</span><span class="lines">@@ -697,6 +697,7 @@
</span><span class="cx">
</span><span class="cx"> .mejs-container {
</span><span class="cx"> width: 100%;
</span><ins>+ max-width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* =Media Queries
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29087 => 29088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-11 05:43:26 UTC (rev 29087)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-11 06:14:31 UTC (rev 29088)
</span><span class="lines">@@ -1577,6 +1577,11 @@
</span><span class="cx"> word-wrap: break-word;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.edit-attachment-frame .attachment-info .filename {
+ font-weight: normal;
+ color: #666;
+}
+
</ins><span class="cx"> .attachment-info .thumbnail {
</span><span class="cx"> position: relative;
</span><span class="cx"> float: left;
</span><span class="lines">@@ -1587,6 +1592,10 @@
</span><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.edit-attachment-frame .attachment-info .thumbnail {
+ margin-bottom: 12px;
+}
+
</ins><span class="cx"> .uploading .attachment-info .thumbnail {
</span><span class="cx"> width: 120px;
</span><span class="cx"> height: 80px;
</span><span class="lines">@@ -2766,7 +2775,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .wp-media-wrapper {
</span><del>- margin-top: 20px;
</del><ins>+ margin-bottom: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .attachment-fields {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29087 => 29088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-11 05:43:26 UTC (rev 29087)
+++ trunk/src/wp-includes/media-template.php 2014-07-11 06:14:31 UTC (rev 29088)
</span><span class="lines">@@ -277,23 +277,39 @@
</span><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><span class="cx"> <# } else if ( 'image' === data.type ) { #>
</span><span class="cx"> <img src="{{ data.sizes.full.url }}" draggable="false" />
</span><del>- <# } else { #>
</del><ins>+ <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
</ins><span class="cx"> <img src="{{ data.icon }}" class="icon" draggable="false" />
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><ins>+ <# if ( 'audio' === data.type ) { #>
+ <div class="wp-media-wrapper">
+ <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
+ <source type="{{ data.mime }}" src="{{ data.url }}"/>
+ </audio>
+ </div>
+ <# } else if ( 'video' === data.type ) { #>
+ <div style="max-width: 100%; width: {{ data.width }}px" class="wp-media-wrapper">
+ <video controls class="wp-video-shortcode" preload="metadata"
+ width="{{ data.width }}" height="{{ data.height }}"
+ <# if ( data.image && data.image.src !== data.icon ) { #>poster="{{ data.image.src }}"<# } #>>
+ <source type="{{ data.mime }}" src="{{ data.url }}"/>
+ </video>
+ </div>
+ <# } #>
</ins><span class="cx"> <div class="details">
</span><del>- <div class="filename">{{ data.filename }}</div>
- <div class="uploaded">{{ data.dateFormatted }}</div>
</del><ins>+ <div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
+ <div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
+ <div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
</ins><span class="cx">
</span><del>- <div class="file-size">{{ data.filesizeHumanReadable }}</div>
</del><ins>+ <div class="file-size"><strong><?php _e( 'File size:' ); ?></strong> {{ data.filesizeHumanReadable }}</div>
</ins><span class="cx"> <# if ( 'image' === data.type && ! data.uploading ) { #>
</span><span class="cx"> <# if ( data.width && data.height ) { #>
</span><del>- <div class="dimensions">{{ data.width }} × {{ data.height }}</div>
</del><ins>+ <div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong> {{ data.width }} × {{ data.height }}</div>
</ins><span class="cx"> <# } #>
</span><span class="cx"> <# } #>
</span><span class="cx">
</span><span class="cx"> <# if ( data.fileLength ) { #>
</span><del>- <div class="file-length"><?php _e( 'Length:' ); ?> {{ data.fileLength }}</div>
</del><ins>+ <div class="file-length"><strong><?php _e( 'Length:' ); ?></strong> {{ data.fileLength }}</div>
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><span class="cx"> <# if ( ! data.uploading && data.can.remove ) { #>
</span><span class="lines">@@ -310,21 +326,6 @@
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>- <# if ( 'audio' === data.type ) { #>
- <div class="wp-media-wrapper">
- <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
- <source type="{{ data.mime }}" src="{{ data.url }}"/>
- </audio>
- </div>
- <# } else if ( 'video' === data.type ) { #>
- <div style="max-width: 100%; width: {{ data.width }}px" class="wp-media-wrapper">
- <video controls class="wp-video-shortcode" preload="metadata"
- width="{{ data.width }}" height="{{ data.height }}"
- <# if ( data.image && data.image.src !== data.icon ) { #>poster="{{ data.image.src }}"<# } #>>
- <source type="{{ data.mime }}" src="{{ data.url }}"/>
- </video>
- </div>
- <# } #>
</del><span class="cx"> </div>
</span><span class="cx"> <div class="attachment-fields">
</span><span class="cx"> <label class="setting" data-setting="url">
</span></span></pre>
</div>
</div>
</body>
</html>