Browse files

Merge remote-tracking branch 'Nethemba/ux_none_comments'

  • Loading branch information...
2 parents 6cc7952 + 5153134 commit ac43abc84e6b08ddd25798e20e880f7d7c1fc1ae @parndt parndt committed Sep 5, 2012
View
59 app/views/refinery/blog/posts/_comments.html.erb
@@ -1,38 +1,37 @@
<aside id="comments">
- <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
<% if (comments = @post.comments.approved).any? %>
+ <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
<%= render :partial => "comment", :collection => comments %>
- <% else %>
- <p>
- <%= t('none', :scope => 'refinery.blog.shared.comments') %>.
- </p>
<% end %>
- <% flash.each do |key, value| %>
- <div id='flash' class="flash flash_<%= key %>">
- <%= value %>
- </div>
- <% end %>
+ <% if Refinery::Blog::Post.comments_allowed? %>
+
+ <% flash.each do |key, value| %>
+ <div id='flash' class="flash flash_<%= key %>">
+ <%= value %>
+ </div>
+ <% end %>
- <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
- <%= form_for [refinery, :blog, @comment] do |f| %>
- <%= render "/refinery/admin/error_messages",
- :object => f.object,
- :include_object_name => true %>
- <div class='field'>
- <%= f.label :name %>
- <%= f.text_field :name %>
- </div>
- <div class='field'>
- <%= f.label :email %>
- <%= f.email_field :email %>
- </div>
- <div class='field message_field'>
- <%= f.label :message %>
- <%= f.text_area :message, :rows => 6 %>
- </div>
- <div class='field form-actions'>
- <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %>
- </div>
+ <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
+ <%= form_for [refinery, :blog, @comment] do |f| %>
+ <%= render "/refinery/admin/error_messages",
+ :object => f.object,
+ :include_object_name => true %>
+ <div class='field'>
+ <%= f.label :name %>
+ <%= f.text_field :name %>
+ </div>
+ <div class='field'>
+ <%= f.label :email %>
+ <%= f.email_field :email %>
+ </div>
+ <div class='field message_field'>
+ <%= f.label :message %>
+ <%= f.text_area :message, :rows => 6 %>
+ </div>
+ <div class='field form-actions'>
+ <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %>
+ </div>
+ <% end %>
<% end %>
</aside>
View
4 app/views/refinery/blog/posts/show.html.erb
@@ -3,9 +3,7 @@
<%= render 'post' %>
</div>
- <% if Refinery::Blog::Post.comments_allowed? %>
- <%= render 'comments'%>
- <% end %>
+ <%= render 'comments' %>
<% end %>
<%= render '/refinery/blog/shared/body_content_right' %>
View
14 app/views/refinery/blog/shared/_post.html.erb
@@ -34,15 +34,11 @@
<%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), refinery.blog_post_path(post) %>
<% end %>
</p>
- <aside class='comment_count'>
- <% if Refinery::Blog::Post.comments_allowed? %>
- <% if post.comments.any? %>
- (<%= pluralize(post.comments.approved.count, t('singular', :scope => 'refinery.blog.shared.comments')) %>)
- <% else %>
- (<%= t('none', :scope => 'refinery.blog.shared.comments') %>)
- <% end %>
- <% end %>
- </aside>
+ <% if Refinery::Blog::Post.comments_allowed? %>
+ <aside class='comment_count'>
+ <%= link_to "#{t('title', :scope => 'refinery.blog.posts.show.comments')} (#{post.comments.approved.count})", refinery.blog_post_path(post) << '#comments' %>
+ </aside>
+ <% end %>
</footer>
</article>
<% end %>

0 comments on commit ac43abc

Please sign in to comment.