schtobia/flex
1
0
Fork 0
Code Issues Pull requests Activity

Fix: correct custom CSS URL for I18N pages

Browse source 
problem description:
When using the i18n_subsites plugin – which is somehow supported by this
theme – the SITEURL is modified for all but the default language,
causing the construction {{ SITEURL }}/{{ CUSTOM_CSS }} to change as
well.
This in principle affects all such template constructions where SITEURL
is prepended to a custom loading path.
One exception is {{ THEME_STATIC_DIR }}, which is adjusted by the
i18n_subsites code to still match for translations.

solution:
The i18n plugin introduces an additional context variable
{{ main_siteurl }}, which always points at the original unmodified
SITEURL. As unfortunately this variable is not present in non-i18n
sites, it's existence is checked first, taking SITEURL as a fallback.
This special handling is acceptable IMHO, as at first glance I could not
find any other affected URLs in templates.

follow-up to #192
This commit is contained in:
Trolli Schmittlauch 2022-03-01 03:14:17 +01:00
parent 7e99f9bbe6
commit 6d821518f1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/base.html
View file

@ -78,7 +78,7 @@
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/solid.css"> <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/solid.css">
{% if CUSTOM_CSS %} {% if CUSTOM_CSS %}
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ CUSTOM_CSS }}"> <link rel="stylesheet" type="text/css" href="{% if main_siteurl is defined %}{{ main_site }}{% else %}{{ SITEURL }}{% endif %}/{{ CUSTOM_CSS }}">
{% endif %} {% endif %}
{% if FEED_ALL_ATOM %} {% if FEED_ALL_ATOM %}