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

Merge pull request #2804 from evazion/feat-comment-as-mod

Browse Source 
Add option to comment as moderator (fix #2799)
This commit is contained in:
Albert Yi
2016-12-27 11:49:36 -08:00
committed by GitHub
parent 5c0836a9c8 0e73f3c8a9
commit 2fef0cdef9
13 changed files with 147 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/comments/_form.html.erb
View File

@@ -1,5 +1,14 @@
<%= error_messages_for :comment %>
<%= simple_form_for(comment, :html => {:class => "edit_comment"}) do |f| %>
<%= f.hidden_field :post_id %>
<%= dtext_field "comment", "body", :value => comment.body, :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %>
<%= f.button :submit, "Submit" %>
<%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>
<%= dtext_preview_button "comment", "body", :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %>
<% if comment.new_record? %>
<%= f.input :do_not_bump_post, :label => "No bump" %>
<% end %>
<% if CurrentUser.is_moderator? %>
<%= f.input :is_sticky, :label => "Post as moderator" %>
<% end %>
<% end %>

8
app/views/comments/edit.html.erb
View File

@@ -2,13 +2,7 @@
<div id="a-edit">
<h1>Edit Comment</h1>
<%= error_messages_for "comment" %>
<%= simple_form_for(@comment) do |f| %>
<%= dtext_field "comment", "body" %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "comment", "body" %>
<% end %>
<%= render "comments/form", :post => @comment.post, :comment => @comment %>
</div>
</div>

2
app/views/comments/partials/index/_list.html.erb
View File

@@ -28,7 +28,7 @@
<% if CurrentUser.is_member? %>
<div class="new-comment">
<p><%= link_to "Post comment", new_comment_path, :class => "expand-comment-response" %></p>
<%= render "comments/partials/new/form", :post => post %>
<%= render "comments/form", :post => post, :comment => post.comments.new %>
</div>
<% end %>
</div>

10
app/views/comments/partials/new/_form.html.erb
View File

@@ -1,10 +0,0 @@
<div class="comment-preview dtext dtext-preview">
</div>
<%= form_tag(comments_path, :class => "simple_form comment-form") do %>
<%= hidden_field "comment", "post_id", :value => post.id %>
<%= dtext_field "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %>
<%= submit_tag "Post", :data => { :disable_with => "Submitting..." } %>
<%= dtext_preview_button "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %>
<%= check_box "comment", "do_not_bump_post", :id => "comment_do_not_bump_post_#{post.id}" %> <label for="comment_do_not_bump_post_<%= post.id %>">No bump</label>
<% end %>

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

@@ -1,6 +1,6 @@
<% if CurrentUser.is_moderator? || !comment.is_deleted? %>
<a name="comment-<%= comment.id %>"></a>
<article class="comment" data-post-id="<%= comment.post_id %>" data-comment-id="<%= comment.id %>" data-score="<%= comment.score %>" data-creator="<%= comment.creator.name %>">
<article class="comment" data-post-id="<%= comment.post_id %>" data-comment-id="<%= comment.id %>" data-score="<%= comment.score %>" data-creator="<%= comment.creator.name %>" data-is-sticky="<%= comment.is_sticky %>">
<div class="author">
<h1>
<%= link_to_user comment.creator %>
@@ -39,7 +39,7 @@
<% end %>
</menu>
<% if comment.editable_by?(CurrentUser.user) %>
<%= render "comments/form", :comment => comment %>
<%= render "comments/form", :post => comment.post, :comment => comment %>
<% end %>
<% end %>
</div>