From e8c279dcbdd9a004aff4758caf5a79946de724f6 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 18 Oct 2021 20:09:02 +0200 Subject: [PATCH] sdffsd --- files/classes/award.py | 2 +- files/classes/badges.py | 2 +- files/classes/user.py | 2 +- files/routes/awards.py | 6 +++--- files/templates/award_modal.html | 2 +- files/templates/comments.html | 6 +++--- files/templates/submission.html | 6 +++--- files/templates/submission_listing.html | 10 +++++++--- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/files/classes/award.py b/files/classes/award.py index f321ad1cc..c156adf83 100755 --- a/files/classes/award.py +++ b/files/classes/award.py @@ -35,7 +35,7 @@ if site_name == "Drama": "grass": { "kind": "grass", "title": "Grass", - "description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)", + "description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)", "icon": "fas fa-seedling", "color": "text-success", "price": 500 diff --git a/files/classes/badges.py b/files/classes/badges.py index bedf59866..07c291bc8 100755 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -63,7 +63,7 @@ class Badge(Base): if self.name == "Agendaposter": ti = self.user.agendaposter_expires_utc if ti: return self.badge.description + " until " + datetime.utcfromtimestamp(ti).strftime('%Y-%m-%d %H:%M:%S') - else: return self.badge.description + " permenantly" + else: return self.badge.description + " permanently" elif self.description: return self.description else: return self.badge.description diff --git a/files/classes/user.py b/files/classes/user.py index cf6f430c1..9a189fa27 100755 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -52,7 +52,7 @@ if site_name == "Drama": "grass": { "kind": "grass", "title": "Grass", - "description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)", + "description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)", "icon": "fas fa-seedling", "color": "text-success", "price": 500 diff --git a/files/routes/awards.py b/files/routes/awards.py index 07d6886a9..c410c8759 100755 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -39,7 +39,7 @@ def shop(v): "grass": { "kind": "grass", "title": "Grass", - "description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)", + "description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)", "icon": "fas fa-seedling", "color": "text-success", "price": 500 @@ -124,7 +124,7 @@ def buy(v, award): "grass": { "kind": "grass", "title": "Grass", - "description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)", + "description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)", "icon": "fas fa-seedling", "color": "text-success", "price": 500 @@ -197,7 +197,7 @@ def grass_trigger(post=None, comment=None): link = f"[this post]({post.permalink})" if post else f"[this comment]({comment.permalink})" author.ban(reason="grass award used") - send_notification(NOTIFICATIONS_ACCOUNT, author, f"Your account has been suspended permenantly for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!") + send_notification(NOTIFICATIONS_ACCOUNT, author, f"Your account has been suspended permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!") ACTIONS = { "ban": banaward_trigger, diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index e38035e68..d317d8c93 100755 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -64,7 +64,7 @@ @media (min-width: 767.98px) { .award-columns { - column-count: 3 !important; + column-count: 4 !important; } } \ No newline at end of file diff --git a/files/templates/comments.html b/files/templates/comments.html index aa7dddec0..90cfe5efa 100755 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -126,13 +126,13 @@ {{c.author.post_count}} posts - + {{c.author.comment_count}} comments - + {{c.author.coins}} - dramacoins + coins      diff --git a/files/templates/submission.html b/files/templates/submission.html index 3cd2d16a3..d3399cd52 100755 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -181,13 +181,13 @@ {{p.author.post_count}} posts - + {{p.author.comment_count}} comments - + {{p.author.coins}} - dramacoins + coins      diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index d2bcc410a..8f2c26d66 100755 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -41,6 +41,10 @@
{{p.author.username}}
+ {% if p.author.id != 995 %}Unfollow{% endif %} + Follow + + Unblock
@@ -51,13 +55,13 @@ {{p.author.post_count}} posts - + {{p.author.comment_count}} comments - + {{p.author.coins}} - dramacoins + coins