From 4c7f194067040819f1a8d2ec9ef576900544db84 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 6 Feb 2022 12:45:17 +0200 Subject: [PATCH] fsd --- files/helpers/jinja2.py | 2 +- files/templates/authforms.html | 2 +- files/templates/default.html | 4 +-- files/templates/header.html | 33 ++++++++++++++++--------- files/templates/home.html | 2 +- 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/settings_blocks.html | 2 +- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submit.html | 4 +-- 14 files changed, 39 insertions(+), 28 deletions(-) diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py index e409ac5a6..e487c9d45 100644 --- a/files/helpers/jinja2.py +++ b/files/helpers/jinja2.py @@ -16,4 +16,4 @@ def post_embed(id, v): @app.context_processor def inject_constants(): - return {"environ":environ, "SITE_NAME":SITE_NAME, "AUTOJANNY_ID":AUTOJANNY_ID, "NOTIFICATIONS_ID":NOTIFICATIONS_ID, "PUSHER_ID":PUSHER_ID, "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, "config":app.config.get, "DEFAULT_COLOR":DEFAULT_COLOR, "COLORS":COLORS, "SUBS": SUBS} + return {"environ":environ, "SITE_NAME":SITE_NAME, "SITE_FULL":SITE_FULL, "AUTOJANNY_ID":AUTOJANNY_ID, "NOTIFICATIONS_ID":NOTIFICATIONS_ID, "PUSHER_ID":PUSHER_ID, "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, "config":app.config.get, "DEFAULT_COLOR":DEFAULT_COLOR, "COLORS":COLORS, "SUBS": SUBS} diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 4eaf7ac58..3040392b6 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index 5ca852eb2..7ee700cb1 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -10,6 +10,11 @@ {% elif SITE_NAME == '2Much4You' %}
{% for s in SUBS %} @@ -19,6 +24,11 @@ {% else %} {% endif %} + + {% if v %} + {% if v.notifications_count %} + {{v.notifications_count}} + {% else %} + + {% endif %} + {% endif %} + {% if not err %} {% if v and v.admin_level > 1 %} @@ -61,9 +80,6 @@
- +
Android app @@ -188,15 +204,10 @@ @{{v.username}}
  • - - Inbox - {% if v.notifications_count %} - - {% endif %} - + Settings
  • - Settings + Invite friends
    • Android app diff --git a/files/templates/home.html b/files/templates/home.html index 2e7143cbf..2cfd60677 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -2,7 +2,7 @@ {% block desktopBanner %} -{% if v %} +{% if v and environ.get("FP") %} {% if not v.fp %}