From 5c9b5cd21e3ef6500fd40697afe479baaade07d9 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 7 Jun 2017 23:30:35 -0500
Subject: [PATCH 1/2] blacklists: add missing blacklist controls on several
 pages (fix #3121).

---
 app/views/artist_commentaries/index.html.erb | 2 ++
 app/views/comments/index_by_comment.html.erb | 2 ++
 app/views/moderator/dashboards/show.html.erb | 1 +
 app/views/users/show.html.erb                | 1 +
 4 files changed, 6 insertions(+)

diff --git a/app/views/artist_commentaries/index.html.erb b/app/views/artist_commentaries/index.html.erb
index 5a468a12ac1..9ba9ad4c151 100644
--- a/app/views/artist_commentaries/index.html.erb
+++ b/app/views/artist_commentaries/index.html.erb
@@ -2,6 +2,8 @@
   <div id="a-index">
     <h1>Artist Commentary</h1>
 
+    <%= render "posts/partials/common/inline_blacklist" %>
+
     <table width="100%" class="striped">
       <thead>
         <tr>
diff --git a/app/views/comments/index_by_comment.html.erb b/app/views/comments/index_by_comment.html.erb
index 99844b99f90..186dad6faa0 100644
--- a/app/views/comments/index_by_comment.html.erb
+++ b/app/views/comments/index_by_comment.html.erb
@@ -2,6 +2,8 @@
   <div id="a-index">
     <h1>Comments</h1>
 
+    <%= render "posts/partials/common/inline_blacklist" %>
+
     <div class="comments-for-post">
       <div class="list-of-comments">
         <% @comments.each do |comment| %>
diff --git a/app/views/moderator/dashboards/show.html.erb b/app/views/moderator/dashboards/show.html.erb
index e57cd59fe40..835b1021de1 100644
--- a/app/views/moderator/dashboards/show.html.erb
+++ b/app/views/moderator/dashboards/show.html.erb
@@ -3,6 +3,7 @@
     <h1>Moderator Dashboard</h1>
 
     <%= render "search" %>
+    <%= render "posts/partials/common/inline_blacklist" %>
 
     <div id="col1">
       <div class="activity"><%= render "activity_upload" %></div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9d5477ca9d5..d9c8eda532e 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -5,6 +5,7 @@
     <%= render "statistics", :presenter => @presenter, :user => @user %>
 
     <% if !CurrentUser.is_admin? && !@user.enable_privacy_mode? || CurrentUser.id == @user.id %>
+      <%= render "posts/partials/common/inline_blacklist" %>
       <%= render "post_summary", :presenter => @presenter, :user => @user %>
     <% end %>
   </div>

From 2929857682baa37c993a959ddb9b30c35898b2bf Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 7 Jun 2017 23:31:34 -0500
Subject: [PATCH 2/2] blacklists: fix inline blacklist css to work on any page.

---
 app/assets/stylesheets/specific/posts.scss                 | 2 +-
 app/views/posts/partials/common/_inline_blacklist.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/specific/posts.scss b/app/assets/stylesheets/specific/posts.scss
index b5cfe764ca6..fb637d917fe 100644
--- a/app/assets/stylesheets/specific/posts.scss
+++ b/app/assets/stylesheets/specific/posts.scss
@@ -504,7 +504,7 @@ div#c-explore-posts {
   }
 }
 
-div#c-explore-posts, div#c-post-appeals, div#c-post-flags, div#c-pools, div#c-notes, div#c-comments, div#c-favorite-groups {
+.inline-blacklist {
   #blacklist-box {
     margin-bottom: 1em;
   }
diff --git a/app/views/posts/partials/common/_inline_blacklist.html.erb b/app/views/posts/partials/common/_inline_blacklist.html.erb
index 2017ff35052..909e34df0b8 100644
--- a/app/views/posts/partials/common/_inline_blacklist.html.erb
+++ b/app/views/posts/partials/common/_inline_blacklist.html.erb
@@ -1,4 +1,4 @@
-<div id="blacklist-box">
+<div id="blacklist-box" class="inline-blacklist">
   <strong>Blacklisted: </strong>
   <ul id="blacklist-list">
     <li id="disable-all-blacklists" style="display: none;"><span class="link">Disable all</span></li>