From b5bb1d5364181e5a0c0350588efa10238910bf07 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 29 Dec 2021 17:54:50 +0200 Subject: [PATCH] ggf --- files/templates/authforms.html | 4 +- files/templates/default.html | 4 +- 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_listing.html | 90 ++++++++++++++----------- files/templates/submit.html | 4 +- 11 files changed, 67 insertions(+), 53 deletions(-) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 546b948e6..1e432162a 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 4098e2de7..e84ed1873 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 9ead74dcb..4dedd59b0 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index 7d995a5e5..0aadb5a4d 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 57b1a8b4b..98335024e 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index e911adb83..1ab76c94a 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 6ebbccd33..ea1b2f085 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' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 23f55e86c..c9669ac3a 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' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 7cc354c06..4f13f2771 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -253,54 +253,68 @@ {% endif %} {% endif %} - {% if v and v.admin_level > 0 %} - Pin - Unpin - {% if v==p.author %} - Distinguish - Undistinguish - {% endif %} - {% endif %} +
  • + +
      - {% if v %} - {% if v.admin_level > 1 or v.id == p.author.id and v.club_allowed != False %} - Mark club - Unmark club - {% endif %} - {% if v.admin_level > 1 %} - {% if "/reported/" in request.path %} - {% if v.id != p.author.id %}Remove{% endif %} - Approve - {% else %} - {% if v.id != p.author.id %}Remove{% endif %} - Approve + {% if v and v.admin_level > 0 %} + Pin + Unpin + {% if v==p.author %} + Distinguish + Undistinguish + {% endif %} {% endif %} - {% endif %} + + {% if v %} + {% if v.admin_level > 1 or v.id == p.author.id and v.club_allowed != False %} + Mark club + Unmark club + {% endif %} + + {% if v.admin_level > 1 %} + {% if "/reported/" in request.path %} + {% if v.id != p.author.id %}Remove{% endif %} + Approve + {% else %} + {% if v.id != p.author.id %}Remove{% endif %} + Approve + {% endif %} + {% endif %} - {% if v.admin_level > 1 and p.oauth_app %} - API App - {% endif %} + {% if v.admin_level > 1 and p.oauth_app %} + API App + {% endif %} - {% if not v.id==p.author_id %} - Unblock user + {% if not v.id==p.author_id %} + Unblock user - Are you sure? + Are you sure? - Block user - {% endif %} + Block user + {% endif %} - {% if v and (v.id==p.author_id or v.admin_level > 1) %} - Mark +18 - Unmark +18 - {% endif %} + {% if v and (v.id==p.author_id or v.admin_level > 1) %} + Mark +18 + Unmark +18 + {% endif %} - {% if v.admin_level > 1 and v.id!=p.author_id %} - Ban user - Unban user - {% endif %} - {% endif %} + {% if v.admin_level > 1 and v.id!=p.author_id %} + Ban user + Unban user + {% endif %} + {% endif %} + + + + + +
    +
    • diff --git a/files/templates/submit.html b/files/templates/submit.html index 4d20716b7..e5f6058a8 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}