same as last commit

pull/54/head
Aevann1 2022-12-07 11:03:02 +02:00
parent e4b102873d
commit fee6e7150b
6 changed files with 13 additions and 13 deletions

View File

@ -5,7 +5,7 @@
{% include "modals/expanded_image.html" %} {% include "modals/expanded_image.html" %}
{% if err or '@' not in request.path %} {% if err or '@' not in request.path %}
{% if EVENT_BANNER and not sub %} {% if EVENT_BANNER and not sub %}
{% include 'event/' + EVENT_BANNER %} {% include 'event/' ~ EVENT_BANNER %}
{% else %} {% else %}
{% if err and SITE_NAME == 'rDrama' %} {% if err and SITE_NAME == 'rDrama' %}
{% set src = "banner_error.webp" | asset_siteimg %} {% set src = "banner_error.webp" | asset_siteimg %}

View File

@ -341,7 +341,7 @@
{% endif %} {% endif %}
<li class="mt-3"> <li class="mt-3">
{% if has_sidebar %} {% if has_sidebar %}
{% include "sidebar_" + SITE_NAME + ".html" %} {% include "sidebar_" ~ SITE_NAME ~ ".html" %}
{% endif %} {% endif %}
</li> </li>
</ul> </ul>

View File

@ -1,6 +1,6 @@
{%- extends 'login/authforms.html' -%} {%- extends 'login/authforms.html' -%}
{% block pagetitle -%} {% 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 %} {%- endblock %}
{% block pagetype %}login{% endblock %} {% block pagetype %}login{% endblock %}

View File

@ -5,7 +5,7 @@
<h1 class="text-muted text-uppercase">Sidebar</h5> <h1 class="text-muted text-uppercase">Sidebar</h5>
<div id="sidebar" class="my-3"> <div id="sidebar" class="my-3">
{% if has_sidebar %} {% if has_sidebar %}
{% include "sidebar_" + SITE_NAME + ".html" %} {% include "sidebar_" ~ SITE_NAME ~ ".html" %}
{% endif %} {% endif %}
</div> </div>
</div> </div>

View File

@ -42,13 +42,13 @@
{% elif '@' in request.path and u %} {% elif '@' in request.path and u %}
{% set author, a_author, published, url, title, image, section = {% set author, a_author, published, url, title, image, section =
'@'+u.username, '@'~u.username,
'@'+u.username, '@'~u.username,
u.created_date, u.created_date,
u.url, u.url,
u.username + "'s profile", u.username ~ "'s profile",
u.banner_url, u.banner_url,
u.username + "'s profile" %} u.username ~ "'s profile" %}
{% set description %} {% set description %}
{{u.coins}} coins - Joined {{u.created_date}} - {{u.coins}} coins - Joined {{u.created_date}} -
@ -81,7 +81,7 @@
<meta property="og:title" content="{{title}}"> <meta property="og:title" content="{{title}}">
<meta property="og:author" name="author" content="{{author | default(SITE_FULL, true)}}"> <meta property="og:author" name="author" content="{{author | default(SITE_FULL, true)}}">
<meta property="og:description" name="description" content="{{description | default(SITE_NAME + ' - ' + DESCRIPTION)}}"> <meta property="og:description" name="description" content="{{description | default(SITE_NAME ~ ' - ' ~ DESCRIPTION)}}">
{% if not comment_info %} {% if not comment_info %}
<meta property="og:image" content="{{image | default('site_preview.webp' | asset_siteimg)}}"> <meta property="og:image" content="{{image | default('site_preview.webp' | asset_siteimg)}}">
@ -100,7 +100,7 @@
<meta name="twitter:title" content="{{title}}"> <meta name="twitter:title" content="{{title}}">
<meta name="twitter:creator" content="{{author | default(SITE_FULL)}}"> <meta name="twitter:creator" content="{{author | default(SITE_FULL)}}">
<meta name="twitter:description" content="{{description | default(SITE_NAME + ' - ' + DESCRIPTION)}}"> <meta name="twitter:description" content="{{description | default(SITE_NAME ~ ' - ' ~ DESCRIPTION)}}">
<meta name="twitter:url" content="{{url}}"> <meta name="twitter:url" content="{{url}}">
{% endmacro %} {% endmacro %}

View File

@ -12,9 +12,9 @@
{%- macro live_banner() -%} {%- macro live_banner() -%}
{% set path = "files/assets/images/" ~ SITE_NAME %} {% 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 -}} {{ 'cached.webp' | asset_siteimg -}}
{% elif os_path.exists(path + "/banners") -%} {% elif os_path.exists(path ~ "/banners") -%}
{{ random_image("banners") -}} {{ random_image("banners") -}}
{% else -%} {% else -%}
{{ 'banner.webp' | asset_siteimg -}} {{ 'banner.webp' | asset_siteimg -}}
@ -23,7 +23,7 @@
{%- macro random_image(assetdir) -%} {%- macro random_image(assetdir) -%}
{% set path = "assets/images/" ~ SITE_NAME ~ "/" ~ assetdir -%} {% set path = "assets/images/" ~ SITE_NAME ~ "/" ~ assetdir -%}
{{- "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' }} {{- "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?v=45' }}
{%- endmacro -%} {%- endmacro -%}
{% macro post_meta(p) %} {% macro post_meta(p) %}