Changeset 6952

Timestamp:

02/21/2008 06:00:15 AM (19 years ago)

Author:

ryan

Message:

Image size options from tellyworth. fixes #5933

Location:

trunk

Files:

• wp-admin/css/media.css (modified) (1 diff)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (4 diffs)
• wp-admin/options-writing.php (modified) (1 diff)
• wp-includes/media.php (added)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/css/media.css

@@ -110 +110 @@
 }
 
+.media-upload-form fieldset#image-size label {
+        display: inline;
+        margin: 0 1em 0 0;
+}
+
 .pinkynail {
         max-width: 40px;

trunk/wp-admin/includes/image.php

@@ -225 +225 @@
  */
 function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-        if ( $height <= $hmax && $width <= $wmax ){
-                //Image is smaller than max
-                return array( $width, $height);
-        } elseif ( $width / $height > $wmax / $hmax ) {
-                //Image Width will be greatest
-                return array( $wmax, (int) ($height / $width * $wmax ));
-        } else {
-                //Image Height will be greatest
-                return array( (int) ($width / $height * $hmax ), $hmax );
-        }
+        return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+}
+
+// same as wp_shrink_dimensions, except the max parameters are optional.
+// if either width or height are empty, no constraint is applied on that dimension.
+function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, $max_height=0 ) {
+        if ( !$max_width and !$max_height )
+                return array( $current_width, $current_height );
+        
+        $width_ratio = $height_ratio = 1.0;
+        
+        if ( $max_width > 0 && $current_width > $max_width )
+                $width_ratio = $max_width / $current_width;
+        
+        if ( $max_height > 0 && $current_height > $max_height )
+                $height_ratio = $max_height / $current_height;
+        
+        // the smaller ratio is the one we need to fit it to the constraining box
+        $ratio = min( $width_ratio, $height_ratio );
+        
+        return array( intval($current_width * $ratio), intval($current_height * $ratio) );
 }
 

trunk/wp-admin/includes/media.php

@@ -132 +132 @@
         <label for="image-align-right" id="image-align-right-label"><?php _e('Right'); ?></label>
 </fieldset>
+<fieldset id="image-size">
+        <legend><?php _e('Size'); ?></legend>
+        <input type="radio" name="image-size" id="image-size-thumb" value="thumb" <?php if ($image_size == 'thumb') echo ' checked="checked"'; ?>/>
+        <label for="image-size-thumb" id="image-size-thumb-label"><?php _e('Thumbnail'); ?></label>
+        <input type="radio" name="image-size" id="image-size-medium" value="medium" <?php if ($image_size == 'medium' || !$image_size) echo ' checked="checked"'; ?>/>
+        <label for="image-size-medium" id="image-size-medium-label"><?php _e('Medium'); ?></label>
+        <input type="radio" name="image-size" id="image-size-full" value="full" <?php if ($image_size == 'full') echo ' checked="checked"'; ?>/>
+        <label for="image-size-full" id="image-size-full-label"><?php _e('Full size'); ?></label>
+</fieldset>
 <p>
         <button name="image-add" id="image-add" class="button-ok" value="1"><?php _e('Add Image'); ?></button>
@@ -175 +184 @@
                         wp_iframe( 'image_upload_form', get_option('siteurl') . '/wp-admin/media-upload.php?type=image', $_POST, $id );
                 else {
-                        media_send_to_editor(get_image_send_to_editor($id, $_POST['image-alt'], $_POST['image-title'], $_POST['image-align'], $_POST['image-url']));
+                        media_send_to_editor(get_image_send_to_editor($id, $_POST['image-alt'], $_POST['image-title'], $_POST['image-align'], $_POST['image-url'], true, $_POST['image-size']));
                 }
         }
@@ -218 +227 @@
 add_filter('async_upload_image', 'async_image_callback');
 
-// scale down the default size of an image so it's a better fit for the editor and theme
-function image_constrain_size_for_editor($width, $height) {
-        // pick a reasonable default width for the image
-        // $content_width might be set in the theme's functions.php
-        if ( !empty($GLOBALS['content_width']) )
-                $max_width = $GLOBALS['content_width'];
-        else
-                $max_width = 500;
-
-        $max_width = apply_filters( 'editor_max_image_width', $max_width );
-        $max_height = apply_filters( 'editor_max_image_height', $max_width );
-        
-        return wp_shrink_dimensions( $width, $height, $max_width, $max_height );
-}
-
-function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false) {
-
-        $img_src = wp_get_attachment_url($id);
-        $meta = wp_get_attachment_metadata($id);
-
-        $hwstring = '';
-        if ( isset($meta['width'], $meta['height']) ) {
-                list( $width, $height ) = image_constrain_size_for_editor( $meta['width'], $meta['height'] );
-                $hwstring = ' width="'.intval($width).'" height="'.intval($height).'"';
-        }
-
-        $html = '<img src="'.attribute_escape($img_src).'" alt="'.attribute_escape($alt).'" title="'.attribute_escape($title).'"'.$hwstring.' class="align-'.attribute_escape($align).'" />';
+
+function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') {
+
+        $html = get_image_tag($id, $alt, $title, $align, $rel, $size);
 
         $rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : '';
         if ( $url )
                 $html = "<a href='".attribute_escape($url)."'$rel>$html</a>";
+        elseif ( $size == 'thumb' || $size == 'medium' )
+                $html = '<a href="'.get_attachment_link($id).'"'.$rel.'>'.$html.'</a>';
                 
         $html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url );
@@ -393 +381 @@
         $out = <<<EOF
 
-<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=480" class="thickbox"><img src='images/media-button-image.gif' alt='' /></a>
+<a href="{$image_upload_iframe_src}&TB_iframe=true&height=550&width=480" class="thickbox"><img src='images/media-button-image.gif' alt='' /></a>
 <a href="{$multimedia_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-gallery.gif' alt='' /></a>
 <a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-video.gif' alt='' /></a>

trunk/wp-admin/options-writing.php

@@ -55 +55 @@
 ?>
 </select></td>
+</tr>
+</table>
+
+<h3><?php _e('Image sizes') ?></h3>
+<p><?php _e('The sizes listed below determine the maximum dimensions to use when inserting an image into the body of a post.'); ?></p>
+
+<table class="niceblue">
+<tr valign="top">
+<th scope="row"><?php _e('Thumbnail size:') ?></th>
+<td>
+<label for="thumbnail_size_w"><?php _e('Width:'); ?></label>
+<input name="thumbnail_size_w" type="text" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" size="6" />
+<label for="thumbnail_size_h"><?php _e('Height:'); ?></label>
+<input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" size="6" />
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Medium size:') ?></th>
+<td>
+<label for="medium_size_w"><?php _e('Width:'); ?></label>
+<input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" size="6" />
+<label for="medium_size_h"><?php _e('Height:'); ?></label>
+<input name="medium_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('medium_size_h'); ?>" size="6" />
+</td>
 </tr>
 </table>

trunk/wp-settings.php

@@ -264 +264 @@
 require (ABSPATH . WPINC . '/canonical.php');
 require (ABSPATH . WPINC . '/shortcodes.php');
+require (ABSPATH . WPINC . '/media.php');
 
 if (strpos($_SERVER['PHP_SELF'], 'install.php') === false) {