From f4bddbbca0033b3ddf742d10af4932dff0cd26ac Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 8 Oct 2021 18:06:15 +0200 Subject: [PATCH] dsf --- files/__main__.py | 2 +- files/templates/authforms.html | 6 ++++-- files/templates/default.html | 4 +++- files/templates/log.html | 4 +++- files/templates/login.html | 1 + files/templates/login_2fa.html | 5 ++--- files/templates/settings.html | 4 ++-- files/templates/sign_up.html | 3 ++- files/templates/sign_up_failed_ref.html | 3 ++- files/templates/submit.html | 4 +++- files/templates/userpage.html | 4 +++- 11 files changed, 26 insertions(+), 14 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index cce320c6e8..57025e2968 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -40,7 +40,7 @@ app.config["PERMANENT_SESSION_LIFETIME"] = 60 * 60 * 24 * 365 app.config["SESSION_REFRESH_EACH_REQUEST"] = True app.config["SLOGAN"] = environ.get("SLOGAN", "").strip() app.config["DEFAULT_COLOR"] = environ.get("DEFAULT_COLOR", "ff0000").strip() -app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "light").strip() + "_" + environ.get("DEFAULT_COLOR", "ff0000").strip() +app.config["DEFAULT_THEME"] = environ.get("DEFAULT_THEME", "midnight").strip() app.config["FORCE_HTTPS"] = int(environ.get("FORCE_HTTPS", 1)) if ("localhost" not in app.config["SERVER_NAME"] and "127.0.0.1" not in app.config["SERVER_NAME"]) else 0 app.config["UserAgent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36" app.config["HCAPTCHA_SITEKEY"] = environ.get("HCAPTCHA_SITEKEY","").strip() diff --git a/files/templates/authforms.html b/files/templates/authforms.html index c7a0bdb2b0..c0f0a5ce00 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -13,10 +13,12 @@ - {% if v %} - + {% if v %} + + {% if v.agendaposter %}{% endif %} {% else %} + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 3bf6898770..9f60bbc3b9 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -249,9 +249,11 @@ {% block stylesheets %} {% if v %} - + + {% if v.agendaposter %}{% endif %} {% else %} + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index f5661ae640..6c91c45b79 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -16,9 +16,11 @@ {% if v %} - + + {% if v.agendaposter %}{% endif %} {% else %} + {% endif %} diff --git a/files/templates/login.html b/files/templates/login.html index 62c95fc650..9423cd651e 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -15,6 +15,7 @@ + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 62ad326427..f041387dbd 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -11,9 +11,8 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - - - + + diff --git a/files/templates/settings.html b/files/templates/settings.html index 5d7f5fdffe..75aee63ab8 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -65,8 +65,8 @@ - - + + {% if v.agendaposter %}{% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 2b31f9991b..c6b2628028 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -35,7 +35,8 @@ - + + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 51b22861f5..4a7e8eb099 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -30,7 +30,8 @@ - + + diff --git a/files/templates/submit.html b/files/templates/submit.html index 5c2eccd418..2a700174af 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -24,9 +24,11 @@ {% block stylesheets %} {% if v %} - + + {% if v.agendaposter %}{% endif %} {% else %} + {% endif %} {% endblock %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 56f28f9388..b70b1ae4a5 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -3,9 +3,11 @@ {% if u and u.profilecss %} {% block stylesheets %} {% if v %} - + + {% if v.agendaposter %}{% endif %} {% else %} + {% endif %} {% if u and u.profilecss %}