648a10e6d3
Conflicts: app/controllers/requests_controller.rb app/controllers/tags_controller.rb app/helpers/aspects_helper.rb app/views/notifications/index.html.haml config/routes.rb public/javascripts/aspect-edit.js public/javascripts/contact-list.js spec/integration/receiving_spec.rb spec/models/user/connecting_spec.rb spec/models/user/posting_spec.rb
60 lines
2.2 KiB
Text
60 lines
2.2 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.
|
|
|
|
|
|
- content_for :head do
|
|
= include_javascripts :people
|
|
|
|
- content_for :page_title do
|
|
= @person.name
|
|
|
|
.span-8.append-1.last
|
|
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact }
|
|
|
|
.span-15.last
|
|
#author_info
|
|
- if user_signed_in? && !(@contact.persisted? || current_user.person == @person)
|
|
.right
|
|
- if @incoming_request
|
|
= link_to t('people.show.incoming_request', :name => truncate(@person.name, :length => 20, :separator => ' ', :omission => '')),
|
|
{:controller => "contacts",
|
|
:action => "new",
|
|
:person_id => @person.id},
|
|
:class => 'share_with button',
|
|
:rel => 'facebox'
|
|
-else
|
|
= link_to t('people.show.start_sharing'),
|
|
{:controller => "contacts",
|
|
:action => "new",
|
|
:person_id => @person.id},
|
|
:class => 'share_with button',
|
|
:rel => 'facebox'
|
|
- if @share_with
|
|
= javascript_tag "$(document).ready(function() {jQuery.facebox({ ajax: '#{new_contact_path(:person_id => @person.id)}' });});"
|
|
|
|
|
|
- else
|
|
- if user_signed_in? && @contact.person && @contact.receiving?
|
|
.right
|
|
= link_to t('.mention'), new_status_message_path(:person_id => @person.id), :class => 'button', :rel => 'facebox'
|
|
- if @contact.mutual?
|
|
= link_to t('.message'), new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name, :contact_id => @contact.id), :class => 'button', :rel => 'facebox'
|
|
|
|
%h3
|
|
= @person.name
|
|
%span.diaspora_handle
|
|
= @person.diaspora_handle
|
|
.description
|
|
- if !@person.profile.tag_string.blank?
|
|
= @person.profile.format_tags(@person.profile.tag_string)
|
|
- if user_signed_in? && @person == current_user.person
|
|
%span.hover_edit
|
|
= link_to t('people.show.edit'), edit_profile_path
|
|
|
|
%hr
|
|
|
|
#people_stream.stream
|
|
- for hash in @hashes
|
|
= render :partial => 'people/person', :locals => hash
|
|
= will_paginate @contacts_of_contact
|