4e96d11cd0
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18. Conflicts: app/views/services/_remote_friend.html.haml app/views/users/getting_started/_step_3.html.haml refactored invitations, added them to the last page fixed styling on adding an aspect to the aspect list added a facebook for person edit aspect memberships touched up and simplified sign-up flow fix styling on step 3
29 lines
923 B
Text
29 lines
923 B
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3 or later. See
|
|
-# the COPYRIGHT file.
|
|
|
|
- content_for :head do
|
|
=javascript_include_tag 'contact-list'
|
|
|
|
.aspects
|
|
- if !contact
|
|
%h4
|
|
= link_to truncate(t('people.show.not_connected', :name => person.name), :length => 49, :separator => ' ', :omission => ''),
|
|
{:controller => "people",
|
|
:action => "share_with",
|
|
:id => @person.id},
|
|
:class => 'share_with button',
|
|
:rel => 'facebox'
|
|
- elsif contact.pending
|
|
%h4
|
|
= t('people.person.pending_request')
|
|
|
|
.badges{:class => ("hidden" if !contact)}
|
|
= aspect_badges(aspects_with_person)
|
|
%p
|
|
= link_to t('.edit_membership'),
|
|
{:controller => "people",
|
|
:action => "share_with",
|
|
:id => @person.id},
|
|
:class => 'button',
|
|
:rel => 'facebox'
|