<!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>[27842] trunk/src: Restyle the image editor so it looks way less hideous.</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/27842">27842</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-29 08:50:57 +0000 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restyle the image editor so it looks way less hideous.
props avryl.
see <a href="http://core.trac.wordpress.org/ticket/27544">#27544</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminjsimageeditjs">trunk/src/wp-admin/js/image-edit.js</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</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 (27841 => 27842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/media.css 2014-03-29 08:01:13 UTC (rev 27841)
+++ trunk/src/wp-admin/css/media.css 2014-03-29 08:50:57 UTC (rev 27842)
</span><span class="lines">@@ -457,28 +457,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .imgedit-settings p {
</span><del>- margin: 8px 0;
</del><ins>+ margin: 8px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.post-php .imgedit-wrap table {
- width: 100%;
</del><ins>+.describe .imgedit-wrap .imgedit-settings {
+ padding: 0 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.describe .imgedit-wrap table td,
-.wp_attachment_holder .imgedit-wrap table td {
- vertical-align: top;
- padding-top: 0;
</del><ins>+.wp_attachment_holder div.updated {
+ margin-top: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.describe .imgedit-wrap table td.imgedit-settings {
- padding: 0 5px;
</del><ins>+.wp_attachment_holder .imgedit-wrap > div {
+ height: auto;
+ overflow: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.wp_attachment_holder .imgedit-wrap table td.imgedit-settings {
</del><ins>+.wp_attachment_holder .imgedit-wrap .imgedit-panel-content {
+ padding-right: 16px;
+ width: auto;
+ overflow: hidden;
+}
+
+.wp_attachment_holder .imgedit-wrap .imgedit-settings {
+ float: right;
</ins><span class="cx"> width: 250px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-td.imgedit-settings input {
</del><ins>+.imgedit-settings input {
</ins><span class="cx"> margin-top: 0;
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="lines">@@ -486,7 +492,7 @@
</span><span class="cx"> .imgedit-wait {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><del>- background: #fff url(../images/spinner.gif) no-repeat scroll 22px 10px;
</del><ins>+ background: #fff url(../images/spinner.gif) no-repeat center;
</ins><span class="cx"> -webkit-background-size: 20px 20px;
</span><span class="cx"> background-size: 20px 20px;
</span><span class="cx"> opacity: 0.7;
</span><span class="lines">@@ -561,6 +567,7 @@
</span><span class="cx"> .imgedit-menu div.disabled {
</span><span class="cx"> border-color: #ccc;
</span><span class="cx"> background-color: #ddd;
</span><ins>+ color: #777;
</ins><span class="cx"> filter: alpha(opacity=50);
</span><span class="cx"> opacity: 0.5;
</span><span class="cx"> cursor: default;
</span><span class="lines">@@ -634,6 +641,14 @@
</span><span class="cx"> margin: 5px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#poststuff .imgedit-group-top h3 {
+ padding: 0;
+}
+
+.imgedit-group-top h3 a {
+ text-decoration: none;
+}
+
</ins><span class="cx"> .imgedit-applyto .imgedit-label {
</span><span class="cx"> padding: 2px 0 0;
</span><span class="cx"> display: block;
</span><span class="lines">@@ -642,7 +657,6 @@
</span><span class="cx"> .imgedit-help {
</span><span class="cx"> display: none;
</span><span class="cx"> font-style: italic;
</span><del>- margin-bottom: 8px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> a.imgedit-help-toggle {
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/image-edit.php (27841 => 27842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/image-edit.php 2014-03-29 08:01:13 UTC (rev 27841)
+++ trunk/src/wp-admin/includes/image-edit.php 2014-03-29 08:50:57 UTC (rev 27842)
</span><span class="lines">@@ -34,70 +34,31 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <div class="imgedit-wrap">
</span><del>- <?php echo $note; ?>
- <table id="imgedit-panel-<?php echo $post_id; ?>"><tbody>
- <tr><td>
- <div class="imgedit-menu">
- <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
</del><ins>+ <div id="imgedit-panel-<?php echo $post_id; ?>">
</ins><span class="cx">
</span><del>- // On some setups GD library does not provide imagerotate() - Ticket #11536
- if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { ?>
- <div class="imgedit-rleft" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
- <div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div>
-<?php } else {
- $note_no_rotate = esc_attr__('Image rotation is not supported by your web host.');
-?>
- <div class="imgedit-rleft disabled" title="<?php echo $note_no_rotate; ?>"></div>
- <div class="imgedit-rright disabled" title="<?php echo $note_no_rotate; ?>"></div>
-<?php } ?>
-
- <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e( 'Flip vertically' ); ?>"></div>
- <div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph" title="<?php esc_attr_e( 'Flip horizontally' ); ?>"></div>
-
- <div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo disabled" title="<?php esc_attr_e( 'Undo' ); ?>"></div>
- <div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo disabled" title="<?php esc_attr_e( 'Redo' ); ?>"></div>
- <br class="clear" />
- </div>
-
- <input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
- <input type="hidden" id="imgedit-minthumb-<?php echo $post_id; ?>" value="<?php echo ( get_option('thumbnail_size_w') . ':' . get_option('thumbnail_size_h') ); ?>" />
- <input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
- <input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
- <input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
- <input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
- <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
-
- <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
- <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&_ajax_nonce=<?php echo $nonce; ?>&postid=<?php echo $post_id; ?>&rand=<?php echo rand(1, 99999); ?>" />
- </div>
-
- <div class="imgedit-submit">
- <input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button" value="<?php esc_attr_e( 'Cancel' ); ?>" />
- <input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
- </div>
- </td>
-
- <td class="imgedit-settings">
</del><ins>+ <div class="imgedit-settings">
</ins><span class="cx"> <div class="imgedit-group">
</span><span class="cx"> <div class="imgedit-group-top">
</span><del>- <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Scale Image'); ?></strong></a>
</del><ins>+ <h3><?php _e( 'Scale Image' ); ?> <a href="#" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;"></a></h3>
</ins><span class="cx"> <div class="imgedit-help">
</span><span class="cx"> <p><?php _e('You can proportionally scale the original image. For best results the scaling should be done before performing any other operations on it like crop, rotate, etc. Note that images can only be scaled down, not up.'); ?></p>
</span><ins>+ </div>
</ins><span class="cx"> <?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
</span><del>- <p><?php printf( __('Original dimensions %s'), $meta['width'] . '×' . $meta['height'] ); ?></p>
</del><ins>+ <p><?php printf( __('Original dimensions %s'), $meta['width'] . ' × ' . $meta['height'] ); ?></p>
</ins><span class="cx"> <?php endif ?>
</span><span class="cx"> <div class="imgedit-submit">
</span><del>- <span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />×<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
</del><ins>+ <span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" /> × <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
</ins><span class="cx"> <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span></span>
</span><del>- <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
</del><ins>+ <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
</ins><span class="cx"> </div>
</span><del>- </div>
</del><span class="cx"> </div>
</span><ins>+ </div>
</ins><span class="cx">
</span><span class="cx"> <?php if ( $can_restore ) { ?>
</span><span class="cx">
</span><ins>+ <div class="imgedit-group">
</ins><span class="cx"> <div class="imgedit-group-top">
</span><del>- <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Restore Original Image'); ?></strong></a>
</del><ins>+ <h3><a onclick="imageEdit.toggleHelp(this);return false;" href="#"><?php _e('Restore Original Image'); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></a></h3>
</ins><span class="cx"> <div class="imgedit-help">
</span><span class="cx"> <p><?php _e('Discard any changes and restore the original image.');
</span><span class="cx">
</span><span class="lines">@@ -106,19 +67,18 @@
</span><span class="cx">
</span><span class="cx"> ?></p>
</span><span class="cx"> <div class="imgedit-submit">
</span><del>- <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
</del><ins>+ <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><ins>+ </div>
</ins><span class="cx">
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>- </div>
-
</del><span class="cx"> <div class="imgedit-group">
</span><span class="cx"> <div class="imgedit-group-top">
</span><del>- <strong><?php _e('Image Crop'); ?></strong>
- <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><?php _e('(help)'); ?></a>
</del><ins>+ <h3><?php _e('Image Crop'); ?> <a href="#" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;"></a></h3>
+
</ins><span class="cx"> <div class="imgedit-help">
</span><span class="cx"> <p><?php _e('The image can be cropped by clicking on it and dragging to select the desired part. While dragging the dimensions of the selection are displayed below.'); ?></p>
</span><span class="cx">
</span><span class="lines">@@ -155,8 +115,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="imgedit-group imgedit-applyto">
</span><span class="cx"> <div class="imgedit-group-top">
</span><del>- <strong><?php _e('Thumbnail Settings'); ?></strong>
- <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><?php _e('(help)'); ?></a>
</del><ins>+ <h3><?php _e('Thumbnail Settings'); ?> <a href="#" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;"></a></h3>
</ins><span class="cx"> <p class="imgedit-help"><?php _e('The thumbnail image can be cropped differently. For example it can be square or contain only a portion of the original image to showcase it better. Here you can select whether to apply changes to all image sizes or make the thumbnail different.'); ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -184,8 +143,51 @@
</span><span class="cx">
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>- </td></tr>
- </tbody></table>
</del><ins>+ </div>
+
+ <div class="imgedit-panel-content">
+ <?php echo $note; ?>
+ <div class="imgedit-menu">
+ <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
+
+ // On some setups GD library does not provide imagerotate() - Ticket #11536
+ if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { ?>
+ <div class="imgedit-rleft" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
+ <div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div>
+ <?php } else {
+ $note_no_rotate = esc_attr__('Image rotation is not supported by your web host.');
+ ?>
+ <div class="imgedit-rleft disabled" title="<?php echo $note_no_rotate; ?>"></div>
+ <div class="imgedit-rright disabled" title="<?php echo $note_no_rotate; ?>"></div>
+ <?php } ?>
+
+ <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e( 'Flip vertically' ); ?>"></div>
+ <div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph" title="<?php esc_attr_e( 'Flip horizontally' ); ?>"></div>
+
+ <div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo disabled" title="<?php esc_attr_e( 'Undo' ); ?>"></div>
+ <div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo disabled" title="<?php esc_attr_e( 'Redo' ); ?>"></div>
+ <br class="clear" />
+ </div>
+
+ <input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
+ <input type="hidden" id="imgedit-minthumb-<?php echo $post_id; ?>" value="<?php echo ( get_option('thumbnail_size_w') . ':' . get_option('thumbnail_size_h') ); ?>" />
+ <input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
+ <input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
+ <input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
+ <input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+ <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+
+ <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
+ <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&_ajax_nonce=<?php echo $nonce; ?>&postid=<?php echo $post_id; ?>&rand=<?php echo rand(1, 99999); ?>" />
+ </div>
+
+ <div class="imgedit-submit">
+ <input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button" value="<?php esc_attr_e( 'Cancel' ); ?>" />
+ <input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+ </div>
+ </div>
+
+ </div>
</ins><span class="cx"> <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
</span><span class="cx"> <script type="text/javascript">jQuery( function() { imageEdit.init(<?php echo $post_id; ?>); });</script>
</span><span class="cx"> <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
</span></span></pre></div>
<a id="trunksrcwpadminjsimageeditjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/image-edit.js (27841 => 27842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/image-edit.js 2014-03-29 08:01:13 UTC (rev 27841)
+++ trunk/src/wp-admin/js/image-edit.js 2014-03-29 08:50:57 UTC (rev 27842)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toggleHelp : function(el) {
</span><del>- $(el).siblings('.imgedit-help').slideToggle('fast');
</del><ins>+ $( el ).parents( '.imgedit-group-top' ).toggleClass( 'imgedit-help-toggled' ).find( '.imgedit-help' ).slideToggle( 'fast' );
</ins><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (27841 => 27842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-03-29 08:01:13 UTC (rev 27841)
+++ trunk/src/wp-includes/css/media-views.css 2014-03-29 08:50:57 UTC (rev 27842)
</span><span class="lines">@@ -1458,22 +1458,90 @@
</span><span class="cx"> * Image Editor
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.media-frame .image-editor {
- padding: 16px;
</del><ins>+.media-frame .imgedit-wrap {
+ position: static;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.media-frame .imgedit-wrap table {
- width: 100%;
</del><ins>+.media-frame .imgedit-wait {
+ height: auto !important;
+ right: 0;
+ bottom: 0;
+ left: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.media-frame .imgedit-wrap table td {
- vertical-align: top;
- padding-top: 0;
</del><ins>+.media-frame .imgedit-wrap .imgedit-panel-content {
+ padding: 16px;
+ position: absolute;
+ top: 0;
+ right: 282px;
+ bottom: 0;
+ left: 0;
+ overflow: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.media-frame .imgedit-wrap table td.imgedit-settings {
</del><ins>+.media-frame .imgedit-wrap .imgedit-settings {
+ background: #f3f3f3;
+ border-left: 1px solid #ddd;
+ padding: 0 16px 16px;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
</ins><span class="cx"> width: 250px;
</span><ins>+ overflow: auto;
</ins><span class="cx"> }
</span><ins>+
+.media-frame .imgedit-group {
+ background: none;
+ border: none;
+ border-bottom: 1px solid #ddd;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ margin: 0;
+ margin-bottom: 16px;
+ padding: 0;
+ padding-bottom: 16px;
+}
+
+.media-frame .imgedit-group:last-of-type {
+ border: none;
+ margin: 0;
+ padding: 0;
+}
+
+.media-frame .imgedit-group-top h3 {
+ text-transform: uppercase;
+ font-size: 12px;
+ color: #666;
+ margin: 0;
+ margin-top: 24px;
+}
+
+.media-frame .imgedit-group-top h3 a {
+ text-decoration: none;
+ color: #666;
+}
+
+.media-frame .imgedit-help-toggle {
+ margin-top: -2px;
+ cursor: pointer;
+ color: #666;
+}
+
+.media-frame .imgedit-help-toggled span.dashicons:before {
+ content: '\f142';
+}
+
+.media-frame .imgedit-group img {
+ margin-top: 5px;
+}
+
+.media-frame .imgedit-wrap div.updated {
+ margin: 0;
+ margin-bottom: 16px;
+}
+
+
</ins><span class="cx"> /**
</span><span class="cx"> * Embed from URL and Image Details
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>