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

removed commented out stuff on photo_new partial. also, fixed the delete button in photo show.

Browse source
This commit is contained in:
danielvincent 2010-08-09 20:18:20 -07:00
parent acd00c2a59
commit d712218a14
2 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,47 +7,20 @@
onStart: function(event, total) { onStart: function(event, total) {
return confirm("You are about to upload " + total + " photos. Are you sure?"); return confirm("You are about to upload " + total + " photos. Are you sure?");
}, },
setName: function(text) {
//$("#progress_report_name").text(text);
},
setStatus: function(text) {
//$("#progress_report_status").text(text);
},
setProgress: function(val) {
//$("#progress_report_bar").css('width', Math.ceil(val*100)+"%");
},
onFinishOne: function(event, response, name, number, total) {
//alert(response);
},
onFinish: function(event, total){ onFinish: function(event, total){
//$("#progress_report").delay(600).slideUp(200);
//$("#add_photo_pane").delay(600).fadeOut(200);
$("#add_photo_button .button").html( "Add Photos" ); $("#add_photo_button .button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(0); $("#add_photo_loader").fadeOut(0);
}, },
onStart: function(event, total){ onStart: function(event, total){
$("#add_photo_pane").fadeOut(400); $("#add_photo_pane").fadeOut(400);
$("#add_photo_button .button").html( "Uploading Photos" ); $("#add_photo_button .button").html( "Uploading Photos" );
//$("#add_photo_button").prepend( "<img alt='Loader' src='/images/loader.gif'/>" );
$("#add_photo_loader").fadeIn(400); $("#add_photo_loader").fadeIn(400);
return true; return true;
} }
}); });
}); });
:css
#progress_report, #progress_report_name, #progress_report_status{
font-size: 12px;
padding: 0;
line-height: auto;
}
= form_for photo, :html => {:multipart => true} do |f| = form_for photo, :html => {:multipart => true} do |f|
= f.error_messages = f.error_messages
= f.hidden_field :album_id, :value => album.id = f.hidden_field :album_id, :value => album.id
= f.file_field :image, :multiple => 'multiple' = f.file_field :image, :multiple => 'multiple'
#progress_report{ :style => "display:none;" }
= image_tag "loader.gif"
#progress_report_name
#progress_report_status{ :style => "font-style: italic;" }

4
app/views/photos/show.html.haml
View file

@ -27,8 +27,8 @@
= link_to "⇧ #{@album.name}", album_path(@album) = link_to "⇧ #{@album.name}", album_path(@album)
-if current_user.owns? @album -if current_user.owns? @album
.button.right .right
= link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete, :class => 'button'
%h4{:class => "show_post_comments"} %h4{:class => "show_post_comments"}
= "comments (#{@photo.comments.count})" = "comments (#{@photo.comments.count})"