From c90614272a47697e7c9192a5ad00fb72942f45c5 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 13 Apr 2017 15:07:53 -0500
Subject: [PATCH 1/2] /posts/:id - add dtext preview to flag/appeal dialogs.

---
 app/views/post_appeals/_new.html.erb |  9 ++++++---
 app/views/post_flags/_new.html.erb   | 11 ++++++-----
 app/views/posts/show.html.erb        |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/post_appeals/_new.html.erb b/app/views/post_appeals/_new.html.erb
index a5b8b2605..9a4118f27 100644
--- a/app/views/post_appeals/_new.html.erb
+++ b/app/views/post_appeals/_new.html.erb
@@ -1,6 +1,9 @@
 <%= format_text(WikiPage.titled(Danbooru.config.appeal_notice_wiki_page).first.try(&:body), :ragel => true) %>
 
-<%= form_tag(post_appeals_path(:format => :js), :remote => true) do %>
-  <%= hidden_field_tag "post_appeal[post_id]", @post_appeal.post_id %>
-  <%= text_area :post_appeal, :reason, :size => "40x5" %>
+<!-- XXX dtext_field expects there to be a `post_appeal` instance variable. -->
+<% @post_appeal = post_appeal %>
+<%= simple_form_for(@post_appeal, format: :js, remote: true) do |f| %>
+  <%= f.hidden_field :post_id %>
+  <%= dtext_field "post_appeal", "reason", preview_id: "dtext-preview-for-post-appeal" %>
+  <%= dtext_preview_button "post_appeal", "reason", preview_id: "dtext-preview-for-post-appeal" %>
 <% end %>
diff --git a/app/views/post_flags/_new.html.erb b/app/views/post_flags/_new.html.erb
index 29539da2b..36eb643e2 100644
--- a/app/views/post_flags/_new.html.erb
+++ b/app/views/post_flags/_new.html.erb
@@ -1,8 +1,9 @@
 <%= format_text(WikiPage.titled(Danbooru.config.flag_notice_wiki_page).first.try(&:body), :ragel => true) %>
 
-<p>Enter a reason:</p>
-
-<%= form_tag(post_flags_path(:format => :js), :remote => true) do %>
-  <%= hidden_field :post_flag, :post_id %>
-  <%= text_area :post_flag, :reason, :size => "40x5" %>
+<!-- XXX dtext_field expects there to be a `post_flag` instance variable. -->
+<% @post_flag = post_flag %>
+<%= simple_form_for(@post_flag, format: :js, remote: true) do |f| %>
+  <%= f.hidden_field :post_id %>
+  <%= dtext_field "post_flag", "reason", preview_id: "dtext-preview-for-post-flag" %>
+  <%= dtext_preview_button "post_flag", "reason", preview_id: "dtext-preview-for-post-flag" %>
 <% end %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 86e5d6ee3..535173aca 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -119,11 +119,11 @@
   </div>
 
   <div id="flag-dialog" class="prose" title="Flag post" style="display: none;">
-    <%= render "post_flags/new" %>
+    <%= render "post_flags/new", post_flag: @post.flags.new %>
   </div>
 
   <div id="appeal-dialog" class="prose" title="Appeal post" style="display: none;">
-    <%= render "post_appeals/new" %>
+    <%= render "post_appeals/new", post_appeal: @post.appeals.new %>
   </div>
 
   <div id="add-to-pool-dialog" title="Add to pool" style="display: none;">

From 18a2b2a221aadf9727af9727a76afe5fb98e8e25 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 13 Apr 2017 15:14:38 -0500
Subject: [PATCH 2/2] dtext_field: use the field name as the label, not "Body".

For flags and appeals, the reason field should be labeled Reason, not Body.
---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6cdbcc477..2283393a0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -126,7 +126,7 @@ module ApplicationHelper
   end
 
   def dtext_field(object, name, options = {})
-    options[:name] ||= "Body"
+    options[:name] ||= name.capitalize
     options[:input_id] ||= "#{object}_#{name}"
     options[:input_name] ||= "#{object}[#{name}]"
     options[:value] ||= instance_variable_get("@#{object}").try(name)