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

Merge pull request #3128 from evazion/fix-inline-blacklists

Browse Source 
Fix #3121: No Blacklist Box on the various controllers
This commit is contained in:
Albert Yi
2017-06-08 14:05:56 -07:00
committed by GitHub
parent ec27a4aa96 2929857682
commit 1548efbbae
6 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/specific/posts.scss
View File

@@ -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 { #blacklist-box {
margin-bottom: 1em; margin-bottom: 1em;
} }

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

@@ -2,6 +2,8 @@
<div id="a-index"> <div id="a-index">
<h1>Artist Commentary</h1> <h1>Artist Commentary</h1>
<%= render "posts/partials/common/inline_blacklist" %>
<table width="100%" class="striped"> <table width="100%" class="striped">
<thead> <thead>
<tr> <tr>

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

@@ -2,6 +2,8 @@
<div id="a-index"> <div id="a-index">
<h1>Comments</h1> <h1>Comments</h1>
<%= render "posts/partials/common/inline_blacklist" %>
<div class="comments-for-post"> <div class="comments-for-post">
<div class="list-of-comments"> <div class="list-of-comments">
<% @comments.each do |comment| %> <% @comments.each do |comment| %>

1
app/views/moderator/dashboards/show.html.erb
View File

@@ -3,6 +3,7 @@
<h1>Moderator Dashboard</h1> <h1>Moderator Dashboard</h1>
<%= render "search" %> <%= render "search" %>
<%= render "posts/partials/common/inline_blacklist" %>
<div id="col1"> <div id="col1">
<div class="activity"><%= render "activity_upload" %></div> <div class="activity"><%= render "activity_upload" %></div>

2
app/views/posts/partials/common/_inline_blacklist.html.erb
View File

@@ -1,4 +1,4 @@
<div id="blacklist-box"> <div id="blacklist-box" class="inline-blacklist">
<strong>Blacklisted: </strong> <strong>Blacklisted: </strong>
<ul id="blacklist-list"> <ul id="blacklist-list">
<li id="disable-all-blacklists" style="display: none;"><span class="link">Disable all</span></li> <li id="disable-all-blacklists" style="display: none;"><span class="link">Disable all</span></li>

1
app/views/users/show.html.erb
View File

@@ -5,6 +5,7 @@
<%= render "statistics", :presenter => @presenter, :user => @user %> <%= render "statistics", :presenter => @presenter, :user => @user %>
<% if !CurrentUser.is_admin? && !@user.enable_privacy_mode? || CurrentUser.id == @user.id %> <% 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 %> <%= render "post_summary", :presenter => @presenter, :user => @user %>
<% end %> <% end %>
</div> </div>