Index: wp-admin/includes/image-edit.php =================================================================== --- wp-admin/includes/image-edit.php (revision 26953) +++ wp-admin/includes/image-edit.php (working copy) @@ -6,6 +6,16 @@ * @subpackage Administration */ +$image_editor_groups = array(); + +/** + * @uses do_action( 'add_image_editor_groups' ) to allow plugins / themes to register / unregister image editor groups + * @uses apply_filters( 'image_editor_groups' ) to allow direct filtering of the $image_editor_groups global array + * + * @global array $image_editor_groups + * @param type $post_id + * @param type $msg + */ function wp_image_editor($post_id, $msg = false) { $nonce = wp_create_nonce("image_editor-$post_id"); $meta = wp_get_attachment_metadata($post_id); @@ -13,6 +23,46 @@ $sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']); $note = ''; + if ( $thumb && $sub_sizes ) { + $thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 ); + + add_image_edit_group ( + 'thumbnail-settings', + __( 'Thumbnail Settings' ), + 'imgedit_group_thumbnail_settings', + 'default', + __('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.'), + 'imgedit-applyto', + compact( 'thumb', 'thumb_img', 'sub_sizes' ) + ); + } + + add_image_edit_group( + 'image-scale', + __( 'Scale Image' ), + 'imgedit_group_scale_image', + 'default', + __( '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.' ), + '', + compact( 'meta' ) + ); + + + add_image_edit_group( + 'image-crop', + __( 'Crop Image' ), + 'imgedit_group_crop_image', + 'default', + sprintf( + '

%1$s

%2$s
%3$s

%4s
%5$s

', + __('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.'), + __('Crop Aspect Ratio'), + __('You can specify the crop selection aspect ratio then hold down the Shift key while dragging to lock it. The values can be 1:1 (square), 4:3, 16:9, etc. If there is a selection, specifying aspect ratio will set it immediately.'), + __('Crop Selection'), + __('Once started, the selection can be adjusted by entering new values (in pixels). Note that these values are scaled to approximately match the original image dimensions. The minimum selection size equals the thumbnail size as set in the Media settings.') + ) + ); + if ( isset( $meta['width'], $meta['height'] ) ) $big = max( $meta['width'], $meta['height'] ); else @@ -25,6 +75,18 @@ if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) $can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] ); + if ( $can_restore ) { + add_image_edit_group( + 'image-restore', + __( 'Restore Original Image'), + 'imgedit_group_restore_image', + 'default', + __('Discard any changes and restore the original image.'), + '' + ); + } + + if ( $msg ) { if ( isset($msg->error) ) $note = "

$msg->error

"; @@ -35,160 +97,68 @@ ?>
- - + + + - - +
-
-
, this)" class="imgedit-crop disabled" title="">
">
+
+
, this)" class="imgedit-crop disabled" title="">
get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { ?> -
, this)" title="">
-
, this)" title="">
- -
-
- + // 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' ) ) ) ) { ?> +
, this)" title="">
+
, this)" title="">
+ +
+
+ -
, this)" class="imgedit-flipv" title="">
-
, this)" class="imgedit-fliph" title="">
+
, this)" class="imgedit-flipv" title="">
+
, this)" class="imgedit-fliph" title="">
-
, this)" class="imgedit-undo disabled" title="">
-
, this)" class="imgedit-redo disabled" title="">
-
-
+
, this)" class="imgedit-undo disabled" title="">
+
, this)" class="imgedit-redo disabled" title="">
+
+ - - - - - - - + + + + + + + -
- -
+
+ +
-
- - )" disabled="disabled" class="button-primary imgedit-submit-btn" value="" /> -
- 		-
-
- -
-

- -

- -
- × - ! - , 'scale')" class="button-primary" value="" /> -
-
-
+
- + - -
-

- if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) - echo ' '.__('Previously edited copies of the image will not be deleted.'); +

+ + )" disabled="disabled" class="button-primary imgedit-submit-btn" value="" /> +
- ?>

-
- , 'restore')" class="button-primary" value="" /> -
-
- - +
-
-
- - -
-

- -


-

- -


-

-
+
+ +
- -

- - - - : - - -

- -

- - - - : - - -

-
- - - -
-
- - -

-
- -

-
-

- -

-
- - - - - - -

-
- - - - - -
- - -
get_option("{$size}_size_w"), 'height' => get_option("{$size}_size_h"), 'crop' => $crop ); + + // Accommodate custom defined sizes defined with add_image_size() + global $_wp_additional_image_sizes; + if ( isset( $_wp_additional_image_sizes[$size] ) ){ + $size_w = $_wp_additional_image_sizes[$size]['width']; + $size_h = $_wp_additional_image_sizes[$size]['height']; + $crop = $_wp_additional_image_sizes[$size]['crop']; + } else { + $size_w = get_option("{$size}_size_w"); + $size_h = get_option("{$size}_size_h"); + } + + $_sizes[ $size ] = array( 'width' => $size_w, 'height' => $size_h, 'crop' => $crop ); } $meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) ); @@ -733,3 +719,204 @@ $return->msg = esc_js( __('Image saved') ); return $return; } + +/** + * Adds a new image editor group to the Edit Image view. + * + * Should be called before {@link do_image_edit_groups()}, preferably from a 'add_image_edit_group' action callback. + * + * @global array $image_editor_groups + * + * @param int $id Unique ID for this editor group + * @param string $title Title that appears in the editor group box + * @param string|array $callback Function to be called to render the editor group content. Function signature is `( $post_id, $imgedit_group, $args )` + * @param string $tab Optional. Default "default". The name of the tab this group appears in + * @param string $help_text Optional. Help text that appears in the editor box content + * @param string $class Optional. CSS class to be added to the editor group DIV + * @param array $callback_args Optional. Additional arguments to be passed to the callback function. + */ +function add_image_edit_group( $id, $title, $callback, $tab = "default", $help_text = "", $class = "", $callback_args = null ){ + global $image_editor_groups; + + /** @TODO make sure $id is unique **/ + $image_editor_groups[$tab][$id] = array( + 'id' => $id, + 'title' => $title, + 'callback' => $callback, + 'class' => $class, + 'help' => $help_text, + 'callback_args' => $callback_args + ); +} + +function remove_image_edit_group( $remove_id ){ + global $image_editor_groups; + + foreach ( $image_editor_groups as $tab_group => &$groups ){ + foreach ( $groups as $id => $group ){ + if ( $id == $remove_id ){ + unset ( $groups[$id] ); + return true; + } + } + } + return false; +} + +function imgedit_group_scale_image( $post_id, $imgedit_group, $args ){ + extract( $args ); + ?> + + +

+ +
+ × + ! + , 'scale')" class="button-primary" value="" /> +
+ + + +

+ + + + : + + +

+ +

+ + + + × + + +

+ + + +

+
+

+ + +

+
+ + + + + + +

+ + + +

+ +

+ +
+ , 'restore')" class="button-primary" value="" /> +
+ + 1; + + if ( $has_tabs ){ + echo '
'; + } + + foreach ( $editor_groups as $tab => $tab_groups ){ + if ( $has_tabs ) echo '
'; + + foreach ( $tab_groups as $imgedit_group ){ + ?> +
+
+ + + +
+ +
+ + + +
+ '; + } + + if ( $has_tabs ) { + echo '
'; + ?> + +