nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stuff works

Browse source
This commit is contained in:
maxwell 2011-03-15 19:08:55 -07:00
parent bca184eaf3
commit 7ba90a5a98
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/uploaders/image_uploader.rb
View file

@ -49,5 +49,7 @@ class ImageUploader < CarrierWave::Uploader::Base
version :scaled_full version :scaled_full
version :thumb_large version :thumb_large
version :thumb_medium version :thumb_medium
version :thumb_small version :thumb_small do
process :resize_to_fill => [50,50]
end
end end

10
app/views/photos/_new_photo.haml
View file

@ -33,7 +33,15 @@
$("div.mention_helper").fadeTo(100, 0, function() { $("div.mention_helper").fadeTo(100, 0, function() {
$("#publisher .options_and_submit, #fileInfo").fadeIn(50); $("#publisher .options_and_submit, #fileInfo").fadeIn(50);
}); });
$("#publisher textarea").addClass("with_attachments");
$("#publisher_spinner").fadeIn(100); $("#publisher_spinner").fadeIn(100);
$('#photodropzone').append(
"<li class='publisher_photo loading' style='position:relative;'>" +
"<img src='/images/ajax-loader2.gif' />" +
"</li>"
);
}, },
onComplete: function(id, fileName, responseJSON) { onComplete: function(id, fileName, responseJSON) {
@ -44,7 +52,7 @@
$("#publisher textarea").addClass("with_attachments"); $("#publisher textarea").addClass("with_attachments");
$('#new_status_message').append("<input type='hidden' value='" + id + "' name='photos[]' />"); $('#new_status_message').append("<input type='hidden' value='" + id + "' name='photos[]' />");
$('#photodropzone').append( $('li.loading').first().replaceWith(
"<li class='publisher_photo' style='position:relative;'>" + "<li class='publisher_photo' style='position:relative;'>" +
"<img src='" + url +"' data-id='" + id + "' />" + "<img src='" + url +"' data-id='" + id + "' />" +
"<div class='x'> X </div>" + "<div class='x'> X </div>" +