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

add photo is now in a fancy-pancy box

Browse source
This commit is contained in:
danielvincent 2010-08-11 20:45:57 -07:00
parent 97b04fc0d7
commit 013a6d0849
6 changed files with 11 additions and 11 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,10 +8,10 @@
.right .right
#add_photo_loader #add_photo_loader
= image_tag 'ajax-loader.gif' = image_tag 'ajax-loader.gif'
#add_photo_button = link_to 'Add Photos', '#new_photo_pane', :class => 'button', :id => "add_photo_button"
= link_to 'Add Photos', '#', :class => 'button'
.yo{:style => "display:none;"}
#add_photo_pane.contextual_pane #new_photo_pane
= render "photos/new_photo", :photo => @photo, :album => @album = render "photos/new_photo", :photo => @photo, :album => @album
.sub_header .sub_header

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

@ -8,15 +8,13 @@
return confirm("You are about to upload " + total + " photos. Are you sure?"); return confirm("You are about to upload " + total + " photos. Are you sure?");
}, },
onFinish: function(event, total){ onFinish: function(event, total){
$("#add_photo_button .button").html( "Add Photos" ); $("#add_photo_button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(400); $("#add_photo_loader").fadeOut(400);
pane_toggler_button("photo")
}, },
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").html( "Uploading Photos" );
$("#add_photo_loader").fadeIn(400); $("#add_photo_loader").fadeIn(400);
$("#add_photo_button").unbind();
return true; return true;
} }
}); });

3
public/javascripts/view.js
View file

@ -86,8 +86,9 @@ $(document).ready(function(){
$("#add_album_button").fancybox(); $("#add_album_button").fancybox();
$("#add_group_button").fancybox(); $("#add_group_button").fancybox();
$("#add_request_button").fancybox(); $("#add_request_button").fancybox();
$("#add_photo_button").fancybox();
pane_toggler_button("photo"); //pane_toggler_button("photo");
$("input[type='submit']").addClass("button"); $("input[type='submit']").addClass("button");

2
public/stylesheets/application.css
View file

@ -408,9 +408,9 @@ h1.big_text {
width: 100%; } width: 100%; }
.sub_header { .sub_header {
position: relative;
text-align: center; text-align: center;
font-style: italic; font-style: italic;
margin-top: -5px;
margin-bottom: 20px; margin-bottom: 20px;
color: #999999; } color: #999999; }

2
public/stylesheets/sass/application.sass
View file

@ -507,12 +507,12 @@ h1.big_text
:width 100% :width 100%
.sub_header .sub_header
:position relative
:text :text
:align center :align center
:font :font
:style italic :style italic
:margin :margin
:top -5px
:bottom 20px :bottom 20px
:color #999 :color #999

1
public/stylesheets/sass/ui.sass
View file

@ -48,6 +48,7 @@
:border :border
:top 1px solid #ccc :top 1px solid #ccc
ul.button_set ul.button_set
:padding :padding