From 6c12a4c562ae05d01fb6e66f70b3d51a2c98c3a7 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sun, 19 Dec 2010 21:53:57 -0800
Subject: [PATCH] photo show page shows more photo.

---
 app/views/photos/show.html.haml          | 32 +++++++++++-----------
 app/views/shared/_author_info.html.haml  |  2 +-
 app/views/status_messages/show.html.haml |  6 ++---
 public/stylesheets/sass/application.sass | 34 +++++++++++++-----------
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 08c40df08..08ef3f0ed 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -7,21 +7,23 @@
 
 = render 'shared/author_info', :person => @photo.person, :post => @photo
 
-.span-14.append-1.last
-  #show_photo{:data=>{:guid=>@photo.id}}
-    -if @ownership
-      = image_tag 'ajax-loader.gif', :id => "photo_spinner", :class => "hidden"
-      = image_tag @photo.url(:scaled_full)
-      .photo_options{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_large)}"}}
-        = link_to t('.make_profile_photo'), {:controller => "photos", :action => "make_profile_photo", :photo_id => @photo.id}, :remote => true, :class => 'make_profile_photo'
-        |
-        = link_to t('.edit'), '#', :id => "edit_photo_toggle"
+.span-15.append-1.last
+  #photo_container
+    #show_photo{:data=>{:guid=>@photo.id}}
+      -if @ownership
+        = image_tag 'ajax-loader.gif', :id => "photo_spinner", :class => "hidden"
+        = image_tag @photo.url(:scaled_full)
+      -else
+        = image_tag @photo.url(:scaled_full)
 
-    -else
-      = image_tag @photo.url(:scaled_full)
+      #caption
+        = @photo.caption
+
+  .photo_options{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_large)}"}}
+    = link_to t('.make_profile_photo'), {:controller => "photos", :action => "make_profile_photo", :photo_id => @photo.id}, :remote => true, :class => 'make_profile_photo'
+    |
+    = link_to t('.edit'), '#', :id => "edit_photo_toggle"
 
-    #caption
-      = @photo.caption
 
   %br
 
@@ -35,7 +37,7 @@
       %p
         = button_to t('.delete_photo'), @photo, :confirm => t('are_you_sure'), :method => :delete
 
-.span-9.last
+.span-8.last
   - if @photo.status_message_id
     #original_post_info
       %h4{:style=>"position:relative;"}
@@ -51,6 +53,6 @@
 
   %h4= t('_comments')
 
-  %div{:id => 'photo_stream', :class => 'stream show'}
+  %ul{:id => 'photo_stream', :class => 'stream show'}
     %li.message{:data=>{:guid=>@parent.id}}
       = render "comments/comments", :post_id => @parent.id, :comment_hashes => @comment_hashes
diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml
index ee5a7c8dd..d0f85a0f7 100644
--- a/app/views/shared/_author_info.html.haml
+++ b/app/views/shared/_author_info.html.haml
@@ -1,7 +1,7 @@
 #author_info
   = person_image_link(person)
   .from
-    %h2
+    %h3
       = person.name
 
       - if post.public?
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 6a9c68bdc..84d456569 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -5,7 +5,7 @@
 
 = render 'shared/author_info', :person => @status_message.person, :post => @status_message
 
-.span-14.append-1.last
+.span-15.append-1.last
   #show_text
     %p
       = markdownify(@status_message.message, :youtube_maps => @status_message[:youtube_titles])
@@ -23,8 +23,8 @@
   - if current_user.owns? @status_message
     = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
 
-.span-9.last
+.span-8.last
   %h4{:style=>"margin-bottom:5px;"}= t('_comments')
-  %div{:class => 'stream show', :id => 'status_message_stream'}
+  %ul{:class => 'stream show', :id => 'status_message_stream'}
     %li.message{:data=>{:guid=>@status_message.id}}
       = render "comments/comments", :post_id => @status_message.id, :comment_hashes => @comment_hashes
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 4d3338247..d28c71c1d 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -270,21 +270,21 @@ header
 
   img
     :position relative
-    :top 6px
+    :top 3px
     :display inline-block
-    :height 50px
-    :width 50px
+    :height 40px
+    :width 40px
 
   .from
     :display inline-block
-    :padding 12px
+    :padding 10px
       :top 0
 
   &.profile
     .from
       :padding 0
 
-  h2
+  h2,h3
     :margin
       :bottom -2px
 
@@ -293,6 +293,13 @@ header
       :margin
         :right 2em
 
+  .aspect_badge
+    :position relative
+    :top -2px
+    :font
+      :size small
+    :padding 2px 4px
+
 
 li.message
   :position relative
@@ -509,7 +516,7 @@ li.message
 
   ul.comments
     textarea
-      :width 324px
+      :width 284px
 
 .stream ul.comments
   .avatar
@@ -665,6 +672,10 @@ li.message:hover
     &:first-child
       :margin-right 1em
 
+#photo_container
+  :text
+    :align center
+
 #show_photo
   :position relative
   :display inline-block
@@ -673,6 +684,8 @@ li.message:hover
 
   :padding 10px
     :bottom 30px
+  :margin
+    :bottom 2em
 
   :-webkit-box-shadow 0 2px 4px #333
   :-moz-box-shadow 0 2px 4px #333
@@ -1397,11 +1410,6 @@ input[type="search"]
 
 
 .photo_options
-  :display inline
-  :position absolute
-  :bottom 5px
-  :right 13px
-
   :color #999
 
 ul.aspects
@@ -1983,10 +1991,6 @@ h3,h4
     :-moz-box-shadow 0 1px 2px #666
     :box-shadow 0 1px 2px #666
 
-    :-webkit-border-radius 5px
-    :-moz-border-radius 5px
-    :border-radius 5px
-
 .what_is_this
   :position relative
   :top 3px