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

cleaned up profile page a bit more

Browse source
This commit is contained in:
maxwell 2010-11-05 14:28:39 -07:00
parent 3ed10a22ff
commit 4300b20c34
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/people_controller.rb
View file

@ -22,6 +22,7 @@ class PeopleController < ApplicationController
if @person if @person
@profile = @person.profile @profile = @person.profile
@contact = current_user.contact_for(@person) @contact = current_user.contact_for(@person)
@is_contact = @person != current_user.person && @contact
if @contact if @contact
@aspects_with_person = @contact.aspects @aspects_with_person = @contact.aspects

6
app/views/people/show.html.haml
View file

@ -18,7 +18,7 @@
%li %li
%i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first)) %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first))
- if @person != current_user.person && @contact - if @is_contact
%li %li
%i= t(".friends_since",:how_long_ago => how_long_ago(@person)) %i= t(".friends_since",:how_long_ago => how_long_ago(@person))
%li %li
@ -31,7 +31,7 @@
/should be collapsed, either or, or request friend /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" = link_to t('.remove_friend'), @person, :confirm => t('are_you_sure'), :method => :delete, :class => "button"
@ -66,12 +66,10 @@
%h3= t('.no_posts') %h3= t('.no_posts')
- else - else
.floating .floating
%h3 %h3
= t('.not_friends', :name => @person.real_name) = t('.not_friends', :name => @person.real_name)
- unless @pending_request - unless @pending_request
%h3 %h3
.description .description