From 20cc20d806c71f4cd4c36947cb5b33ed2b4311dd Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 21 May 2022 14:36:22 +0200 Subject: [PATCH] fsd --- files/classes/user.py | 3 ++- files/templates/authforms.html | 4 ++-- files/templates/chat.html | 2 +- files/templates/comments.html | 2 +- files/templates/default.html | 8 ++++---- files/templates/header.html | 9 +++++++++ files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 ++-- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submission.html | 2 +- files/templates/submission_listing.html | 2 +- files/templates/submit.html | 4 ++-- 16 files changed, 32 insertions(+), 22 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 31ba523374..0f0680416e 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -188,7 +188,8 @@ class User(Base): @property @lazy def is_cakeday(self): - if SITE_NAME != 'rDrama': return False + if SITE_NAME == 'rDrama': return True + else: return False if time.time() - self.created_utc > 363 * 86400: date = time.strftime("%d %b", time.gmtime(self.created_utc)) now = time.strftime("%d %b", time.gmtime()) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 27f6eef39f..4166db33fb 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/chat.html b/files/templates/chat.html index 9c88ed147e..44bbb930f4 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -14,7 +14,7 @@ Chat - + {% if v.css %} diff --git a/files/templates/comments.html b/files/templates/comments.html index 1e0a9aaea2..29fd6a7700 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -207,7 +207,7 @@ {% if not c.author %} {{c.print()}} {% endif %} - {% if c.author.is_cakeday or True %}{% endif %}{{c.author_name}} + {% if c.author.is_cakeday %}{% endif %}{{c.author_name}} {% if c.author.customtitle %}  {{c.author.customtitle | safe}}{% endif %} {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 4e7ebdddb5..90871f4e5a 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -8,9 +8,9 @@ {% if v %} - + - + {% if v.agendaposter %} - + - + {% endif %} {% if request.path == '/catalog' %} diff --git a/files/templates/header.html b/files/templates/header.html index 8c9c9cc5aa..27840a621a 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -8,6 +8,15 @@ padding-top: 69.55px !important } } + + /* Birthgay specific */ + #navbar i, #navbar .nav-link { + text-shadow: 1px 1px 0 black, 1px -1px 0 black, -1px 1px 0 black, -1px -1px 0 black; + } + .navbar-light .navbar-nav .nav-link, .navbar-light .navbar-nav .nav-link:hover { + color: #FFF !important; + } + /* End birthgay specific */ {% else %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/login.html b/files/templates/login.html index 6c632982d4..103dc4b8df 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -18,7 +18,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 892a253b9f..a546267d14 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 7b317ea8d1..b748bead42 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 41ddf4d7bf..9a83565dcc 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 52112e0674..e77510b0af 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submission.html b/files/templates/submission.html index dae55011ab..21af7dc611 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -713,7 +713,7 @@ {% if p.author.verified %} {% endif %} - {% if p.author.is_cakeday or True %}{% endif %}{{p.author_name}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %} + {% if p.author.is_cakeday %}{% endif %}{{p.author_name}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %} {% endif %}  {{p.age_string}} ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.domain %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 273511ae7f..c248073312 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -186,7 +186,7 @@ {% if p.author.verified %} {% endif %} - {% if p.author.is_cakeday or True %}{% endif %}{{p.author_name}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %} + {% if p.author.is_cakeday %}{% endif %}{{p.author_name}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %} {% endif %}  {{p.age_string}}   diff --git a/files/templates/submit.html b/files/templates/submit.html index cf77a6b9c6..c3954b2cd5 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}