diff --git a/app/views/services/_remote_friend.html.haml b/app/views/services/_remote_friend.html.haml index 330e51814..cc9a87de8 100644 --- a/app/views/services/_remote_friend.html.haml +++ b/app/views/services/_remote_friend.html.haml @@ -1,12 +1,4 @@ %li.remote_friend{:id => "uid_" + friend.uid, :uid => friend.uid} - .right.action_item - - if friend.already_invited? - = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id) - - elsif friend.on_diaspora? - = render 'aspect_memberships/aspect_dropdown', :contact => contact_proxy(friend), :person => friend.person, :hang => 'left' - - else - = facebook_invite_form(friend) - - if friend.on_diaspora? = person_image_link(friend.person, :size => :thumb_small) - else @@ -18,4 +10,13 @@ - else = friend.name + %br + + - if friend.already_invited? + = link_to t('.resend'), service_inviter_path(:uid => friend.uid, :provider => 'facebook', :invitation_id => friend.invitation_id) + - elsif friend.on_diaspora? + = render 'aspect_memberships/aspect_dropdown', :contact => contact_proxy(friend), :person => friend.person, :hang => 'left' + - else + = facebook_invite_form(friend) + diff --git a/app/views/shared/_contact_list.html.haml b/app/views/shared/_contact_list.html.haml index 7ee1fc128..953a1b9f1 100644 --- a/app/views/shared/_contact_list.html.haml +++ b/app/views/shared/_contact_list.html.haml @@ -4,7 +4,7 @@ .contact_list_controls - = search_field_tag :contact_search, "", :class => 'contact_list_search', :results => 5, :placeholder => t('.all_contacts') + = search_field_tag :contact_search, "", :id => "contact_list_search", :class => 'contact_list_search', :results => 5, :placeholder => t('.all_contacts') = t('contacts', :count =>@aspect_contacts_count) .contact_list diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index d8b6b1700..b5a99d117 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1721,6 +1721,7 @@ ul#request_result :margin :bottom 5px :vertical-align middle + :position relative #contact_list_search :width 200px @@ -1776,6 +1777,9 @@ ul#request_result :background :color #fff + :overflow-x hidden + :overflow-y hidden + :position relative :display inline-block