From e6e49bbf1fe7ad1fe0532b71ac83c02f0acf3305 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Thu, 9 Feb 2012 13:50:55 -0800 Subject: [PATCH] stubbornella media and img dom structure FTW! major css deletion <3 --- app/views/people/_person.html.haml | 20 +- app/views/photos/_new_profile_photo.haml | 6 - features/comments.feature | 12 +- .../app/templates/comment-stream.handlebars | 34 +- .../app/templates/comment.handlebars | 35 +- .../app/templates/feedback.handlebars | 4 +- .../app/templates/likes-info.handlebars | 42 +- .../app/templates/status-message.handlebars | 6 +- .../app/templates/stream-element.handlebars | 53 +- .../app/views/comment_stream_view.js | 2 +- public/javascripts/app/views/comment_view.js | 2 - .../javascripts/app/views/likes_info_view.js | 11 +- public/stylesheets/sass/application.sass | 951 ++---------------- .../app/views/likes_info_view_spec.js | 10 +- 14 files changed, 231 insertions(+), 957 deletions(-) diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml index 995213407..1f7b24840 100644 --- a/app/views/people/_person.html.haml +++ b/app/views/people/_person.html.haml @@ -3,17 +3,17 @@ -# the COPYRIGHT file. .stream_element{:id => person.id} - .right - = render :partial => 'people/relationship_action', - :locals => { :person => person, :contact => contact, - :current_user => current_user } + .media + %div{:style => "float:right;margin-top:2px;"} + = render :partial => 'people/relationship_action', + :locals => { :person => person, :contact => contact, + :current_user => current_user } + .img + = person_image_link(person) - = person_image_link(person) - - .content - %span.from + .bd =person_link(person) - .info - = Diaspora::Taggable.format_tags(person.profile.tag_string) + .info + = Diaspora::Taggable.format_tags(person.profile.tag_string) diff --git a/app/views/photos/_new_profile_photo.haml b/app/views/photos/_new_profile_photo.haml index 02c550131..26dad191a 100644 --- a/app/views/photos/_new_profile_photo.haml +++ b/app/views/photos/_new_profile_photo.haml @@ -74,11 +74,5 @@ %p #fileInfo - -if !aspect.nil? && aspect != :getting_started && current_user.person.has_photos? - %br - %br - %p - \...#{t('.or_select_one_existing', :photos => link_to(t('_photos'), person_photos_path(person))).html_safe} - #publisher_photo_upload diff --git a/features/comments.feature b/features/comments.feature index 96608ccb2..0ae883b8d 100644 --- a/features/comments.feature +++ b/features/comments.feature @@ -17,8 +17,8 @@ Feature: commenting When I focus the comment field And I fill in "text" with "is that a poodle?" And I press "Comment" - Then I should see "is that a poodle?" within "li.comment div.content" - And I should see "less than a minute ago" within "li.comment time" + Then I should see "is that a poodle?" within ".comment" + And I should see "less than a minute ago" within ".comment time" Scenario: comment on a photo from the photo page When I sign in as "bob@bob.bob" @@ -27,8 +27,8 @@ Feature: commenting And I focus the comment field And I fill in "text" with "hahahah" And I press "Comment" - Then I should see "hahaha" within "li.comment div.content" - And I should see "less than a minute ago" within "li.comment time" + Then I should see "hahaha" within ".comment" + And I should see "less than a minute ago" within ".comment time" Scenario: comment on your own photo from the photo page When I sign in as "alice@alice.alice" @@ -37,8 +37,8 @@ Feature: commenting And I focus the comment field And I fill in "text" with "hahahah" And I press "Comment" - Then I should see "hahaha" within "li.comment div.content" - And I should see "less than a minute ago" within "li.comment time" + Then I should see "hahaha" within ".comment" + And I should see "less than a minute ago" within ".comment time" Scenario: delete a comment When I sign in as "bob@bob.bob" diff --git a/public/javascripts/app/templates/comment-stream.handlebars b/public/javascripts/app/templates/comment-stream.handlebars index 0b0c5445f..31e462734 100644 --- a/public/javascripts/app/templates/comment-stream.handlebars +++ b/public/javascripts/app/templates/comment-stream.handlebars @@ -1,30 +1,32 @@ {{#unless all_comments_loaded}} - + + {{/unless}} - +
{{#if current_user}} -