From 8f3be744e48ba8c4fe82500242a3f2c2a117a5de Mon Sep 17 00:00:00 2001 From: Aevann Date: Mon, 25 Dec 2023 01:05:02 +0200 Subject: [PATCH] sandshit and slavshit --- files/assets/css/casino/game_screen.css | 13 -- files/assets/css/main.css | 17 ++- files/routes/front.py | 3 +- files/routes/votes.py | 2 + files/templates/casino/game_screen.html | 12 +- files/templates/casino/roulette_screen.html | 2 +- files/templates/home_comments.html | 6 - files/templates/post_actions.html | 13 +- files/templates/sidebar_WPD.html | 134 +++++++++++++------- 9 files changed, 121 insertions(+), 81 deletions(-) diff --git a/files/assets/css/casino/game_screen.css b/files/assets/css/casino/game_screen.css index dd138af2a..db792769c 100644 --- a/files/assets/css/casino/game_screen.css +++ b/files/assets/css/casino/game_screen.css @@ -1,16 +1,3 @@ -.game_screen-title { - display: flex; - align-items: center; - justify-content: center; - text-transform: uppercase; - opacity: 0.6; -} - -.game_screen-title hr { - flex: 1; - margin-left: 0.5rem; -} - #casinoGameResult { visibility: hidden; } diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 92ff1518e..09a1d7f71 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6249,8 +6249,8 @@ audio, video { .sidebar-wpd--holes--3 { grid-template-columns: repeat(3, 1fr); } -.sidebar-wpd--holes--2 { - grid-template-columns: repeat(2, 1fr); +.sidebar-wpd--holes--1 { + grid-template-columns: repeat(1, 1fr); } .sidebar-wpd--holes a { @@ -7579,3 +7579,16 @@ ul, ol { blink { animation: blink 1s infinite; } + +.hr-title { + display: flex; + align-items: center; + justify-content: center; + text-transform: uppercase; + opacity: 0.6; +} + +.hr-title hr { + flex: 1; + margin-left: 0.5rem; +} diff --git a/files/routes/front.py b/files/routes/front.py index 442520aac..57e36e638 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -89,7 +89,8 @@ def front_all(v, hole=None): LIMITED_WPD_HOLES = {'aftermath', 'fights', 'gore', 'medical', 'request', 'selfharm', 'discussion', 'meta', 'music', 'pets', 'social', - 'countryclub', 'highrollerclub'} + 'countryclub', 'highrollerclub', + 'slavshit', 'sandshit'} @cache.memoize() def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', gt=0, lt=0, hole=None, pins=True): diff --git a/files/routes/votes.py b/files/routes/votes.py index 06d4c5fc7..a595c261f 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -138,6 +138,8 @@ def vote_post_comment(target_id, new, v, cls, vote_cls): if SITE_NAME == 'rDrama': target.realupvotes = get_vote_count(0, True) # first arg is ignored here + elif target.hole in {'sandshit', 'slavshit'}: + target.realupvotes = target.upvotes + target.downvotes else: target.realupvotes = target.upvotes - target.downvotes diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html index cf43dd8f3..5916d7c94 100644 --- a/files/templates/casino/game_screen.html +++ b/files/templates/casino/game_screen.html @@ -8,7 +8,7 @@
-
+

{{game}}

@@ -27,14 +27,14 @@
-
+
Wager
-
+
Currency
@@ -63,14 +63,14 @@
-
+
{% block actiontext %}Actions{% endblock %}
{% block actions %} {% endblock %}
-
+
Feed
@@ -80,7 +80,7 @@
-
+
Leaders
diff --git a/files/templates/casino/roulette_screen.html b/files/templates/casino/roulette_screen.html index 705a4cc84..44e8b144f 100644 --- a/files/templates/casino/roulette_screen.html +++ b/files/templates/casino/roulette_screen.html @@ -36,7 +36,7 @@
-
+
How to Bet
diff --git a/files/templates/home_comments.html b/files/templates/home_comments.html index 05162590d..140cf3eba 100644 --- a/files/templates/home_comments.html +++ b/files/templates/home_comments.html @@ -14,18 +14,12 @@
-
-
- {% include "comments.html" %} -
- - {% endblock %} {% block pagenav %} diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html index a78188c77..ff694a5dc 100644 --- a/files/templates/post_actions.html +++ b/files/templates/post_actions.html @@ -33,6 +33,15 @@ {% endif %} +{% if p.hole %} + {% if not v %} + Block /h/{{p.hole}} + {% elif v.id != p.author_id %} + + + {% endif %} +{% endif %} + {% if v %}
    @@ -63,10 +72,6 @@ {% endif %} - {% if v.id != p.author_id and p.hole %} - - - {% endif %} {% if p.hole and v.mods(p.hole) %} {% if not p.author.mods(p.hole) %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index d61a97c6e..17883eb76 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -45,56 +45,94 @@
{% endif %} -
- Accident - Animal - Beating - Beheading - Bladed - Burning - Cartel - Combat - Compilation - Disaster - Drowning - Electricity - Execution - Explosions - Falling - Industrial - ISIS - Maiming - Police - Shooting - Suicide - Vehicle - Other -
+ {% if hole and hole.sidebar_html %} +
{{hole.sidebar_html|safe}}
+ {% else %} +
+
+
DEATH
+
+
+
+ Accident + Animal + Beating + Beheading + Bladed + Burning + Cartel + Combat + Compilation + Disaster + Drowning + Electricity + Execution + Explosions + Falling + Industrial + ISIS + Maiming + Police + Shooting + Suicide + Vehicle + Other +
-
- Aftermath - Fights - Gore - Medical - Request - Self-Harm -
+
+
+
GORE
+
+
+
+ Aftermath + Fights + Gore + Medical + Request + Self-Harm +
-
- Discussion - Meta - Music - Pets - Social -
+
+
+
SOCIAL
+
+
+
+ Discussion + Meta + Music + Pets + Social +
-
- {% set rules = "rules_" ~ SITE_NAME ~ ".html" %} - {% include rules %} -
+
+
+
ACTIVE CONFLICTS
+
+
+
+ + + Slavshit + + -
-
- Live commit: {{git_head()[0]}} -
+ + + Sandshit + + +
+ +
+ {% set rules = "rules_" ~ SITE_NAME ~ ".html" %} + {% include rules %} +
+ +
+
+ Live commit: {{git_head()[0]}} +
+ {% endif %}