From acd00c2a59cba3ab316db94a2fa259145b71be5d Mon Sep 17 00:00:00 2001 From: danielvincent Date: Mon, 9 Aug 2010 20:14:03 -0700 Subject: [PATCH] fixed top right buttons on album page, etc. also, made the image loader simpler. --- app/views/albums/show.html.haml | 10 ++++++---- app/views/photos/_new_photo.haml | 15 ++++++++++----- app/views/shared/_group_nav.haml | 4 ++-- public/images/ajax-loader.gif | Bin 0 -> 1737 bytes public/stylesheets/application.css | 17 ++++++++++++++--- public/stylesheets/sass/application.sass | 17 ++++++++++++++--- 6 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 public/images/ajax-loader.gif diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 6bdcafb6b..e916b14d1 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -5,8 +5,10 @@ = @album.name -if current_user.owns? @album - .button.right#add_photo_button - = link_to 'Add Photos', '#' + .right#add_photo_button + #add_photo_loader + = image_tag 'ajax-loader.gif' + = link_to 'Add Photos', '#', :class => 'button' #add_photo_pane.contextual_pane = render "photos/new_photo", :photo => @photo, :album => @album @@ -27,5 +29,5 @@ = link_to "⇧ albums", albums_path -if current_user.owns? @album - .button.right - = link_to 'Edit Album', edit_album_path(@album) + .right + = link_to 'Edit Album', edit_album_path(@album), :class => 'button' diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index 23e4ad68c..ef9396ac7 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -8,10 +8,10 @@ return confirm("You are about to upload " + total + " photos. Are you sure?"); }, setName: function(text) { - $("#progress_report_name").text(text); + //$("#progress_report_name").text(text); }, setStatus: function(text) { - $("#progress_report_status").text(text); + //$("#progress_report_status").text(text); }, setProgress: function(val) { //$("#progress_report_bar").css('width', Math.ceil(val*100)+"%"); @@ -20,11 +20,16 @@ //alert(response); }, onFinish: function(event, total){ - $("#progress_report").delay(600).slideUp(200); - $("#add_photo_box").delay(600).fadeOut(200); + //$("#progress_report").delay(600).slideUp(200); + //$("#add_photo_pane").delay(600).fadeOut(200); + $("#add_photo_button .button").html( "Add Photos" ); + $("#add_photo_loader").fadeOut(0); }, onStart: function(event, total){ - $("#progress_report").slideDown(600); + $("#add_photo_pane").fadeOut(400); + $("#add_photo_button .button").html( "Uploading Photos" ); + //$("#add_photo_button").prepend( "Loader" ); + $("#add_photo_loader").fadeIn(400); return true; } }); diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml index 281aa96c9..bee73edf7 100644 --- a/app/views/shared/_group_nav.haml +++ b/app/views/shared/_group_nav.haml @@ -8,8 +8,8 @@ #add_group_pane.contextual_pane = render "groups/new_group" - - if @group - #friend_pictures + #friend_pictures + - if @group - for friend in @group.people = person_image_link(friend) diff --git a/public/images/ajax-loader.gif b/public/images/ajax-loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..e40f19a2818e4c81726bf965fc8dc108d52dc599 GIT binary patch literal 1737 zcmaLXX;2eq7{Kv0&>Vn}$SzS*LjVQjj4a)RTx3buK+piXQbnW$OoR{;K?KiH-(^=F z(X3ZJ7!}8BR6qf1)S^^W>NTR)t6t+ZUgK4-@tWG&+HXvskMBJ5&Tr;F^O&*-WvW#O z38A+T^!f8=yWM{8-n~PI4sF=5p`oE+$&w}8wr%U_>3Q_%(edNQXU?2Cd-iMq0K+hg z7A@McWy{5j7i(*4ckI~l>eZ{)uU}uidUfBveJfY4T)%$(<;$1v+_|%0!GbAMrtIIp z|J12d>(;H?y?gi5r%(6p-Rp9>HgDd1L+4f8OKqR8&;-_V#vlb=B0=l$V#k zc=6)hyLT-uEqnItdH?=>M@PrWlP5oZ{P^k9rz=;k+`M`7!-o&|@83Uj=FFQnZ|>f` z`|R1X$B!T1zJ2@p_3M`|U3&85$%6+E-oAbN@ZrNdM)KG1+*4QS>>dI@%WLAfDn$vBam{{(zyP@#+z5>6$x8lG2 z@FgO|TRay6R6R{gB8Md~H2>Qnv55dvDQG|c!9(McfI_atC=Pdkl)+&5N65!NxB=3p zX@PHms14Ppfp7Z5ZIC(xa08Jx1+D|UppZ5=T@CnLahuLy1Onl}Fh(60LQtYXvM7lh z6)5?d8}*^#(Y)a)(s+%aAtHA-dwV0Xq_}$km(!Q9;j2*X^ZnR>@e?Erq!~EIe_TT0 zkRPIGbI#~Y5lotkVhig{zPXKbGVRBWWPyUp%+Bk8R2c9bp*=tlAbRA{4j2Jq3*MnB zIR#}2`5mPGFq9@970M)Wj0Zt#a!Qs!rAo>umi$KHQTg!&VP=DsWXaSlN3(Dl#I#Zn zr(a*dg5^^P=RA^@* zVdVr6AFT75T@H|(Dfg0z2|${Hdg<@PrnB|MHiH*aQE-^Oi&klSDbsghIH^#`;Uom3 z^@bQjIX=0#MF)w=1r11`mnZ_eCof1Nu zJ|QSaLy=L*O2+=f2sKE}k71$A03TqE7kEV#-vg&z<%I`~0dD87EIGIuglI~<=E`hf ziqUy3v5|l%Rz|Rs`{PtnacYDdC|*NVG@QW^M37n(b3JO35dq%}?B^c#EzIxB_+Mh! z>b6OvL}?5ph^w-RQ!;~-LujMMFGP=`9KWH$P>N7$)QnjctOxp12@BcAJAqC~dea?K zfi+#>MS`+B@n2aaklVqLdkwWk01%RdR+4s+mW~_7p->V=skrDV{(dw@$WQVRwCKe1e&8WShNVFn^`WvMxgU*)Hx5lOL$#8eTX`T017>2*m=dWx+C zXay~-dz1)}MwEqgyt1F$yNDtlKs-Goqk)`Ibfu4&2r%?Fc7nr6DX!5`K^7C^8%L6* z!$;?snc6y6VZylTff^Q%EcXvMv*PzZcHV00Gx372i51#3wN4!&XCM`66mal#WnKi0 zAxQ`dDG+r`mcCxDRWYV8GXfN7Gn;3}+c6dx<29W$DzzQ1M^mJLoA?XM86E|aV~aWq zcp@MPEEF>u%dAFFP?0dL6h=bwXA~)Ee$Mpj+Q1;kOhd12P!KmzmRWpytgNrLi~hwi z3KfAM1jbMpO28#Xqn3_hRB(nGrttoW9un7~ATrkCfdnB&kUb=>6*i;-|3b1AGnayZ zghL)x*j{MTxR_RBfe6_Ar?!gXalpwQTg8Nk`8|+3w