From 2bb134f08d3876ee6dcf67c3ae58e13a11ba55f8 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 27 Feb 2017 18:18:01 -0600 Subject: [PATCH] modqueue: highlight uploads containing "bad" tags. --- app/assets/javascripts/mod_queue.js | 3 --- app/assets/stylesheets/common/000_vars.scss | 2 ++ .../stylesheets/specific/mod_queue.scss | 23 +++++++++++++++---- app/models/post.rb | 4 ---- .../moderator/post/queues/random.html.erb | 2 +- app/views/moderator/post/queues/show.html.erb | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/mod_queue.js b/app/assets/javascripts/mod_queue.js index 152982d47..de168331f 100644 --- a/app/assets/javascripts/mod_queue.js +++ b/app/assets/javascripts/mod_queue.js @@ -48,9 +48,6 @@ if ($post.data("has-children")) { $post.addClass("post-has-children"); } - if ($post.data("has-dup")) { - $post.addClass("post-has-dup"); - } }); } diff --git a/app/assets/stylesheets/common/000_vars.scss b/app/assets/stylesheets/common/000_vars.scss index 6279c968f..4122adde0 100644 --- a/app/assets/stylesheets/common/000_vars.scss +++ b/app/assets/stylesheets/common/000_vars.scss @@ -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; diff --git a/app/assets/stylesheets/specific/mod_queue.scss b/app/assets/stylesheets/specific/mod_queue.scss index 7daf2eaf8..9141a776b 100644 --- a/app/assets/stylesheets/specific/mod_queue.scss +++ b/app/assets/stylesheets/specific/mod_queue.scss @@ -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; } } -} \ No newline at end of file +} diff --git a/app/models/post.rb b/app/models/post.rb index 77237f812..d60379b14 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -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 diff --git a/app/views/moderator/post/queues/random.html.erb b/app/views/moderator/post/queues/random.html.erb index d5fc2d463..261dc21ba 100644 --- a/app/views/moderator/post/queues/random.html.erb +++ b/app/views/moderator/post/queues/random.html.erb @@ -13,7 +13,7 @@ <% @posts.each do |post| %> -
data-has-dup="<%= post.has_dup_tag? %>"> +
> diff --git a/app/views/moderator/post/queues/show.html.erb b/app/views/moderator/post/queues/show.html.erb index f23b1714b..adecac0b7 100644 --- a/app/views/moderator/post/queues/show.html.erb +++ b/app/views/moderator/post/queues/show.html.erb @@ -24,7 +24,7 @@
<% @posts.each do |post| %> -
data-has-dup="<%= post.has_dup_tag? %>"> +
>