2489f8503f
Conflicts: app/controllers/albums_controller.rb app/controllers/aspects_controller.rb app/controllers/photos_controller.rb app/controllers/registrations_controller.rb app/controllers/requests_controller.rb app/helpers/dashboards_helper.rb app/views/albums/show.html.haml app/views/aspects/manage.html.haml app/views/shared/_aspect_nav.haml app/views/shared/_sub_header.haml app/views/status_messages/_status_message.html.haml app/views/status_messages/show.html.haml config/locales/de.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml
27 lines
884 B
Text
27 lines
884 B
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3. See
|
|
-# the COPYRIGHT file.
|
|
|
|
%li.message{:id => person.id}
|
|
|
|
= person_image_link(person)
|
|
|
|
.content
|
|
%span.from
|
|
= link_to person.real_name, person_path(person)
|
|
|
|
.info
|
|
= person.diaspora_handle
|
|
|
|
.right{ :style => "display:inline;top:0;" }
|
|
- if person.id == current_user.person.id
|
|
thats you!
|
|
- elsif current_user.friends.include?(person)
|
|
Already friends
|
|
- elsif current_user.pending_requests.find_by_person_id(person.id)
|
|
= link_to =t('.pending_request'), aspects_manage_path
|
|
- else
|
|
= form_for Request.new do |f|
|
|
= f.select(:aspect_id, @aspects_dropdown_array)
|
|
= f.hidden_field :destination_url, :value => person.diaspora_handle
|
|
= f.submit t('.add_friend')
|