diff --git a/files/events/helpers/jinja.py b/files/events/helpers/jinja.py index 4d6ef2f1f..b2f103f09 100644 --- a/files/events/helpers/jinja.py +++ b/files/events/helpers/jinja.py @@ -9,7 +9,6 @@ def user_event_darkmode(target, db): EVENT_JINJA_CONST = { "EVENT_BANNER": "banner_rDrama.html", "EVENT_ICONS": True, - "EVENT_SIDEBAR": True, "EVENT_STYLES": "blizzard.css", "EVENT_AWARDS": True, "EVENT_MUSIC": "music.html", diff --git a/files/templates/default.html b/files/templates/default.html index 4c400f557..544d054d7 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -47,7 +47,7 @@ {% block sidebar %} {% if has_sidebar and (home or p) %} {% set sidebar = "sidebar_" ~ SITE_NAME ~ ".html" %} - {% include sidebar if not EVENT_SIDEBAR else 'event/' ~ sidebar %} + {% include sidebar %} {% endif %} {% endblock %} diff --git a/files/templates/event/sidebar_WPD.html b/files/templates/event/sidebar_WPD.html deleted file mode 100644 index a2309877e..000000000 --- a/files/templates/event/sidebar_WPD.html +++ /dev/null @@ -1,77 +0,0 @@ -
- - {%- if v -%} - {%- set art_image = macros.random_image("assets/images/" ~ SITE_NAME ~ "/sidebar") -%} - {%- else -%} - {%- set art_image = '/i/' ~ SITE_NAME ~ '/sidebar.webp?v=3000' -%} - {%- endif -%} - - {% if request.path != '/sidebar' %} - - sidebar image - - {% endif %} - -

- - - - - - - - - -

- - {% if sub and sub.sidebar_html %} -
{{sub.sidebar_html|safe}}
- {% endif %} - -
- Accident - Suicide - Animal - Beating - Bladed - Beheading - Vehicle - Medical - Shooting - Falling - Explosions - Industrial - Electricity - Burning - Drowning - Cartel - ISIS - Execution - Maiming - Police - Combat - Other - Compilation - Request -
-
-
- Gore - Aftermath - Self-Harm -
-
-
- Meta - Discussion - Social - Music -
- -
- {% set rules = "rules_" ~ SITE_NAME ~ ".html" %} - {% include rules %} -
-
- -{% include "event/music.html" %} diff --git a/files/templates/event/sidebar_rDrama.html b/files/templates/event/sidebar_rDrama.html deleted file mode 100644 index d10f91ac2..000000000 --- a/files/templates/event/sidebar_rDrama.html +++ /dev/null @@ -1,63 +0,0 @@ -
- - {% if sub %} - {% set image = sub.sidebar_url %} - {% else %} - {% set sidebar_path = "assets/event/images/sidebar" %} - {% set selected_image = listdir('files/' ~ sidebar_path)|random() %} - {% set image = "/" ~ sidebar_path ~ "/" ~ selected_image ~ '?v=45' %} - {% endif %} - - {% if request.path != '/sidebar' %} - - sidebar image - - {% endif %} - -

- - - - - - - - -

- - - - {% if sub %} - {% if sub.sidebar_html %} -
{{sub.sidebar_html|safe}}
- {% endif %} - {% if v %} - BROWSE {{HOLE_NAME|upper}}S - {% if v.can_create_hole -%} - CREATE {{HOLE_NAME|upper}} - {%- endif %} - {{HOLE_NAME|upper}} LOG - {% if v.mods(sub.name) %} - {{HOLE_NAME|upper}} SETTINGS - {% endif %} - {% endif %} - {{HOLE_NAME|upper}} MODS - {{HOLE_NAME|upper}} EXILEES - {% else %} - - DIRECTORY - Submit Marseys & Art | Info Megathreads - - BROWSE {{HOLE_NAME|upper}}S - {% if v and v.can_create_hole -%} - CREATE {{HOLE_NAME|upper}} - {%- endif %} - -
- {% set rules = "rules_" ~ SITE_NAME ~ ".html" %} - {% include rules %} -
- {% endif %} -
- -{% include "event/music.html" %} diff --git a/files/templates/header.html b/files/templates/header.html index 845010997..65d6b0f42 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -344,7 +344,7 @@
  • {% if has_sidebar %} {% set sidebar = "sidebar_" ~ SITE_NAME ~ ".html" %} - {% include sidebar if not EVENT_SIDEBAR else 'event/' ~ sidebar %} + {% include sidebar %} {% endif %}
    • diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 943830169..b17aeb01c 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -19,6 +19,9 @@ + {% if HOLIDAY_EVENT %} + + {% endif %}

    {% if sub and sub.sidebar_html %} @@ -70,3 +73,8 @@ {% include rules %} + +{% if HOLIDAY_EVENT %} + + {% include "event/music.html" %} +{% endif %} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 8f8d40ca9..98c73d7c0 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -2,6 +2,8 @@ {% if sub %} {% set image=sub.sidebar_url %} + {% elif HOLIDAY_EVENT %} + {% set image = macros.random_image("assets/event/images/sidebar") %} {% else %} {% set image = macros.random_image("assets/images/" ~ SITE_NAME ~ "/sidebar") %} {% endif %} @@ -26,6 +28,9 @@ + {% if HOLIDAY_EVENT %} + + {% endif %}

    {% if sub %} @@ -60,3 +65,8 @@ {% endif %} + +{% if HOLIDAY_EVENT %} + + {% include "event/music.html" %} +{% endif %}