diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index a8442421c..c8edc77f4 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -22,6 +22,7 @@ class PeopleController < ApplicationController if @person @profile = @person.profile @contact = current_user.contact_for(@person) + @is_contact = @person != current_user.person && @contact if @contact @aspects_with_person = @contact.aspects diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 48a4775f7..7cd10f6b6 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -18,7 +18,7 @@ %li %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first)) - - if @person != current_user.person && @contact + - if @is_contact %li %i= t(".friends_since",:how_long_ago => how_long_ago(@person)) %li @@ -31,7 +31,7 @@ /should be collapsed, either or, or request friend - - if @person != current_user.person && @contact + - if @is_contact = link_to t('.remove_friend'), @person, :confirm => t('are_you_sure'), :method => :delete, :class => "button" @@ -66,12 +66,10 @@ %h3= t('.no_posts') - else - .floating %h3 = t('.not_friends', :name => @person.real_name) - - unless @pending_request %h3 .description