Merge pull request #90 from QSchulz/fix-internal-url-scheme

themes: fix URI matching used for deciding if URI's local in menu
This commit is contained in:
beudbeud 2019-05-27 11:55:16 +02:00 committed by GitHub
commit 7bebe0eec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions

View File

@ -4,7 +4,8 @@
{% for line in settings.menu %}
{% set rowloop = loop %}
{% for file_name, menu_name in line.items() %}
{% if file_name.startswith('http') %}
{# We test if it's a URI reference or not #}
{% if ':' in file_name and not file_name.startswith('./') %}
{% set file_name = file_name %}
{% else %}
{% set file_name = "../"+file_name %}

View File

@ -3,7 +3,8 @@
<ul>
{% for line in settings.menu %}
{% set file_name, menu_name = line.items()[0] %}
{% if file_name.startswith('http') %}
{# We test if it's a URI reference or not #}
{% if ':' in file_name and not file_name.startswith('./') %}
{% set file_name = file_name %}
{% elif gallery %}
{% set file_name = "../"+file_name %}

View File

@ -2,7 +2,8 @@
{% for line in settings.menu %}
{% set rowloop = loop %}
{% for file_name, menu_name in line.items() %}
{% if file_name.startswith('http') %}
{# We test if it's a URI reference or not #}
{% if ':' in file_name and not file_name.startswith('./') %}
{% set file_name = file_name %}
{% else %}
{% set file_name = "../"+file_name %}
@ -16,7 +17,8 @@
{% for line in settings.menu %}
{% set rowloop = loop %}
{% for file_name, menu_name in line.items() %}
{% if file_name.startswith('http') %}
{# We test if it's a URI reference or not #}
{% if ':' in file_name and not file_name.startswith('./') %}
{% set file_name = file_name %}
{% else %}
{% set file_name = "../"+file_name %}