diff --git a/.gitignore b/.gitignore index 46b4e3be0..505f234d0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ chart.png video.mp4 video.webm cache/ -images/ -songs/ +/images/ +/songs/ __pycache__/ disablesignups *rules.html diff --git a/files/routes/posts.py b/files/routes/posts.py index 0db0943f0..e2011e5c1 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -187,7 +187,7 @@ def post_id(pid, anything=None, v=None): offset = 0 - if post.comment_count > 60: + if not request.headers.get("Authorization") and post.comment_count > 60: comments2 = [] count = 0 if post.created_utc > 1638672040: diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 804ebf0ee..197641037 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -14,11 +14,11 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 63ebda978..35d81cee6 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,11 +6,11 @@ {% block content %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %}
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index cd9fb3e6c..ef032638a 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 9e09b8290..c5ccf5a1f 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -174,6 +174,8 @@
+ + {% if v %} {% include "/modals/Modal2FA.html" %} {% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 73ef514c0..b7c871b67 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -38,10 +38,10 @@ {% if v %} - + {% else %} - + {% endif %} @@ -149,6 +149,8 @@ + + {% block mobilenavbar %} {% include "mobile_navigation_bar.html" %} {% endblock %} diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index e39bd6405..1bd6cb67b 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -10,6 +10,19 @@
+

Grinch Mode

+ +
+ +
+ + +
+ +
+

Highlight New Comments

diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 1fea4148f..9b6c9a265 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/submission/SubmissionAwards.html b/files/templates/submission/SubmissionAwards.html index 484456458..521370ba3 100644 --- a/files/templates/submission/SubmissionAwards.html +++ b/files/templates/submission/SubmissionAwards.html @@ -120,7 +120,7 @@ {% endif %} -{% if v and not v.grinch %} +{% if v and not v.grincheffect %} {% if p.award_count("snow") and p.award_count("fireplace") %} {% elif p.award_count("fireplace")%}