From 9a055b6cbab4eff9d423de01f95d6e66f3e22b14 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Fri, 5 Nov 2010 17:26:40 -0700
Subject: [PATCH] Photo partial now has a description and a link to view all
 photos by that person.

---
 app/views/photos/_photo.haml             |  9 +++++----
 public/stylesheets/sass/application.sass | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index f71bbad97..bc9479a25 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -22,11 +22,12 @@
         .right
           = link_to t('delete'), photo_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
-      =t('.posted_a_photo')
+    = link_to (image_tag post.url(:thumb_large)), object_path(post), :class => 'stream_photo'
+    
+    %p.photo_description
+      = post.caption
 
-    %br
-    %br
-    = link_to (image_tag post.url(:thumb_large)), object_path(post)
+    = link_to "view all of #{post.person.real_name}'s photos", person_photos_path(post.person), :class => "small_text"
 
     .info
       %span.time= link_to(how_long_ago(post), photo_path(post))
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0a40e4e6b..ee965d9de 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -315,6 +315,25 @@ li.message
       :weight normal
       :size 14px
 
+    .stream_photo
+      :float left
+      :margin 
+        :top 6px
+
+    .photo_description
+      :margin 
+        :top 6px
+      :padding
+        :left 220px
+      :min-height 185px
+      :color #888
+      :font
+        :style italic
+
+    .small_text
+      :font
+        :size 10px
+
     div.info
       :color #999
       :font-size smaller