From ea830a01b228bc4d068675b35e24c9248b758303 Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 12 Oct 2023 16:28:13 +0300 Subject: [PATCH] poor mode consistency --- .../events/homoween/css/awards_poor.css | 26 ------------------- files/classes/post.py | 2 +- .../events/homoween/awards_poor.html | 17 ------------ files/templates/post.html | 12 ++++----- 4 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 files/assets/events/homoween/css/awards_poor.css delete mode 100644 files/templates/events/homoween/awards_poor.html diff --git a/files/assets/events/homoween/css/awards_poor.css b/files/assets/events/homoween/css/awards_poor.css deleted file mode 100644 index c7ec9279d..000000000 --- a/files/assets/events/homoween/css/awards_poor.css +++ /dev/null @@ -1,26 +0,0 @@ -.poor { - position: fixed; - background-repeat: no-repeat; - width: 100%; - height: 100%; - pointer-events:none; -} - -#fog-effect-poor { - background-image: url(/assets/events/homoween/images/poor/fog.webp); - background-size: cover; - z-index: 9998; - opacity:0.7; -} - -#stab-effect-poor { - background-image: url(/assets/events/homoween/images/poor/blood.webp); - z-index: 9997; -} - -#flashlight-effect-poor { - background-image: url(/assets/events/homoween/images/poor/flashlight.webp); - z-index: 9995; - background-size: cover; - background-position: center; -} diff --git a/files/classes/post.py b/files/classes/post.py index f3de0ab06..615dfd09b 100644 --- a/files/classes/post.py +++ b/files/classes/post.py @@ -251,7 +251,7 @@ class Post(Base): @lazy def award_count(self, kind, v): - if v and v.poor and kind not in FISTMAS_AWARDS + HOMOWEEN_AWARDS: + if v and v.poor: return 0 if self.distinguish_level and SITE_NAME == 'WPD': diff --git a/files/templates/events/homoween/awards_poor.html b/files/templates/events/homoween/awards_poor.html deleted file mode 100644 index 397db231b..000000000 --- a/files/templates/events/homoween/awards_poor.html +++ /dev/null @@ -1,17 +0,0 @@ - - -{% if p.award_count("fog", v) %} -
-{% endif %} - -{% if p.award_count("stab", v) %} -
-{% endif %} - -{% if p.award_count("haunt", v) %} - -{% endif %} - -{% if p.award_count("flashlight", v) %} -
-{% endif %} diff --git a/files/templates/post.html b/files/templates/post.html index 691f67bd3..4a9aa2765 100644 --- a/files/templates/post.html +++ b/files/templates/post.html @@ -15,14 +15,12 @@ {% endif %} {% block head_final %} - {% include "awards.html" %} - {% if IS_FISTMAS() %} - {% include "events/fistmas/awards.html" %} - {% elif IS_HOMOWEEN() %} - {% if not (v and v.poor) %} + {% if not (v and v.poor) %} + {% include "awards.html" %} + {% if IS_FISTMAS() %} + {% include "events/fistmas/awards.html" %} + {% elif IS_HOMOWEEN() %} {% include "events/homoween/awards.html" %} - {% else %} - {% include "events/homoween/awards_poor.html" %} {% endif %} {% endif %} {% endblock %}