nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render ASPhoto show page just like status message show for now

Browse source
This commit is contained in:
danielgrippi 2011-06-23 15:47:59 -07:00
parent 8935c57722
commit 15571ecff0
2 changed files with 6 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/views/activity_streams/photos/show.html.haml
View file

@ -2,32 +2,9 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :head do
= include_javascripts :photos
.span-16.append-4.prepend-4.last .span-16.append-4.prepend-4.last
#original_post_info #main_stream.stream.status_message_show
= render 'shared/author_info', :person => @photo.author, :post => @photo = render 'shared/stream_element', :post => @photo, :all_aspects => @photo.aspects
%br
#photo_container %br
#show_photo{:data=>{:guid=>@photo.id}} %br
= image_tag @photo.image_url
%br
%hr
.span-16.prepend-4.append-4.last
%h5
= t('_comments')
#photo_stream.stream.show
// TODO(likes)
/- if (defined?(current_user) && !current_user.liked?(@parent))
/ %span.like_links
/ = link_to t('shared.stream_element.like'), likes_path(:positive => 'true', :post_id => @parent.id), :method => :post, :class => "like_it", :remote => true
/ |
/ = link_to t('shared.stream_element.dislike'), likes_path(:positive => 'false', :post_id => @parent.id), :method => :post, :class => "dislike_it", :remote => true
%div{:data=>{:guid=>@photo.id}}
.likes_container
= render "likes/likes", :post_id => @photo.id, :likes => @photo.likes, :dislikes => @photo.dislikes
= render "comments/comments", :post => @photo, :comments => @photo.comments, :always_expanded => true

34
app/views/status_messages/show.html.haml
View file

@ -1,42 +1,10 @@
-# Copyright (c) 2010, Diaspora Inc. This file is -# Copyright (c) 2010, Diaspora Inc. This file is
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
.span-16.append-4.prepend-4.last .span-16.append-4.prepend-4.last
#main_stream.stream.status_message_show #main_stream.stream.status_message_show
= render 'shared/stream_element', :post => @status_message, :all_aspects => @status_message.aspects = render 'shared/stream_element', :post => @status_message, :all_aspects => @status_message.aspects
%br %br
%br %br
%br %br
/.span-16.append-4.prepend-4.last
/ #original_post_info
/ = render 'shared/author_info', :person => @status_message.author, :post => @status_message
/
/ #show_text
/ %p
/ = markdownify(@status_message.text, :youtube_maps => @status_message[:youtube_titles])
/
/ - for photo in @status_message.photos
/ = link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo_path(photo)
/
/ %p.time
/ = how_long_ago(@status_message)
/ - unless (defined?(@commenting_disabled) && @commenting_disabled)
/ %span.like_action
/ = like_action(@status_message, current_user)
/
/ %hr
//
/ = link_to t('.permalink'), post_path(@status_message) if @status_message.public
/ %br
/ - if current_user.owns? @status_message
/ = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
/
/
//
/ .likes
/ - if @status_message.likes.count > 0
/ = render "likes/likes", :post_id => @status_message.id, :likes => @status_message.likes, :dislikes => @status_message.dislikes, :current_user => current_user
/
/ #status_message_stream.stream.show
/ %div{:data=>{:guid=>@status_message.id}}
/ = render "comments/comments", :post => @status_message, :comments => @status_message.comments, :always_expanded => true