diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 866a266e6591ae301c868152c47731accd87beac..a2d9df3929bbeaf184c0dfbb8d4de6ea96d6c5be 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -9,27 +9,30 @@
});
});
-.span-4.append-1.last
- = render "shared/aspect_friends"
+%h2
+ = @aspect
+ .friend_pictures.horizontal
+ = owner_image_link
+ - for friend in @friends
+ = person_image_link(friend)
+
+.span-19.appends-1.last
+ #thumbnails
+ - for photo in @album_photos
+ .image_thumb
+ = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
-.span-19.last
+.span-5.last
%h3
- = link_to "#{@aspect} Albums", albums_path(:aspect => @aspect)
-
= @album.name
="#{t('.updated')} #{how_long_ago(@album)}"
- .right
- -if current_user.owns? @album
- =render 'photos/new_photo'
- = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
+ = link_to "#{@aspect} Albums", albums_path(:aspect => @aspect)
+ -if current_user.owns? @album
+ =render 'photos/new_photo'
+ = link_to t('.edit_album'), edit_album_path(@album), :class => 'button'
.album_id{:id => @album.id, :style => "display:hidden;"}
-unless current_user.owns? @album
%h4= "#{t('.by')} #{@album.person.real_name}"
- #thumbnails
- - for photo in @album_photos
- .image_thumb
- = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
-
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index f714d9783fc9f7425877fc4d07283745d9e714d6..f339de7b92815cdd58f4bf1e6ee70e68da295cab 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -54,33 +54,23 @@
});//end document ready
-.span-4.append-1.last
- = render "shared/aspect_friends"
-
-.span-19.last
- %h3
- = link_to @photo.album.name, @photo.album
- = @photo.image
-
- = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album), :rel => 'prefetch'
- |
- = link_to "#{t('.full_size')}", @photo.url
- |
- = link_to "#{t('.next')} >>", url_to_next(@photo, @album), :rel => 'prefetch'
-
- -if current_user.owns? @album
- = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
-
- %br
- %br
-
- %div{:id => @photo.id}
+%h2
+ = @aspect
+ .friend_pictures.horizontal
+ = owner_image_link
+ - for friend in @friends
+ = person_image_link(friend)
+
+.span-14.append-1.last
+ %div{:data=>{:guid=>@photo.id}}
#show_photo
-if current_user.owns? @photo
.edit_pane
.controls{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}}
= link_to 'make profile photo', '#', :class => "make_profile_photo"
+ |
+ = link_to 'edit', '#', :class => "make_profile_photo"
= linked_scaled_photo @photo, @album
-else
= linked_scaled_photo @photo, @album
@@ -91,26 +81,37 @@
.description
= @photo.caption
- -if current_user.owns? @photo
- %div{:class => 'clear'}
- -if !@photo.caption or @photo.caption == ""
- = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc"
+ %h3
+ = link_to @photo.album.name, @photo.album
+ = @photo.image
- = form_for @photo do |p|
- = p.text_field :caption, :value => @photo.caption
- = p.submit
- %div{:class => 'clear'}
- %h4{:class => "show_post_comments"}
- = "#{t('.comments')} (#{@photo.comments.count})"
- = render "comments/comments", :post => @photo
+ -if current_user.owns? @album
+ = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
- #content_bottom
- .back
- = link_to "⇧ #{@album.name}", album_path(@album)
+ -if current_user.owns? @photo
+ %div{:class => 'clear'}
+ -if !@photo.caption or @photo.caption == ""
+ = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc"
+ %br
+ %br
- -if current_user.owns? @album
- .right
- = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button'
+ = form_for @photo do |p|
+ = p.text_field :caption, :value => @photo.caption
+ = p.submit
+ %div{:class => 'clear'}
+ -if current_user.owns? @album
+ = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button'
+.span-9.last
+ = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album), :rel => 'prefetch'
+ |
+ = link_to "#{t('.full_size')}", @photo.url
+ |
+ = link_to "#{t('.next')} >>", url_to_next(@photo, @album), :rel => 'prefetch'
+ %br
+ %br
+ #stream.show
+ %li.message{:id => @photo.id}
+ = render "comments/comments", :post => @photo
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index e185dc30681ad3bfc911a03c42c3c14009548ab4..4fc8cd6467fea674777885d96d78842886685dc4 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -5,7 +5,7 @@
#left_pane
%h2= @aspect
- #friend_pictures
+ .friend_pictures
= owner_image_link
- for friend in @friends
= person_image_link(friend)
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 7046c69a2c196c083af5645bae59481ab52d8b00..e9dbd481680335f2a2f84eb50889720cc8e60834 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -2,6 +2,13 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
+
+%h2
+ = @aspect
+ .friend_pictures.horizontal
+ - for friend in @friends
+ = person_image_link(friend)
+
.span-14.append-1.last
#stream
%h1.show_text
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 5249cb129493ad252c0b11bb180d75572da1cb46..eee5fbf9aa117b3afa106a450d09b9c4af80fddb 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -544,10 +544,11 @@ li.message .from .right
:margin-right 1em
#show_photo
- :text-align center
- :min-height 200px
img
:max-width 100%
+ :-webkit-box-shadow 0 2px 4px #333
+ :border 10px solid #fff
+ :bottom 50px solid #fff
.caption
:margin
@@ -994,7 +995,7 @@ ul#settings_nav
:color transparent
-#friend_pictures
+.friend_pictures
:margin
:top 12px
:line-height 1em
@@ -1003,6 +1004,15 @@ ul#settings_nav
:width 30px
:height 30px
+.friend_pictures.horizontal
+ :display inline
+ :margin
+ :left 20px
+
+ img
+ :width 20px
+ :height 20px
+
#thumbnails
:line-height 14px
@@ -1104,7 +1114,9 @@ header
:color rgba(51,51,51,0.9)
:padding 10px
:position absolute
- :right 0
+ :right 10px
+ :margin
+ :top 10px
a
:font