From 67123a277c7d15096c4c63e8047606b853041b39 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Wed, 3 Aug 2011 11:19:48 -0700 Subject: [PATCH] Fix and simplify likes_container --- app/views/likes/_likes_container.haml | 12 +++--------- app/views/shared/_stream_element.html.haml | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml index ef278ac05..d8e746940 100644 --- a/app/views/likes/_likes_container.haml +++ b/app/views/likes/_likes_container.haml @@ -5,16 +5,10 @@ .likes_container - if likes_count > 0 = image_tag('icons/heart.svg') - - if defined?(likes_index_link) && likes_index_link - - if target_type == "Comment" - = link_to t('likes.likes.people_like_this_comment', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" - - else - = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" + - if target_type == "Comment" + = t('likes.likes.people_like_this_comment', :count => likes_count) - else - - if target_type == "Comment" - = t('likes.likes.people_like_this_comment', :count => likes_count) - - else - = t('likes.likes.people_like_this', :count => likes_count) + = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" %span.hidden.likes_list /= render 'likes/likes', :likes => likes diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index cfcc37c72..c19c2ba34 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -67,6 +67,6 @@ = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea' .likes.on_post - = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true, :target_type => "Post" + = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :target_type => "Post" = render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)