diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index c67bc61b9..11e6f73c2 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.haml @@ -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) diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml index f4b2f06f7..c7137b025 100644 --- a/app/views/shared/_aspect_friends.haml +++ b/app/views/shared/_aspect_friends.haml @@ -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 diff --git a/app/views/users/getting_started/1.html.haml b/app/views/users/getting_started/1.html.haml index 4533186e2..4496290b8 100644 --- a/app/views/users/getting_started/1.html.haml +++ b/app/views/users/getting_started/1.html.haml @@ -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 diff --git a/app/views/users/getting_started/2.html.haml b/app/views/users/getting_started/2.html.haml index ce4269d1e..806461e1f 100644 --- a/app/views/users/getting_started/2.html.haml +++ b/app/views/users/getting_started/2.html.haml @@ -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" diff --git a/app/views/users/getting_started/3.html.haml b/app/views/users/getting_started/3.html.haml index f5136aeaf..8a4c6b95a 100644 --- a/app/views/users/getting_started/3.html.haml +++ b/app/views/users/getting_started/3.html.haml @@ -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 diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 7b8af68d7..6bb6b45b4 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -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