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

DG IZ; fixed photos.

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-07 12:03:43 -07:00
parent 6c33c2a463
commit 41afd86fe7
4 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/photos_controller.rb
View file

@ -30,7 +30,7 @@ class PhotosController < ApplicationController
def new def new
@photo = Photo.new @photo = Photo.new
@album = current_user.album_by_id(params[:album_id]) @album = current_user.album_by_id(params[:album_id])
render :partial => "new_photo" render :partial => 'new_photo'
end end
def destroy def destroy

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

@ -1,3 +1,25 @@
:javascript
$(function() {
$("#photo_image").html5_upload({
// WE INSERT ALBUM_ID PARAM HERE
url: "/photos?album_id=#{@album.id}",
sendBoundary: window.FormData || $.browser.mozilla,
onStart: function(event, total) {
return confirm("You are about to upload " + total + " photos. Are you sure?");
},
onFinish: function(event, total){
$("#add_photo_button .button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(400);
},
onStart: function(event, total){
$("#add_photo_pane").fadeOut(400);
$("#add_photo_button .button").html( "Uploading Photos" );
$("#add_photo_loader").fadeIn(400);
return true;
}
});
});
%h1 %h1
%span{:id=>"photo_title_status"} %span{:id=>"photo_title_status"}
Add photos to Add photos to

34
public/javascripts/photos.js
View file

@ -17,35 +17,9 @@ $(document).ready(function(){
});//end document ready });//end document ready
function reset_photo_fancybox(){ function reset_photo_fancybox(){
album_id = $(".album_id")[0].id; album_id = $(".album_id")[0].id;
ajax = $.get("/photos/new?album_id=" + album_id, function(){ ajax = $.get("/photos/new?album_id=" + album_id, function(){
$("#new_photo_pane").html(ajax.responseText) $("#new_photo_pane").html(ajax.responseText)
}); });
} }
$("#photo_image").html5_upload({
// WE INSERT ALBUM_ID PARAM HERE
url: "/photos?album_id="+$(".album_id")[0].id,
sendBoundary: window.FormData || $.browser.mozilla,
setName: function(text) {
$("#progress_report_name").text(text);
},
onFinish: function(event, total){
$("#add_photo_button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(400);
$("#photo_title_status").text("Done!");
$("#progress_report").html("Good job me!");
$("#add_photo_button").addClass("uploading_complete");
},
onStart: function(event, total){
$("#add_photo_button").html( "Uploading Photos" );
$("#add_photo_loader").fadeIn(400);
$("form.new_photo").fadeOut(0);
$("#progress_report").fadeIn(0);
$("#photo_title_status").text("Uploading...");
return true;
}
});

2
public/stylesheets/application.css
View file

@ -412,6 +412,8 @@ h1.big_text {
float: right; } float: right; }
.back { .back {
margin: 0;
padding: 0;
font-size: 12px; font-size: 12px;
font-weight: normal; } font-weight: normal; }