diff --git a/files/templates/default.html b/files/templates/default.html index ba65a4df7..7be3cdd86 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 EVENT_BANNER and not sub %} - {% include 'event/' + EVENT_BANNER %} + {% include 'event/' ~ EVENT_BANNER %} {% else %} {% if err and SITE_NAME == 'rDrama' %} {% set src = "banner_error.webp" | asset_siteimg %} diff --git a/files/templates/header.html b/files/templates/header.html index 3284a91ab..3f15014d9 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -341,7 +341,7 @@ {% endif %}
  • {% if has_sidebar %} - {% include "sidebar_" + SITE_NAME + ".html" %} + {% include "sidebar_" ~ SITE_NAME ~ ".html" %} {% endif %}
  • diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html index b06ec5340..e6167fac6 100644 --- a/files/templates/login/sign_up.html +++ b/files/templates/login/sign_up.html @@ -1,6 +1,6 @@ {%- extends 'login/authforms.html' -%} {% block pagetitle -%} -{{ref_user.username + " invites you to " + SITE_NAME if ref_user else "Sign Up"}} +{{ref_user.username ~ " invites you to " ~ SITE_NAME if ref_user else "Sign Up"}} {%- endblock %} {% block pagetype %}login{% endblock %} diff --git a/files/templates/sidebar.html b/files/templates/sidebar.html index 24913161c..4d51a455c 100644 --- a/files/templates/sidebar.html +++ b/files/templates/sidebar.html @@ -5,7 +5,7 @@

    Sidebar

    diff --git a/files/templates/util/html_head.html b/files/templates/util/html_head.html index cb50eec8d..521fbeb30 100644 --- a/files/templates/util/html_head.html +++ b/files/templates/util/html_head.html @@ -42,13 +42,13 @@ {% elif '@' in request.path and u %} {% set author, a_author, published, url, title, image, section = - '@'+u.username, - '@'+u.username, + '@'~u.username, + '@'~u.username, u.created_date, u.url, - u.username + "'s profile", + u.username ~ "'s profile", u.banner_url, - u.username + "'s profile" %} + u.username ~ "'s profile" %} {% set description %} {{u.coins}} coins - Joined {{u.created_date}} - @@ -81,7 +81,7 @@ - + {% if not comment_info %} @@ -100,7 +100,7 @@ - + {% endmacro %} diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index 8e7ed5819..71977d860 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -12,9 +12,9 @@ {%- macro live_banner() -%} {% set path = "files/assets/images/" ~ SITE_NAME %} - {%- if not v and os_path.exists(path + "/cached.webp") -%} + {%- if not v and os_path.exists(path ~ "/cached.webp") -%} {{ 'cached.webp' | asset_siteimg -}} - {% elif os_path.exists(path + "/banners") -%} + {% elif os_path.exists(path ~ "/banners") -%} {{ random_image("banners") -}} {% else -%} {{ 'banner.webp' | asset_siteimg -}} @@ -23,7 +23,7 @@ {%- macro random_image(assetdir) -%} {% set path = "assets/images/" ~ SITE_NAME ~ "/" ~ assetdir -%} - {{- "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' }} + {{- "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?v=45' }} {%- endmacro -%} {% macro post_meta(p) %}