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
26 lines
788 B
Text
26 lines
788 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
|
|
= include_javascripts :aspects
|
|
|
|
%h3
|
|
= t('.people_already_on_diaspora')
|
|
|
|
%br
|
|
%br
|
|
|
|
#people_stream.stream
|
|
- for pending_req in @requests
|
|
- person = pending_req.sender
|
|
|
|
= render :partial => 'people/person', :locals => {:request => pending_req, :person => person, :contact => nil}
|
|
- for fb_id in @friends.keys
|
|
- friend = @friends[fb_id]
|
|
= render :partial => 'people/person', :locals => {:request => friend[:request], :person => friend[:person], :contact => friend[:contact]}
|
|
|
|
%br
|
|
%br
|
|
|
|
.submit_block
|
|
= link_to "#{t('.finish')} →", getting_started_completed_path, :class => 'button'
|