diff --git a/files/helpers/assetcache.py b/files/helpers/assetcache.py index ee0e0da50..4b3334d22 100644 --- a/files/helpers/assetcache.py +++ b/files/helpers/assetcache.py @@ -13,9 +13,9 @@ ASSET_URL = '/assets/' ASSET_CACHE = defaultdict(lambda: None) if IS_DKD(): - ASSET_SUBDIRS.extend(['/DKD/js']) + ASSET_SUBDIRS.extend(['/events/DKD/js']) elif IS_FISTMAS(): - ASSET_SUBDIRS.extend(['/fistmas/css', '/fistmas/css/themes', '/fistmas/js', '/fistmas/js/vendor']) + ASSET_SUBDIRS.extend(['/events/fistmas/css', '/events/fistmas/css/themes', '/events/fistmas/js', '/events/fistmas/js/vendor']) def assetcache_build(asset_dir, subdirs): for subdir in subdirs: diff --git a/files/templates/default.html b/files/templates/default.html index 889ba58f1..bb640f01d 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -5,7 +5,7 @@ {% include "modals/expanded_image.html" %} {% if err or '@' not in request.path %} {% if IS_FISTMAS() and not sub %} - {% include 'fistmas/banner.html' %} + {% include 'events/fistmas/banner.html' %} {% else %} {% if IS_BIRTHGAY() and not sub %} {% set src = macros.random_image("assets/events/birthgay/images/banners/" ~ SITE_NAME) %} @@ -101,9 +101,9 @@ {% endif %} {% if IS_DKD() %} - {% include "DKD/music.html" %} + {% include "events/DKD/music.html" %} {% elif IS_FISTMAS() %} - {% include "fistmas/music.html" %} + {% include "events/fistmas/music.html" %} {% endif %} {% endblock %} diff --git a/files/templates/DKD/music.html b/files/templates/events/DKD/music.html similarity index 82% rename from files/templates/DKD/music.html rename to files/templates/events/DKD/music.html index ab4e8e0a4..31eaae2bc 100644 --- a/files/templates/DKD/music.html +++ b/files/templates/events/DKD/music.html @@ -4,5 +4,5 @@ {% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?x=1' %} {% endif %} - + {% endif %} diff --git a/files/templates/fistmas/awards.html b/files/templates/events/fistmas/awards.html similarity index 62% rename from files/templates/fistmas/awards.html rename to files/templates/events/fistmas/awards.html index c76bc281a..ee7f44ac6 100644 --- a/files/templates/fistmas/awards.html +++ b/files/templates/events/fistmas/awards.html @@ -8,24 +8,24 @@ {# idk why snow isn't working vvvvvvvvvv #} {% if p.award_count("snow", v) %} - + {% endif %} {% if p.award_count("frostbite", v) %}
- - + + {% endif %} {% if p.award_count("lights", v) %} - + {% endif %} {% if p.award_count("candycane", v) %} - + {% endif %} {% if p.award_count("fireplace", v) %} - + {% endif %} diff --git a/files/templates/fistmas/banner.html b/files/templates/events/fistmas/banner.html similarity index 62% rename from files/templates/fistmas/banner.html rename to files/templates/events/fistmas/banner.html index f6644a2ba..e4feeef44 100644 --- a/files/templates/fistmas/banner.html +++ b/files/templates/events/fistmas/banner.html @@ -1,16 +1,16 @@ {% if request.path == '/' %} - + {% endif %} {% if SITE_NAME == 'rDrama' and range(1, 20)|random() == 1 %}