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
33 lines
1.4 KiB
Text
33 lines
1.4 KiB
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3 or later. See
|
|
-# the COPYRIGHT file.
|
|
|
|
.aspect_list#aspects_list
|
|
%ul
|
|
- for aspect in aspects_with_person
|
|
= render :partial => 'aspects/aspect_list_item',
|
|
:locals => {:aspect => aspect, :person => person,
|
|
:contact => contact}
|
|
|
|
- for aspect in aspects_without_person
|
|
= render :partial => 'aspects/aspect_list_item',
|
|
:locals => {:aspect => aspect, :person => person,
|
|
:contact => contact}
|
|
.add_aspect
|
|
= form_for(Aspect.new, :remote => true) do |aspect|
|
|
.right
|
|
= aspect.submit "add new aspect", :class => 'button'
|
|
= aspect.error_messages
|
|
= aspect.hidden_field :person_id, :value => person.id if person
|
|
= aspect.hidden_field :contact_id, :value => contact.id if contact
|
|
= aspect.hidden_field :share_with, :value => true
|
|
%p
|
|
= aspect.text_field :name, :style => "display:inline;"
|
|
%p.checkbox_select
|
|
= aspect.label :contacts_visible, t('aspects.edit.make_aspect_list_visible')
|
|
= aspect.check_box :contacts_visible, :checked => true, :default => true
|
|
.done
|
|
.right
|
|
= link_to t('aspects.aspect_contacts.done_editing'), "#", :class => "button", :onClick => '$.facebox.close();'
|
|
- if contact
|
|
= link_to t('people.profile_sidebar.remove_contact'), person, :confirm => t('are_you_sure'), :method => :delete
|