Index: wp-admin.css =================================================================== --- wp-admin.css (revision 2925) +++ wp-admin.css (working copy) @@ -148,7 +148,7 @@ line-height: 130%; } -textarea, input, select, iframe#imageup { +textarea, input, select { background: #f4f4f4; border: 1px solid #b2b2b2; color: #000; @@ -157,12 +157,13 @@ padding: 3px; } -iframe#imageup { - margin: 0px; +#imageup { + border-style: none; padding: 0px; - border: 1px solid #ccc; - height: 13em; - width: 98%; + margin-bottom: 16px; + height: 180px; + width: 100%; + overflow-y: hidden; } .alignleft { Index: edit-form-advanced.php =================================================================== --- edit-form-advanced.php (revision 2925) +++ edit-form-advanced.php (working copy) @@ -172,13 +172,10 @@ + +
-
-

-
-
-

Index: image-uploading.php =================================================================== --- image-uploading.php (revision 2925) +++ image-uploading.php (working copy) @@ -1,4 +1,5 @@ 4 / 3 ) + return array(128, (int) ($height / $width * 128)); + else + return array((int) ($width / $height * 96), 96); +} + switch($action) { case 'save': @@ -113,16 +124,7 @@ $imagesize = getimagesize($file); $imagedata['width'] = $imagesize['0']; $imagedata['height'] = $imagesize['1']; -if ( $imagedata['height'] < 96 && $imagedata['width'] < 128 ) { - $uheight = $imagedata['height']; - $uwidth = $imagedata['width']; -} elseif ( $imagedata['width'] / $imagedata['height'] > 4 / 3 ) { - $uwidth = 128; - $uheight = $imagedata['height'] / $imagedata['width'] * $uwidth; -} else { - $uheight = 96; - $uwidth = $imagedata['width'] / $imagedata['height'] * $uheight; -} +list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']); $imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'"; $imagedata['file'] = $file; @@ -133,73 +135,26 @@ die; case 'upload': -?> - - - - - - - -
-
-
-
- - - -
- - -
-
- - -get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_status = 'object' AND left(post_type, 5) = 'image' $and_post") - 5; + $start = $wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_status = 'object' AND left(post_type, 5) = 'image' $and_post") - $num; else $start = (int) $start; @@ -209,124 +164,213 @@ if ( '' == $sort ) $sort = "ID"; -$images = $wpdb->get_results("SELECT ID, post_date, post_title, guid FROM $wpdb->posts WHERE post_status = 'object' AND left(post_type, 5) = 'image' $and_post ORDER BY $sort LIMIT $start, 10", ARRAY_A); +$images = $wpdb->get_results("SELECT ID, post_date, post_title, guid FROM $wpdb->posts WHERE post_status = 'object' AND left(post_type, 5) = 'image' $and_post ORDER BY $sort LIMIT $start, $double", ARRAY_A); -//if ( count($images) == 0 ) -// header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=upload"); - -if ( count($images) > 5 ) { - $next = $start + count($images) - 5; +if ( count($images) > $num ) { + $next = $start + count($images) - $num; } else { $next = false; } if ( $start > 0 ) { - $back = $start - 5; + $back = $start - $num; if ( $back < 1 ) $back = '0'; } else { $back = false; } +$uwidth_sum = 0; +$images_html = ''; +if ( count($images) > 0 ) { + $images = array_slice( $images, 0, $num ); + foreach ( $images as $key => $image ) { + $image = array_merge($image, get_post_meta($image['ID'], 'imagedata', true) ); + list($image['uwidth'], $image['uheight']) = get_udims($image['width'], $image['height']); + $uwidth_sum += $image['uwidth']; + $images_html .= "
{$image[
\n"; + } +} + +$images_width = $uwidth_sum + ( count($images) * 5 ) + 15; + +break; + +default: +die('This script was not meant to be called directly.'); +} + ?> - + + + -
- 0 ) { - $imagerow = ''; - $i = 1; - foreach ( $images as $image ) { - if ( $i++ > 5 ) break; - $image = array_merge($image, get_post_meta($image['ID'], 'imagedata', true) ); -?> - - <?php echo $image['post_title']; ?> /> - - -
-
-
- - - - - /> -
-
- - - - - /> -
-
- - - - -
- -
- - - - -
+
-".print_r($images,1).""; -?> + +
  • >>
    • +
  • >|
    • + +
  • >>
    • +
  • >|
    • + + + +Drag and drop photos to post +Click photos for more options +
    +
    + +
    +
    + +
    Duplicated filenames will be numbered (photo.jpg, photo1.jpg, etc.)
    +
    + + + + + + +
    + + +
    +
    + -