<!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>[29436] trunk/src/wp-includes: Revert styling changes to the Attachment Details modal from [29289].</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/29436">29436</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-07 20:31:21 +0000 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert styling changes to the Attachment Details modal from <a href="http://core.trac.wordpress.org/changeset/29289">[29289]</a>. fixes <a href="http://core.trac.wordpress.org/ticket/28844">#28844</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</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="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29435 => 29436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-08-07 20:24:25 UTC (rev 29435)
+++ trunk/src/wp-includes/css/media-views.css 2014-08-07 20:31:21 UTC (rev 29436)
</span><span class="lines">@@ -284,8 +284,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-sidebar h3,
</span><del>-.image-details h3,
-.attachment-info h3 {
</del><ins>+.image-details h3 {
</ins><span class="cx"> position: relative;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> text-transform: uppercase;
</span><span class="lines">@@ -1485,9 +1484,8 @@
</span><span class="cx"> z-index: 10;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment-details .settings-save-status .spinner,
-.attachment-details .settings-save-status .saved {
- margin: 0 5px -20px;
</del><ins>+.attachment-details .settings-save-status .spinner {
+ margin: 0 5px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .attachment-details .settings-save-status .saved {
</span><span class="lines">@@ -1510,29 +1508,6 @@
</span><span class="cx"> padding-bottom: 11px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment-info .details {
- clear: right;
-}
-
-.attachment-info h3:first-child {
- margin-top: 0;
-}
-
-.attachment-info .details .setting .name {
- float: left;
- margin: 8px 1% 0 1% !important;
- padding: 0;
- line-height: 1.1;
-}
-
-.attachment-info .details .url.setting .name {
- padding-top: 3px;
-}
-
-.attachment-info .setting .value {
- font-style: italic;
-}
-
</del><span class="cx"> .attachment-info .filename {
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> color: #464646;
</span><span class="lines">@@ -1595,29 +1570,6 @@
</span><span class="cx"> max-width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment-info .advanced-toggle {
- color: #666;
- text-decoration: none;
- display: block;
-}
-.attachment-info .advanced-toggle:hover {
- color: #d54e21;
-}
-
-.attachment-info .advanced-toggle:after {
- font: normal 20px/1 'dashicons';
- speak: none;
- vertical-align: top;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- content: '\f140';
- display: inline-block;
- margin-top: -2px;
-}
-.attachment-info .advanced-visible .advanced-toggle:after {
- content: '\f142';
-}
-
</del><span class="cx"> .attachment-info .edit-attachment,
</span><span class="cx"> .attachment-info .refresh-attachment,
</span><span class="cx"> .attachment-info .delete-attachment,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29435 => 29436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-07 20:24:25 UTC (rev 29435)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-07 20:31:21 UTC (rev 29436)
</span><span class="lines">@@ -6319,7 +6319,6 @@
</span><span class="cx"> 'click .trash-attachment': 'trashAttachment',
</span><span class="cx"> 'click .edit-attachment': 'editAttachment',
</span><span class="cx"> 'click .refresh-attachment': 'refreshAttachment',
</span><del>- 'click .advanced-toggle': 'onToggleAdvanced',
</del><span class="cx"> 'keydown': 'toggleSelectionHandler'
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -6332,18 +6331,7 @@
</span><span class="cx"> */
</span><span class="cx"> media.view.Attachment.prototype.initialize.apply( this, arguments );
</span><span class="cx"> },
</span><del>-
</del><span class="cx"> /**
</span><del>- * Render view, then check if the advanced details should be shown.
- */
- render: function(){
- media.view.Attachment.prototype.render.apply( this, arguments );
-
- if ( 'show' === getUserSetting( 'advImgDetails' ) ) {
- this.toggleAdvanced( true );
- }
- },
- /**
</del><span class="cx"> * @param {Object} event
</span><span class="cx"> */
</span><span class="cx"> deleteAttachment: function( event ) {
</span><span class="lines">@@ -6399,27 +6387,8 @@
</span><span class="cx"> $('.attachments-browser .details').focus();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- onToggleAdvanced: function( event ) {
- event.preventDefault();
- this.toggleAdvanced();
- },
-
- toggleAdvanced: function( show ) {
- var $advanced = this.$( '.advanced-section' ), mode = 'show';
-
- if ( $advanced.hasClass('advanced-visible') || false === show ) {
- $advanced.removeClass('advanced-visible');
- $advanced.find('.advanced-settings').addClass('hidden');
- mode = 'hide';
- } else {
- $advanced.addClass('advanced-visible');
- $advanced.find('.advanced-settings').removeClass('hidden');
- }
-
- setUserSetting( 'advImgDetails', mode );
- }
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29435 => 29436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-08-07 20:24:25 UTC (rev 29435)
+++ trunk/src/wp-includes/media-template.php 2014-08-07 20:31:21 UTC (rev 29436)
</span><span class="lines">@@ -331,43 +331,30 @@
</span><span class="cx"> <span class="saved"><?php esc_html_e('Saved.'); ?></span>
</span><span class="cx"> </span>
</span><span class="cx"> <div class="details">
</span><del>- <h3><?php _e('Attachment Details'); ?></h3>
- <div class="filename setting">
- <span class="name"><?php _e( 'File name' ); ?></span> <span class="value">{{ data.filename }}</span>
- </div>
- <div class="filename setting">
- <span class="name"><?php _e( 'File type' ); ?></span> <span class="value">{{ data.mime }}</span>
- </div>
- <div class="uploaded setting">
- <span class="name"><?php _e( 'Uploaded on' ); ?></span> <span class="value">{{ data.dateFormatted }}</span>
- </div>
- <div class="file-size setting">
- <span class="name"><?php _e( 'File size' ); ?></span> <span class="value">{{ data.filesizeHumanReadable }}</span>
- </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>
+
+ <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 setting"><span class="name"><?php _e( 'Dimensions' ); ?></span> <span class="value">{{ data.width }} × {{ data.height }}</span></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 setting"><span class="name"><?php _e( 'Length' ); ?></span> <span class="value">{{ data.fileLength }}</span></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 ( 'audio' === data.type && data.meta.bitrate ) { #>
</span><del>- <div class="bitrate setting">
- <span class="name"><?php _e( 'Bitrate' ); ?></span> <span class="value">{{ Math.round( data.meta.bitrate / 1000 ) }}kb/s
</del><ins>+ <div class="bitrate">
+ <strong><?php _e( 'Bitrate:' ); ?></strong> {{ Math.round( data.meta.bitrate / 1000 ) }}kb/s
</ins><span class="cx"> <# if ( data.meta.bitrate_mode ) { #>
</span><span class="cx"> {{ ' ' + data.meta.bitrate_mode.toUpperCase() }}
</span><del>- <# } #></span>
</del><ins>+ <# } #>
</ins><span class="cx"> </div>
</span><span class="cx"> <# } #>
</span><span class="cx">
</span><del>- <label class="url setting" data-setting="url">
- <span class="name"><?php _e( 'URL' ); ?></span>
- <input type="text" value="{{ data.url }}" readonly />
- </label>
-
</del><span class="cx"> <div class="compat-meta">
</span><span class="cx"> <# if ( data.compat && data.compat.meta ) { #>
</span><span class="cx"> {{{ data.compat.meta }}}
</span><span class="lines">@@ -375,55 +362,52 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="settings advanced-section">
- <h3><a class="advanced-toggle" href="#"><?php _e( 'Attachment Meta' ); ?></a></h3>
- <div class="advanced-settings hidden">
- <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
- <label class="setting" data-setting="title">
- <span class="name"><?php _e( 'Title' ); ?></span>
- <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
</del><ins>+ <div class="settings">
+ <label class="setting" data-setting="url">
+ <span class="name"><?php _e('URL'); ?></span>
+ <input type="text" value="{{ data.url }}" readonly />
+ </label>
+ <# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
+ <label class="setting" data-setting="title">
+ <span class="name"><?php _e('Title'); ?></span>
+ <input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
+ </label>
+ <# if ( 'audio' === data.type ) { #>
+ <?php foreach ( array(
+ 'artist' => __( 'Artist' ),
+ 'album' => __( 'Album' ),
+ ) as $key => $label ) : ?>
+ <label class="setting" data-setting="<?php echo esc_attr( $key ) ?>">
+ <span class="name"><?php echo $label ?></span>
+ <input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" />
+ </label>
+ <?php endforeach; ?>
+ <# } #>
+ <label class="setting" data-setting="caption">
+ <span class="name"><?php _e( 'Caption' ); ?></span>
+ <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
+ </label>
+ <# if ( 'image' === data.type ) { #>
+ <label class="setting" data-setting="alt">
+ <span class="name"><?php _e( 'Alt Text' ); ?></span>
+ <input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} />
</ins><span class="cx"> </label>
</span><del>- <# if ( 'audio' === data.type ) { #>
- <?php foreach ( array(
- 'artist' => __( 'Artist' ),
- 'album' => __( 'Album' ),
- ) as $key => $label ) : ?>
- <label class="setting" data-setting="<?php echo esc_attr( $key ) ?>">
- <span class="name"><?php echo $label ?></span>
- <input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" />
- </label>
- <?php endforeach; ?>
- <# } #>
- <label class="setting" data-setting="caption">
- <span class="name"><?php _e( 'Caption' ); ?></span>
- <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
- </label>
- <# if ( 'image' === data.type ) { #>
- <label class="setting" data-setting="alt">
- <span class="name"><?php _e( 'Alt Text' ); ?></span>
- <input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} />
- </label>
- <# } #>
- <label class="setting" data-setting="description">
- <span class="name"><?php _e( 'Description' ); ?></span>
- <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
- </label>
</del><ins>+ <# } #>
+ <label class="setting" data-setting="description">
+ <span class="name"><?php _e('Description'); ?></span>
+ <textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
+ </label>
+ <label class="setting">
+ <span class="name"><?php _e( 'Uploaded By' ); ?></span>
+ <span class="value">{{ data.authorName }}</span>
+ </label>
+ <# if ( data.uploadedTo ) { #>
</ins><span class="cx"> <label class="setting">
</span><del>- <span class="name"><?php _e( 'Uploaded By' ); ?></span>
- <span class="value">{{ data.authorName }}</span>
</del><ins>+ <span class="name"><?php _e( 'Uploaded To' ); ?></span>
+ <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
</ins><span class="cx"> </label>
</span><del>- <# if ( data.uploadedTo ) { #>
- <label class="setting">
- <span class="name"><?php _e( 'Uploaded To' ); ?></span>
- <# if ( data.uploadedToLink ) { #>
- <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
- <# } else { #>
- <span class="value">{{ data.uploadedToTitle }}</span>
- <# } #>
- </label>
- <# } #>
- <div class="attachment-compat"></div>
- </div>
</del><ins>+ <# } #>
+ <div class="attachment-compat"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a> |
</span></span></pre>
</div>
</div>
</body>
</html>