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

MS DG comments now work on photo show page; full size photos now available

Browse source
This commit is contained in:
maxwell 2010-07-21 14:58:06 -07:00
parent 6410b68ea4
commit 0f407b11ed
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -34,7 +34,7 @@ module ApplicationHelper
end end
def link_to_person(person) def link_to_person(person)
link_to person.real_name, person_url(person) link_to person.real_name, person_path(person)
end end
def owner_image_tag def owner_image_tag

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

@ -1,17 +1,26 @@
%h3= "viewing photos from album #{@album.name}" %h3
viewing photos from album
=link_to @album.name, album_path(@album)
#show_photo %div{:id => @photo.id}
= link_to (image_tag @photo.image.url), photo_path(@album.next_photo(@photo))
#photo_pagination = link_to "full size", @photo.image.url
= link_to "<< previous", photo_path(@album.prev_photo(@photo)) %br
= link_to "next >>", photo_path(@album.next_photo(@photo))
%h4= "comments (#{@photo.comments.count})" #show_photo
= render "comments/comments", :post => @photo = link_to (image_tag @photo.image.url), photo_path(@album.next_photo(@photo))
#photo_pagination
= link_to "<< previous", photo_path(@album.prev_photo(@photo))
= link_to "next >>", photo_path(@album.next_photo(@photo))
%p
= link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete
|
= link_to "<< back to album", album_path(@album)
%h4{:class => "show_post_comments"}
= "comments (#{@photo.comments.count})"
= render "comments/comments", :post => @photo
%p
= link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete
|
= link_to "<< back to album", album_path(@album)

1
app/views/shared/_publisher.haml
View file

@ -6,6 +6,7 @@
%li{ :class => "status_message" }= link_to "status message", "#" %li{ :class => "status_message" }= link_to "status message", "#"
%li{ :class => "bookmark" }= link_to "bookmark", "#" %li{ :class => "bookmark" }= link_to "bookmark", "#"
%li{ :class => "blog" }= link_to "blog", "#" %li{ :class => "blog" }= link_to "blog", "#"
%li= link_to "photos", albums_path
#publisher_form #publisher_form
= form_for StatusMessage.new, :remote => true do |f| = form_for StatusMessage.new, :remote => true do |f|