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
14 lines
510 B
Text
14 lines
510 B
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3. See
|
|
-# the COPYRIGHT file.
|
|
|
|
%h1
|
|
= link_to @status_message.person.real_name, @status_message.person
|
|
= @status_message.message
|
|
|
|
%h4= "#{t('.comments')} (#{@status_message.comments.count})"
|
|
= render "comments/comments", :post => @status_message
|
|
|
|
%p
|
|
- if current_user.owns? @status_message
|
|
= link_to t('.destroy'), @status_message, :confirm => t('are_you_sure?'), :method => :delete
|