Skip to content
Extraits de code Groupes Projets
Valider a2013901 rédigé par Raphael's avatar Raphael
Parcourir les fichiers

DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken

parent bd7ce525
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Affichage de
avec 27 ajouts et 22 suppressions
......@@ -2,11 +2,12 @@
.back
= link_to "⇧ home", root_path
Albums
.right#add_album_button
= link_to 'New Album', "#", :class => "button"
.right
= link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"}
#add_album_pane.contextual_pane
= render "albums/new_album"
.yo{:style => "display:none;" }
#new_album_pane
= render "albums/new_album"
.sub_header
%ul.button_set
......
......@@ -5,13 +5,14 @@
= @album.name
-if current_user.owns? @album
.right#add_photo_button
.right
#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
= link_to 'Add Photos', '#add_photo_pane', {:class => 'button', :id => 'add_photo_button'}
.yo{:style => 'display:none;'}
#add_photo_pane
= render "photos/new_photo", :photo => @photo, :album => @album
.sub_header
="updated #{how_long_ago(@album)}"
......
......@@ -4,5 +4,4 @@
%p
= f.label :name
= f.text_field :name
.right
= f.submit 'create', :class => 'button'
= f.submit 'create', :class => 'button'
......@@ -8,9 +8,15 @@
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "application", "ui", 'bubble'
= stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
= javascript_include_tag 'jquery142', 'rails', 'google'
= javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
= javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
= javascript_include_tag 'view', 'publisher', 'image_picker', 'group_nav'
= render 'js/websocket_js'
......
......@@ -10,13 +10,10 @@
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;
}
});
......
......@@ -4,18 +4,19 @@
%li{:class => ("selected" if group.id.to_s == params[:id])}
= link_to group.name, group
%li#add_group_button.new_group= link_to "NEW GROUP", "#"
%li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button")
#add_group_pane.contextual_pane
= render "groups/new_group"
.yo{ :style => "display:none;"}
#add_group_pane
= render "groups/new_group"
- if @group
#friend_pictures
- for friend in @group.people
= person_image_link(friend)
#add_request_button.add_new
= link_to "+", "#"
#add_request_pane.contextual_pane
= render "requests/new_request"
.add_new
= link_to "+", "#add_request_pane", :id => 'add_request_button'
.yo{:style => 'display:none'}
#add_request_pane
= render "requests/new_request"
public/javascripts/fancybox/blank.gif

43 octets

public/javascripts/fancybox/fancy_close.png

1,48 ko

public/javascripts/fancybox/fancy_loading.png

9,96 ko

public/javascripts/fancybox/fancy_nav_left.png

1,41 ko

public/javascripts/fancybox/fancy_nav_right.png

1,42 ko

public/javascripts/fancybox/fancy_shadow_e.png

107 octets

public/javascripts/fancybox/fancy_shadow_n.png

106 octets

public/javascripts/fancybox/fancy_shadow_ne.png

347 octets

public/javascripts/fancybox/fancy_shadow_nw.png

324 octets

public/javascripts/fancybox/fancy_shadow_s.png

111 octets

public/javascripts/fancybox/fancy_shadow_se.png

352 octets

public/javascripts/fancybox/fancy_shadow_sw.png

340 octets

public/javascripts/fancybox/fancy_shadow_w.png

103 octets

public/javascripts/fancybox/fancy_title_left.png

503 octets

0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter