jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1014

Browse Source
This commit is contained in:
albert
2013-03-21 17:58:55 -07:00
parent 12313e2526
commit 9cdc2a7cd7
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/notes.js
View File

@@ -237,6 +237,7 @@ Danbooru.Note = {
}) })
} else { } else {
$note_body.click(function(e) { $note_body.click(function(e) {
Danbooru.notice("You must be logged in to edit notes");
e.stopPropagation(); e.stopPropagation();
}); });
} }

23
app/views/comments/partials/show/_comment.html.erb
View File

@@ -13,17 +13,20 @@
<p class="info">Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %></p> <p class="info">Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %></p>
<% end %> <% end %>
</div> </div>
<menu>
<% if @post || @posts %> <% if CurrentUser.is_member? %>
<li><%= link_to "Reply", new_comment_path(:post_id => comment.post_id), :class => "reply-link", "data-comment-id" => comment.id %></li> <menu>
<% if comment.editable_by?(CurrentUser.user) %> <% if @post || @posts %>
<li><%= link_to "Delete", comment_path(comment.id), :confirm => "Do you really want to delete this comment?", :method => :delete, :remote => true %></li> <li><%= link_to "Reply", new_comment_path(:post_id => comment.post_id), :class => "reply-link", "data-comment-id" => comment.id %></li>
<li><%= link_to "Edit", edit_comment_path(comment.id) %></li> <% if comment.editable_by?(CurrentUser.user) %>
<li><%= link_to "Delete", comment_path(comment.id), :confirm => "Do you really want to delete this comment?", :method => :delete, :remote => true %></li>
<li><%= link_to "Edit", edit_comment_path(comment.id) %></li>
<% end %>
<li id="comment-vote-up-link-for-<%= comment.id %>"><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li>
<li id="comment-vote-down-link-for-<%= comment.id %>"><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li>
<% end %> <% end %>
<li id="comment-vote-up-link-for-<%= comment.id %>"><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li> </menu>
<li id="comment-vote-down-link-for-<%= comment.id %>"><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li> <% end %>
<% end %>
</menu>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</article> </article>