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

comments: don't nest search form under div.list-of-comments.

Browse Source
This commit is contained in:
evazion
2022-09-26 14:41:27 -05:00
parent 67c992bfbf
commit a399ab1060
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/views/comments/_index_by_comment.html.erb
View File

@@ -1,19 +1,21 @@
<%= search_form_for(comments_path) do |f| %>
<%= hidden_field_tag "group_by", "comment", :id => "group_by_full" %>
<%= f.input :creator_name, label: "Commenter", input_html: { value: params[:search][:creator_name], "data-autocomplete": "user" } %>
<%= f.input :body_matches, label: "Text", input_html: { value: params[:search][:body_matches] } %>
<%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], "data-autocomplete": "tag-query" } %>
<%= f.input :score, input_html: { value: params[:search][:score] } %>
<%= f.input :is_edited, label: "Edited?", collection: %w[Yes No], include_blank: true, selected: params[:search][:is_edited] %>
<%= f.input :is_deleted, label: "Deleted?", collection: %w[Yes No], include_blank: true, selected: params[:search][:is_deleted] %>
<%= f.input :is_sticky, label: "Stickied?", collection: %w[Yes No], include_blank: true, selected: params[:search][:is_sticky] %>
<%= f.input :do_not_bump_post, label: "Bumped?", collection: [["Yes", false], ["No", true]], include_blank: true, selected: params[:search][:do_not_bump_post] %>
<%= f.input :order, collection: [["Newest", "id_desc"], ["Oldest", "id_asc"], ["Updated", "updated_at_desc"], ["Score (highest)", "score_desc"], ["Score (lowest)", "score_asc"]], include_blank: true, selected: params[:search][:order] %>
<%= f.submit "Search" %>
<% end %>
<%= render "posts/partials/common/inline_blacklist" %>
<div id="p-index-by-comment" class="comments-for-post"> <div id="p-index-by-comment" class="comments-for-post">
<div class="list-of-comments list-of-messages"> <div class="list-of-comments list-of-messages">
<%= search_form_for(comments_path) do |f| %>
<%= hidden_field_tag "group_by", "comment", :id => "group_by_full" %>
<%= f.input :creator_name, label: "Commenter", input_html: { value: params[:search][:creator_name], "data-autocomplete": "user" } %>
<%= f.input :body_matches, label: "Text", input_html: { value: params[:search][:body_matches] } %>
<%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], "data-autocomplete": "tag-query" } %>
<%= f.input :score, input_html: { value: params[:search][:score] } %>
<%= f.input :is_edited, label: "Edited?", collection: %w[Yes No], include_blank: true, selected: params[:search][:is_edited] %>
<%= f.input :is_deleted, label: "Deleted?", collection: %w[Yes No], include_blank: true, selected: params[:search][:is_deleted] %>
<%= f.input :is_sticky, label: "Stickied?", collection: %w[Yes No], include_blank: true, selected: params[:search][:is_sticky] %>
<%= f.input :do_not_bump_post, label: "Bumped?", collection: [["Yes", false], ["No", true]], include_blank: true, selected: params[:search][:do_not_bump_post] %>
<%= f.input :order, collection: [["Newest", "id_desc"], ["Oldest", "id_asc"], ["Updated", "updated_at_desc"], ["Score (highest)", "score_desc"], ["Score (lowest)", "score_asc"]], include_blank: true, selected: params[:search][:order] %>
<%= f.submit "Search" %>
<% end %>
<% dtext_data = DText.preprocess(@comments.map(&:body)) %> <% dtext_data = DText.preprocess(@comments.map(&:body)) %>
<% @comments.each do |comment| %> <% @comments.each do |comment| %>

2
app/views/comments/_index_by_post.html.erb
View File

@@ -1,3 +1,5 @@
<%= render "posts/partials/common/inline_blacklist" %>
<div id="p-index-by-post"> <div id="p-index-by-post">
<% if @posts.blank? %> <% if @posts.blank? %>
<%= render "post_sets/blank" %> <%= render "post_sets/blank" %>

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

@@ -7,8 +7,6 @@
<div id="a-index"> <div id="a-index">
<h1>Comments</h1> <h1>Comments</h1>
<%= render "posts/partials/common/inline_blacklist" %>
<% if params[:group_by] == "comment" %> <% if params[:group_by] == "comment" %>
<%= render "index_by_comment" %> <%= render "index_by_comment" %>
<% else %> <% else %>