From 9f8e723d8349ef9a027cb17bf77f90a5aa17c034 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Wed, 15 Jul 2015 13:26:01 -0700
Subject: [PATCH] fixes #2438: Flagged posts cannot be approved from post page

---
 app/views/posts/partials/show/_notices.html.erb | 8 ++++++--
 app/views/posts/show.html.erb                   | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb
index f5f7f9111..db8e18b5e 100644
--- a/app/views/posts/partials/show/_notices.html.erb
+++ b/app/views/posts/partials/show/_notices.html.erb
@@ -23,9 +23,13 @@
   </div>
 <% end %>
 
-<% if post.is_pending? %>
+<% if post.is_pending? || post.is_flagged? %>
   <div class="ui-corner-all ui-state-highlight notice notice-pending" id="pending-approval-notice">
-    This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>)
+    <% if post.is_pending? %>
+      This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>)
+    <% else %>
+      This post was flagged and is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>)
+    <% end %>
 
     <% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>
       <div class="quick-mod">
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 627989c77..6ad7f8877 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -118,11 +118,11 @@
     </section>
   </div>
 
-  <div id="flag-dialog" title="Flag post" style="display: none;">
+  <div id="flag-dialog" class="prose" title="Flag post" style="display: none;">
     <%= render "post_flags/new" %>
   </div>
 
-  <div id="appeal-dialog" title="Appeal post" style="display: none;">
+  <div id="appeal-dialog" class="prose" title="Appeal post" style="display: none;">
     <%= render "post_appeals/new" %>
   </div>