From 7ba90a5a98ffe07edc6cccfac72d67b9cfe9f5c4 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 15 Mar 2011 19:08:55 -0700 Subject: [PATCH] stuff works --- app/uploaders/image_uploader.rb | 4 +++- app/views/photos/_new_photo.haml | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index d3783a9d5..293fef5cf 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -49,5 +49,7 @@ class ImageUploader < CarrierWave::Uploader::Base version :scaled_full version :thumb_large version :thumb_medium - version :thumb_small + version :thumb_small do + process :resize_to_fill => [50,50] + end end diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index c13cdf0df..37be87eab 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -33,7 +33,15 @@ $("div.mention_helper").fadeTo(100, 0, function() { $("#publisher .options_and_submit, #fileInfo").fadeIn(50); }); + + $("#publisher textarea").addClass("with_attachments"); $("#publisher_spinner").fadeIn(100); + $('#photodropzone').append( + "
  • " + + "" + + "
  • " + ); + }, onComplete: function(id, fileName, responseJSON) { @@ -44,7 +52,7 @@ $("#publisher textarea").addClass("with_attachments"); $('#new_status_message').append(""); - $('#photodropzone').append( + $('li.loading').first().replaceWith( "
  • " + "" + "
    X
    " +