Merge branch 'master' into attribute-searching
This commit is contained in:
@@ -6,12 +6,12 @@
|
||||
<% end %>
|
||||
data-creator="<%= forum_post.creator.name %>">
|
||||
<div class="author">
|
||||
<h4>
|
||||
<div class="author-name">
|
||||
<%= link_to_user forum_post.creator %>
|
||||
<% if forum_post.is_deleted? %>
|
||||
(deleted)
|
||||
<% end %>
|
||||
</h4>
|
||||
</div>
|
||||
<%= link_to time_ago_in_words_tagged(forum_post.created_at), forum_post, class: "message-timestamp" %>
|
||||
</div>
|
||||
<div class="content">
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
|
||||
$("article[data-forum-post-id=<%= @forum_post.id %>] div.author h4").append(" (deleted)");
|
||||
$("article[data-forum-post-id=<%= @forum_post.id %>] div.author div.author-name").append(" (deleted)");
|
||||
|
||||
Reference in New Issue
Block a user