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

a user can add a person to an aspect from getting_started#2

Browse source
This commit is contained in:
danielvincent 2010-10-26 12:53:12 -07:00
parent 0c72257c50
commit ec141a2019
6 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/requests/_new_request.haml
View file

@ -9,7 +9,7 @@
%i= aspect.name
- if @friends_not_in_aspect
= render('shared/add_friend_dropdown', :aspect => @aspect, :friends => @friends_not_in_aspect)
= render('shared/add_friend_dropdown', :aspect => aspect, :friends => @friends_not_in_aspect)

2
app/views/shared/_aspect_friends.haml
View file

@ -16,7 +16,7 @@
= person_image_link(friend)
-unless (@aspect == :all)
= link_to (image_tag('add_friend_button.png', :title => "add to #{@aspect}")), "#add_request_pane", :id => 'add_request_button'
= link_to (image_tag('add_friend_button.png', :title => "add to #{@aspect}")), "#add_request_pane", :class => 'add_request_button'
.fancybox_content
#add_request_pane

2
app/views/users/getting_started/1.html.haml
View file

@ -14,7 +14,7 @@
%br
= link_to "Define your aspects", getting_started_path(2)
%br
= link_to "Find your friends", getting_started_path(3)
= link_to "Connect your services", getting_started_path(3)
%br
.span-15.last

8
app/views/users/getting_started/2.html.haml
View file

@ -27,7 +27,7 @@
%br
= link_to "Define your aspects", getting_started_path(2)
%br
= link_to "Find your friends", getting_started_path(3)
= link_to "Connect your services", getting_started_path(3)
%br
.span-15.last
@ -50,5 +50,11 @@
- for friend in aspect.people
= person_image_link(friend)
= link_to (image_tag('add_friend_button.png', :title => "add to #{@aspect}")), "#add_request_pane", :class => 'add_request_button'
.fancybox_content
#add_request_pane
= render "requests/new_request", :aspect => aspect
= link_to "x", aspect_path(aspect), :confirm => "are you sure?", :method => :delete, :remote => true, :class => "delete right"

2
app/views/users/getting_started/3.html.haml
View file

@ -15,7 +15,7 @@
%br
= link_to "Define your aspects", getting_started_path(2)
%br
= link_to "Find your friends", getting_started_path(3)
= link_to "Connect your services", getting_started_path(3)
.span-15.last
%h3

3
public/javascripts/view.js
View file

@ -27,7 +27,7 @@ $(document).ready(function(){
//buttons//////
$(".add_aspect_button").fancybox({ 'titleShow' : false , 'hideOnOverlayClick' : false });
$("#add_request_button").fancybox({ 'titleShow': false , 'hideOnOverlayClick' : false });
$(".add_request_button").fancybox({ 'titleShow': false , 'hideOnOverlayClick' : false });
$(".invite_user_button").fancybox({ 'titleShow': false , 'hideOnOverlayClick' : false });
$(".add_request_button").fancybox({ 'titleShow': false , 'hideOnOverlayClick' : false });
$(".remove_person_button").fancybox({ 'titleShow': false , 'hideOnOverlayClick' : false });
@ -80,6 +80,7 @@ $(document).ready(function(){
$("img", "#left_pane").tipsy({live:true});
$(".add_aspect_button", "#aspect_nav").tipsy({gravity:'w'});
$(".person img", ".dropzone").tipsy({live:true});
$(".avatar", ".aspects").tipsy({live:true});
});//end document ready