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

Merge pull request #2906 from evazion/feat-modqueue-hilite-bad-tags

Browse Source 
Modqueue: highlight uploads containing "bad" tags.
This commit is contained in:
Albert Yi
2017-03-01 13:36:39 -08:00
committed by GitHub
parent 6de3e8ae4c 2bb134f08d
commit 704d7bd560
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/mod_queue.js
View File

@@ -48,9 +48,6 @@
if ($post.data("has-children")) {
$post.addClass("post-has-children");
}
if ($post.data("has-dup")) {
$post.addClass("post-has-dup");
}
});
}

2
app/assets/stylesheets/common/000_vars.scss
View File

@@ -24,6 +24,8 @@ $preview_has_parent_color: #CC0;
$preview_deleted_color: #000;
$preview_pending_color: #00F;
$preview_flagged_color: #F00;
$preview_sample_warning_color: hsl(0, 100%, 90%); // light red
$preview_quality_warning_color: hsl(50, 100%, 90%); // light yellow
@mixin border-radius($val) {
-moz-border-radius: $val;

23
app/assets/stylesheets/specific/mod_queue.scss
View File

@@ -9,10 +9,6 @@ div#c-moderator-post-queues {
background: rgb(230, 255, 230);
}
&.post-has-dup {
background: rgb(255, 255, 100);
}
&.post-neg-score {
background: rgb(255, 230, 230);
}
@@ -29,6 +25,23 @@ div#c-moderator-post-queues {
width: 800px;
}
&[data-tags~="hard_translated"],
&[data-tags~="self_upload"],
&[data-tags~="nude_filter"],
&[data-tags~="photoshop"],
&[data-tags~="screencap"] {
background-color: $preview_quality_warning_color;
}
&[data-tags~="duplicate"],
&[data-tags~="image_sample"],
&[data-tags~="md5_mismatch"],
&[data-tags~="resized"],
&[data-tags~="upscaled"],
&[data-tags~="downscaled"] {
background-color: $preview_sample_warning_color;
}
&[data-tags~=animated], &[data-file-ext=swf], &[data-file-ext=webm], &[data-file-ext=zip], &[data-file-ext=mp4] {
aside:before {
@include animated-icon;
@@ -49,4 +62,4 @@ div#c-moderator-post-queues {
font-size: $h2_size;
}
}
}
}

4
app/models/post.rb
View File

@@ -831,10 +831,6 @@ class Post < ActiveRecord::Base
set_tag_string((tag_array - Array(tag)).join(" "))
end
def has_dup_tag?
has_tag?("duplicate")
end
def tag_categories
@tag_categories ||= Tag.categories_for(tag_array)
end

2
app/views/moderator/post/queues/random.html.erb
View File

@@ -13,7 +13,7 @@
</div>
<% @posts.each do |post| %>
<div id="post-<%= post.id %>" class="post mod-queue-preview <%= PostPresenter.preview_class(post) %>" <%= PostPresenter.data_attributes(post) %> data-has-dup="<%= post.has_dup_tag? %>">
<div id="post-<%= post.id %>" class="post mod-queue-preview <%= PostPresenter.preview_class(post) %>" <%= PostPresenter.data_attributes(post) %>>
<aside>
<%= link_to(image_tag(post.preview_file_url), post_path(post), :target => "_blank") %>
</aside>

2
app/views/moderator/post/queues/show.html.erb
View File

@@ -24,7 +24,7 @@
</div>
<% @posts.each do |post| %>
<div id="post-<%= post.id %>" class="post mod-queue-preview <%= PostPresenter.preview_class(post) %>" <%= PostPresenter.data_attributes(post) %> data-has-dup="<%= post.has_dup_tag? %>">
<div id="post-<%= post.id %>" class="post mod-queue-preview <%= PostPresenter.preview_class(post) %>" <%= PostPresenter.data_attributes(post) %>>
<aside>
<%= link_to(image_tag(post.preview_file_url), post_path(post), :target => "_blank") %>
</aside>