<!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>[29612] trunk/src: Media Grid: Show upload errors above the grid rather than as a popup.</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/29612">29612</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-26 04:17:18 +0000 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: Show upload errors above the grid rather than as a popup.
props pento, stephdau, helen. fixes <a href="http://core.trac.wordpress.org/ticket/29141">#29141</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</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 (29611 => 29612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/media.css 2014-08-26 04:04:12 UTC (rev 29611)
+++ trunk/src/wp-admin/css/media.css 2014-08-26 04:17:18 UTC (rev 29612)
</span><span class="lines">@@ -456,14 +456,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .upload-php .mode-grid .media-sidebar {
</span><del>- z-index: 1900;
- top: 102px;
- bottom: auto;
- background: #fff;
- border-left: none;
- padding: 16px;
- -webkit-box-shadow: -1px 0 1px rgba(0,0,0,.3);
- box-shadow: -1px 0 1px rgba(0,0,0,.3);
</del><ins>+ position: relative;
+ width: auto;
+ margin-bottom: 16px;
+ padding: 0 16px;
+ border: 1px solid #c00;
+ background-color: #feebe8;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .upload-php .mode-grid .hide-sidebar .media-sidebar {
</span><span class="lines">@@ -473,12 +471,20 @@
</span><span class="cx"> .upload-php .mode-grid .media-sidebar .media-uploader-status {
</span><span class="cx"> border-bottom: none;
</span><span class="cx"> padding-bottom: 0;
</span><ins>+ max-width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.upload-php .mode-grid .media-sidebar .upload-error {
+ margin: 20px 0;
+ padding: 0;
+ border: none;
+ background: none;
+}
+
</ins><span class="cx"> .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
</span><span class="cx"> font-size: 0;
</span><del>- top: -20px;
- right: -14px;
</del><ins>+ top: -12px;
+ right: -10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
</span><span class="lines">@@ -1195,3 +1201,9 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+@media only screen and (max-width: 640px), screen and (max-height: 400px) {
+ .upload-php .mode-grid .media-sidebar{
+ max-width: 100%;
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29611 => 29612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-26 04:04:12 UTC (rev 29611)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-26 04:17:18 UTC (rev 29612)
</span><span class="lines">@@ -5749,12 +5749,12 @@
</span><span class="cx"> this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
</span><span class="cx">
</span><span class="cx"> this.createToolbar();
</span><ins>+ if ( this.options.sidebar ) {
+ this.createSidebar();
+ }
</ins><span class="cx"> this.createUploader();
</span><span class="cx"> this.createAttachments();
</span><span class="cx"> this.updateContent();
</span><del>- if ( this.options.sidebar ) {
- this.createSidebar();
- }
</del><span class="cx">
</span><span class="cx"> if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
</span><span class="cx"> this.$el.addClass( 'hide-sidebar' );
</span></span></pre>
</div>
</div>
</body>
</html>