Merge pull request #3827 from evazion/fix-3709

Fix #3709: Provide OR capability for blacklist items
2018-08-23 13:54:30 -07:00
parent d8a6cee244 d6eecb5466
commit 54363ffecf
7 changed files with 63 additions and 65 deletions
--- a/app/views/posts/partials/index/_blacklist.html.erb
+++ b/app/views/posts/partials/index/_blacklist.html.erb
@@ -1,7 +1,7 @@
-<section id="blacklist-box">
+<div id="blacklist-box" class="sidebar-blacklist">
  <h1>Blacklisted (<%= link_to "Help", wiki_pages_path(:title => "help:blacklists") %>)</h1>
  <ul id="blacklist-list">
  </ul>
  <%= link_to "Disable all", "#", :id => "disable-all-blacklists", :style => "display: none;" %>
  <%= link_to "Re-enable all", "#", :id => "re-enable-all-blacklists", :style => "display: none;" %>
-</section>
+</div>
--- a/app/views/wiki_pages/_sidebar.html.erb
+++ b/app/views/wiki_pages/_sidebar.html.erb
@@ -1,9 +1,4 @@
 <aside id="sidebar">
+  <%= render "posts/partials/index/blacklist" %>
  <%= render "wiki_pages/recent_changes" %>
-
-  <section id="blacklist-box">
-    <h1>Blacklisted</h1>
-    <ul id="blacklist-list">
-    </ul>
-  </section>
 </aside>