<!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>[27777] trunk/src/wp-includes: MCE view controls:</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/27777">27777</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-03-27 07:01:38 +0000 (Thu, 27 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>MCE view controls:

* Move controls back over to the left, as they were before. Wide images and muscle memory have been causing frustration.
* Improve the experience and unify the UI of media view controls. Audio and video views now require an initial click to select before further interaction.
* CSS clean up and organization.

fixes <a href="http://core.trac.wordpress.org/ticket/27320">#27320</a>, <a href="http://core.trac.wordpress.org/ticket/27542">#27542</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.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="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (27776 => 27777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js   2014-03-27 06:55:51 UTC (rev 27776)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js      2014-03-27 07:01:38 UTC (rev 27777)
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> 
</span><span class="cx">          dom.setStyles( toolbar, {
</span><span class="cx">                  top: rectangle.y,
</span><del>-                       left: rectangle.x + rectangle.w - toolbarSize.w
</del><ins>+                        left: rectangle.x
</ins><span class="cx">           });
</span><span class="cx">  }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (27776 => 27777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css  2014-03-27 06:55:51 UTC (rev 27776)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css     2014-03-27 07:01:38 UTC (rev 27777)
</span><span class="lines">@@ -212,41 +212,37 @@
</span><span class="cx">  border: 1px solid transparent;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wpview-type-audio {
-       padding: 24px 0 0;
</del><ins>+.wpview-wrap.selected {
+       background-color: #f2f8ff; /* fallback to old blue */
+       background-color: rgba(0,0,0,0.1);
+       border-color: #777;
+       border-color: rgba(0,0,0,0.3);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wpview-type-video {
-       padding: 0;
</del><ins>+.wpview-overlay {
+       position: absolute;
+       top: 0;
+       right: 0;
+       bottom: 0;
+       left: 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wont-play {
-       padding: 4px 0;
</del><ins>+.wpview-wrap.selected .wpview-overlay {
+       display: none;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wont-play p {
-       font-size: 13px;
-       line-height: 1.3;
-       display: block;
-       width: 70%;
-       margin: 0 15%;
-       text-align: center;
-}
-
-.wpview-type-gallery:after {
-    content: '';
-       display: table;
-    clear: both;
-}
-
</del><span class="cx"> .wpview-wrap .toolbar {
</span><span class="cx">  position: absolute;
</span><span class="cx">  top: 0;
</span><del>-       right: 0;
</del><ins>+        left: 0;
</ins><span class="cx">   display: none;
</span><span class="cx">  z-index: 100;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.wpview-wrap.selected .toolbar {
+       display: block;
+}
+
</ins><span class="cx"> #wp-image-toolbar {
</span><span class="cx">  position: absolute;
</span><span class="cx"> }
</span><span class="lines">@@ -254,7 +250,7 @@
</span><span class="cx"> .wpview-wrap .toolbar div,
</span><span class="cx"> #wp-image-toolbar div {
</span><span class="cx">  margin-top: 7px;
</span><del>-       margin-right: 7px;
</del><ins>+        margin-left: 7px;
</ins><span class="cx">   padding: 2px;
</span><span class="cx">  width: 30px;
</span><span class="cx">  height: 30px;
</span><span class="lines">@@ -273,32 +269,28 @@
</span><span class="cx">  color: #2ea2cc;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-/* temporary overrides; still pending styling */
-.wpview-type-audio .toolbar div,
-.wont-play .toolbar div {
-       margin: 0;
-       padding: 3px;
-       width: 20px;
-       height: 20px;
-       box-shadow: none;
-       font-size: 20px;
</del><ins>+/* Audio player is short; therefore let's put the toolbar above */
+.wpview-type-audio .toolbar {
+       top: -41px;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wpview-wrap.selected .toolbar,
-.wpview-type-audio .toolbar,
-.wpview-type-video .toolbar {
-       display: block;
</del><ins>+.wpview-type-audio .toolbar div:first-child {
+       margin-left: 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-.wpview-type-gallery.selected,
-.wpview-type-audio,
-.wpview-type-video {
-       background-color: #f2f8ff; /* fallback to old blue */
-       background-color: rgba(0,0,0,0.1);
-       border-color: #777;
-       border-color: rgba(0,0,0,0.3);
</del><ins>+.wont-play {
+       padding: 4px 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.wont-play p {
+       font-size: 13px;
+       line-height: 1.3;
+       display: block;
+       width: 70%;
+       margin: 0 15%;
+       text-align: center;
+}
+
</ins><span class="cx"> .wpview-type-video .track-details,
</span><span class="cx"> .wpview-type-audio .track-details {
</span><span class="cx">  position: absolute;
</span><span class="lines">@@ -310,6 +302,12 @@
</span><span class="cx">  text-overflow: ellipsis;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.wpview-type-gallery:after {
+    content: '';
+       display: table;
+    clear: both;
+}
+
</ins><span class="cx"> .gallery img[data-mce-selected]:focus {
</span><span class="cx">  outline: none;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27776 => 27777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-27 06:55:51 UTC (rev 27776)
+++ trunk/src/wp-includes/media-template.php    2014-03-27 07:01:38 UTC (rev 27777)
</span><span class="lines">@@ -997,6 +997,7 @@
</span><span class="cx">          <div class="track-details">{{{ data.model.caption }}}</div>
</span><span class="cx">          <# } #>
</span><span class="cx">          <?php wp_underscore_audio_template() ?>
</span><ins>+               <div class="wpview-overlay"></div>
</ins><span class="cx">   </script>
</span><span class="cx"> 
</span><span class="cx">  <script type="text/html" id="tmpl-editor-video">
</span><span class="lines">@@ -1008,6 +1009,7 @@
</span><span class="cx">          <div class="track-details">{{{ data.model.caption }}}</div>
</span><span class="cx">          <# } #>
</span><span class="cx">          <?php wp_underscore_video_template() ?>
</span><ins>+               <div class="wpview-overlay"></div>
</ins><span class="cx">   </script>
</span><span class="cx"> 
</span><span class="cx">  <?php wp_underscore_playlist_templates() ?>
</span><span class="lines">@@ -1027,6 +1029,7 @@
</span><span class="cx">                  <div class="wp-playlist-next"></div>
</span><span class="cx">                  <div class="wp-playlist-prev"></div>
</span><span class="cx">          </div>
</span><ins>+               <div class="wpview-overlay"></div>
</ins><span class="cx">   </script>
</span><span class="cx"> 
</span><span class="cx">  <?php
</span></span></pre>
</div>
</div>

</body>
</html>