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

RS, DG; Removed fancybox gone mad from photo adder

Browse source
This commit is contained in:
Raphael 2010-08-10 18:08:27 -07:00
parent a201390123
commit cc070ba168
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/albums/show.html.haml
View file

@ -8,11 +8,11 @@
.right
#add_photo_loader
= image_tag 'ajax-loader.gif'
= link_to 'Add Photos', '#add_photo_pane', {:class => 'button', :id => 'add_photo_button'}
#add_photo_button
= link_to 'Add Photos', '#', :class => 'button'
.yo{:style => 'display:none;'}
#add_photo_pane
= render "photos/new_photo", :photo => @photo, :album => @album
#add_photo_pane.contextual_pane
= render "photos/new_photo", :photo => @photo, :album => @album
.sub_header
="updated #{how_long_ago(@album)}"

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

@ -10,10 +10,13 @@
onFinish: function(event, total){
$("#add_photo_button .button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(400);
pane_toggler_button("photo")
},
onStart: function(event, total){
$("#add_photo_pane").fadeOut(400);
$("#add_photo_button .button").html( "Uploading Photos" );
$("#add_photo_loader").fadeIn(400);
$("#add_photo_button").unbind();
return true;
}
});

11
public/javascripts/view.js
View file

@ -82,10 +82,12 @@ $(document).ready(function(){
//buttons//////
pane_toggler_button("album");
pane_toggler_button("group");
$("#add_album_button").fancybox();
$("#add_group_button").fancybox();
$("#add_request_button").fancybox();
pane_toggler_button("photo");
pane_toggler_button("request");
$("input[type='submit']").addClass("button");
@ -106,8 +108,6 @@ $(document).ready(function(){
function pane_toggler_button( name ) {
$("#add_" + name + "_button").fancybox();
/*
$("#add_" + name + "_button").toggle(
function(evt){
evt.preventDefault();
@ -117,5 +117,4 @@ function pane_toggler_button( name ) {
$("#add_" + name +"_pane").fadeOut(200);
}
);
*/
}