60a60733df
Conflicts: app/controllers/aspects_controller.rb app/controllers/contacts_controller.rb app/controllers/people_controller.rb app/controllers/photos_controller.rb app/controllers/tags_controller.rb app/helpers/notifications_helper.rb app/models/notifications/new_request.rb app/models/user_preference.rb public/javascripts/view.js spec/controllers/aspects_controller_spec.rb spec/controllers/contacts_controller_spec.rb spec/controllers/home_controller_spec.rb spec/controllers/post_visibilities_controller_spec.rb spec/controllers/requests_controller_spec.rb spec/mailers/notifier_spec.rb spec/models/user_spec.rb
43 lines
1.5 KiB
Text
43 lines
1.5 KiB
Text
%li.remote_friend{:id => "uid_" + friend.uid, :uid => friend.uid}
|
|
.right
|
|
-if friend.contact
|
|
/ TODO(*) add following method in Contact
|
|
sharing
|
|
- elsif friend.invitation_id
|
|
= t('invitations.new.already_invited')
|
|
%br
|
|
= link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id)
|
|
- elsif friend.person
|
|
= link_to t('people.show.start_sharing'),
|
|
'#',
|
|
:class => 'button'
|
|
|
|
- elsif current_user.invites > 0
|
|
= form_tag service_inviter_path(:provider => 'facebook') do
|
|
= select_tag(:aspect_id, options_from_collection_for_select(@all_aspects, 'id', 'name'))
|
|
= hidden_field_tag :uid, friend.uid
|
|
= submit_tag t('.invite')
|
|
|
|
- if friend.person
|
|
= person_image_link(friend.person)
|
|
- else
|
|
= image_tag(friend.photo_url, :class => 'avatar')
|
|
|
|
%h4.name
|
|
- if friend.person
|
|
= link_to friend.name, person_path(friend.person)
|
|
- else
|
|
= friend.name
|
|
|
|
- unless friend.person.nil?
|
|
/ should be dropdown
|
|
|
|
%li{:id => "options_" + friend.uid, :class => "share_with hidden", :style => "height:auto"}
|
|
- contact = friend.contact
|
|
- contact ||= Contact.new
|
|
= render :partial => 'contacts/share_with_list',
|
|
:locals => {:person => friend.person,
|
|
:contact => contact,
|
|
:aspects_with_person => [],
|
|
:aspects_without_person => current_user.aspects,
|
|
:friend_finder => true}
|