diff --git a/files/classes/comment.py b/files/classes/comment.py index 3bae7836c..a2d9fba08 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -169,16 +169,10 @@ class Comment(Base): years = int(months / 12) return f"{years}yr ago" - if SITE_NAME == 'Too4You': - @property - @lazy - def score(self): - return self.upvotes - else: - @property - @lazy - def score(self): - return self.upvotes - self.downvotes + @property + @lazy + def score(self): + return self.upvotes - self.downvotes @property @lazy diff --git a/files/classes/submission.py b/files/classes/submission.py index 6c1eb9567..dcd10be6d 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -180,16 +180,10 @@ class Submission(Base): return str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.edited_utc))) - if SITE_NAME == 'Too4You': - @property - @lazy - def score(self): - return self.upvotes - else: - @property - @lazy - def score(self): - return self.upvotes - self.downvotes + @property + @lazy + def score(self): + return self.upvotes - self.downvotes @property @lazy diff --git a/files/helpers/const.py b/files/helpers/const.py index 96b7c1cd3..c9af1bcdb 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -230,7 +230,7 @@ else: PUSHER_ID = environ.get("PUSHER_ID", "").strip() PUSHER_KEY = environ.get("PUSHER_KEY", "").strip() DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "fff").strip() -COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58', DEFAULT_COLOR} +COLORS = {'ff66ac','805ad5','62ca56','38a169','80ffff','2a96f3','eb4963','ff0000','f39731','30409f','3e98a7','e4432d','7b9ae4','ec72de','7f8fa6', 'f8db58','8cdbe6', DEFAULT_COLOR} AWARDS = { "snow": { diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 0cbbc61c2..72b37ba34 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 3c0860a38..63907c73e 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,8 +7,8 @@ {% if v %} - - + + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 3fff571ad..27d950b2b 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}