rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

in jinja, convert some + instances to ~

pull/54/head
Aevann1 2022-12-07 10:59:40 +02:00
parent d01b5dfd9f
commit e4b102873d
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/events/templates/music.html
View File

@ -1,7 +1,7 @@
{% if not (v and v.poor) and (not g.event_v or g.event_v.event_music) and not (sub and sub.name == 'music') %}
{% if not song %}
{% set path = "assets/media/event/music" %}
{% set song = "/" + path + "/" + listdir('files/' + path)|random() + '?v=45' %}
{% set song = "/" ~ path ~ "/" ~ listdir('files/' ~ path)|random() ~ '?v=45' %}
{% endif %}
<script>
const audio = new Audio("{{song}}");

4
files/events/templates/sidebar_rDrama.html
View File

@ -4,8 +4,8 @@
{% set image = sub.sidebar_url %}
{% else %}
{% set sidebar_path = "assets/images/event/sidebar" %}
{% set selected_image = listdir('files/' + sidebar_path)|random() %}
{% set image = "/" + sidebar_path + "/" + selected_image + '?v=45' %}
{% set selected_image = listdir('files/' ~ sidebar_path)|random() %}
{% set image = "/" ~ sidebar_path ~ "/" ~ selected_image ~ '?v=45' %}
{% endif %}
{% if request.path != '/sidebar' %}

4
files/templates/default.html
View File

@ -38,8 +38,8 @@
</div>
{% block sidebar %}
{% if has_sidebar and (home or p) %}
{% set sidebar = "sidebar_" + SITE_NAME + ".html" %}
{% include sidebar if not EVENT_SIDEBAR else 'event/' + sidebar %}
{% set sidebar = "sidebar_" ~ SITE_NAME ~ ".html" %}
{% include sidebar if not EVENT_SIDEBAR else 'event/' ~ sidebar %}
{% endif %}
{% endblock %}
</div>

4
files/templates/login/sign_up.html
View File

@ -13,8 +13,8 @@
{% set login_namespace = namespace() %}
{% if ref_user %}
{% set login_namespace.authtitle = '@' + ref_user.username + ' has invited you!' %}
{% set login_namespace.authtext = 'Looks like someone wants you to join ' + SITE_NAME + '.' %}
{% set login_namespace.authtitle = '@' ~ ref_user.username ~ ' has invited you!' %}
{% set login_namespace.authtext = 'Looks like someone wants you to join ' ~ SITE_NAME ~ '.' %}
{% elif not site_settings['login_required'] %}
{% set login_namespace.authtitle = "Create your account." %}
{% set login_namespace.authtext = "No email address required." %}

2
files/templates/login/sign_up_failed_ref.html
View File

@ -11,7 +11,7 @@
{% block authtext %}Send this link to a friend instead :){% endblock %}
{% block content %}
<label>Referral code</label>
{% set link = SITE_FULL + "/signup?ref=" + request.values.get('ref') %}
{% set link = SITE_FULL ~ "/signup?ref=" ~ request.values.get('ref') %}
<input autocomplete="off" type="text" class="form-control copy-link" readonly value="{{link}}" data-clipboard-text="{{link}}">
<div class="text-center text-muted text-small mt-5 mb-3">
Already have an account? <a href="/login{{'?redirect='+redirect if redirect else ''}}" class="font-weight-bold toggle-login">Log in</a>

4
files/templates/sidebar_PCM.html
View File

@ -3,7 +3,7 @@
{% if sub %}
{% set image=sub.sidebar_url %}
{% else %}
{# set image='/i/' + SITE_NAME + '/sidebar.webp?v=3009' #}
{# set image='/i/' ~ SITE_NAME ~ '/sidebar.webp?v=3009' #}
{% endif %}
{% if request.path != '/sidebar' and image %}
@ -48,7 +48,7 @@
<a rel="nofollow noopener" class="btn btn-primary btn-block" href="https://imgur.com/a/2wDZddF">PCM Shitposter Cutouts (2/?)</a>
<div class="sidebar--rules sidebar--rules--pcm">
{% set rules = "rules_" + SITE_NAME + ".html" %}
{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
{% include rules %}
</div>
</div>

4
files/templates/sidebar_WPD.html
View File

@ -3,7 +3,7 @@
{%- if v -%}
{%- set art_image = macros.random_image("sidebar") -%}
{%- else -%}
{%- set art_image = '/i/' + SITE_NAME + '/sidebar.webp?v=3000' -%}
{%- set art_image = '/i/' ~ SITE_NAME ~ '/sidebar.webp?v=3000' -%}
{%- endif -%}
{% if request.path != '/sidebar' %}
@ -65,7 +65,7 @@
</div>
<div class="sidebar--rules sidebar--rules--wpd">
{% set rules = "rules_" + SITE_NAME + ".html" %}
{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
{% include rules %}
</div>
</div>

2
files/templates/sidebar_rDrama.html
View File

@ -54,7 +54,7 @@
{%- endif %}
<div class="sidebar--rules sidebar--rules--rdrama">
{% set rules = "rules_" + SITE_NAME + ".html" %}
{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
{% include rules %}
</div>
{% endif %}

4
files/templates/util/macros.html
View File

@ -11,7 +11,7 @@
{% endmacro -%}
{%- 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") -%}
{{ 'cached.webp' | asset_siteimg -}}
{% elif os_path.exists(path + "/banners") -%}
@ -22,7 +22,7 @@
{%- endmacro -%}
{%- 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' }}
{%- endmacro -%}