fixes #551
This commit is contained in:
@@ -193,6 +193,10 @@ div#c-posts {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.notices {
|
||||||
|
margin: 1em 0;
|
||||||
|
}
|
||||||
|
|
||||||
section {
|
section {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,12 +30,5 @@
|
|||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="row notices">
|
|
||||||
<% if post.comments.hidden(CurrentUser.user).count > 0 || post.comments.count > 6 %>
|
|
||||||
<span class="info" id="threshold-comments-notice-for-<%= post.id %>"%>
|
|
||||||
<%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %>
|
|
||||||
</span>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
<%= render "comments/partials/index/header", :post => post %>
|
<%= render "comments/partials/index/header", :post => post %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
<div class="row notices">
|
||||||
|
<% if post.comments.hidden(CurrentUser.user).count > 0 || post.comments.count > 6 %>
|
||||||
|
<span class="info" id="threshold-comments-notice-for-<%= post.id %>"%>
|
||||||
|
<%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="list-of-comments">
|
<div class="list-of-comments">
|
||||||
<% if comments.empty? %>
|
<% if comments.empty? %>
|
||||||
<p>There are no comments.</p>
|
<p>There are no comments.</p>
|
||||||
|
|||||||
@@ -53,7 +53,7 @@
|
|||||||
</menu>
|
</menu>
|
||||||
|
|
||||||
<section id="comments">
|
<section id="comments">
|
||||||
<%= render "comments/partials/index/list", :comments => @post.comments, :post => @post, :show_header => false %>
|
<%= render "comments/partials/index/list", :comments => @post.comments.visible(CurrentUser.user), :post => @post, :show_header => false %>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section id="notes" style="display: none;">
|
<section id="notes" style="display: none;">
|
||||||
|
|||||||
Reference in New Issue
Block a user