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
83 lines
3 KiB
Text
83 lines
3 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 }
|
|
|
|
- if user_signed_in? && @contact.persisted? && @contacts_of_contact.count > 0
|
|
.span-8.last#contacts_of_contact
|
|
%hr{:style=>"width:300px;"}
|
|
.section.contact_pictures
|
|
%h4
|
|
= t('contacts', :count => @contacts_of_contact_count)
|
|
- for person in @contacts_of_contact
|
|
= person_image_link person
|
|
- if @contacts_of_contact.count > 25
|
|
%p.see_all= link_to t('.see_all'), person_contacts_path(@person)
|
|
|
|
.span-15.last
|
|
#author_info
|
|
- if user_signed_in?
|
|
- if !@contact.receiving? #!(current_user.person == @person) && !(@contact.persisted? && !@contact.sharing?)
|
|
.right
|
|
= link_to t('.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)}' });});"
|
|
|
|
- elsif @contact
|
|
.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'
|
|
|
|
/- if @post_type == :photos
|
|
/ = link_to t('layouts.header.view_profile'), person_path(@person)
|
|
/- else
|
|
/ = link_to t('_photos'), person_photos_path(@person)
|
|
|
|
%h3
|
|
= @person.name
|
|
%span.diaspora_handle
|
|
= @person.diaspora_handle
|
|
.description
|
|
- if !@person.profile.tag_string.blank? && user_signed_in? && (@contact.persisted? || @person == current_user.person || @incoming_request)
|
|
= @person.profile.format_tags(@person.profile.tag_string)
|
|
- if user_signed_in? && @person == current_user.person
|
|
%span.hover_edit
|
|
= link_to t('.edit'), edit_profile_path
|
|
- else
|
|
- if user_signed_in? && @person == current_user.person
|
|
%i
|
|
= t('.you_have_no_tags')
|
|
%span.add_tags
|
|
= link_to t('.add_some'), edit_profile_path
|
|
|
|
%hr
|
|
|
|
- if @posts.length > 0
|
|
-if @post_type == :photos
|
|
= render 'photos/index', :photos => @posts
|
|
- else
|
|
#main_stream.stream
|
|
= render 'shared/stream', :posts => @posts, :commenting_disabled => @commenting_disabled
|
|
#pagination
|
|
=link_to(t('more'), next_page_path, :class => 'paginate')
|
|
|
|
- else
|
|
#stream
|
|
%li{:style=>"text-align:center;"}
|
|
.dull= t('.no_posts')
|
|
|