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

Refactor get_target to return just the target value

Browse source
This commit is contained in:
Fidel Ramos 2019-10-30 23:13:38 +00:00
parent ccc112a280
commit fc05942499
No known key found for this signature in database
GPG key ID: 64490E0A752C21C4
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templates/base.html
View file

@ -110,7 +110,9 @@
{# Open links in new window depending on the LINKS_IN_NEW_TAB setting #}
{% macro get_target(link) -%}
{% if LINKS_IN_NEW_TAB not in ('no', 'none', false, 0, 'external') or (LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL)) %}
target="_blank"
_blank
{% else %}
_self
{% endif %}
{% endmacro %}
@ -119,12 +121,12 @@
{%- endif %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for page in pages %}
<li><a {{ get_target(SITEURL) }} href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
<li><a target="{{ get_target(SITEURL) }}" href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
{% endfor %}
{% endif %}
{% for name, link in LINKS %}
<li><a {{ get_target(link) }} href="{{ link }}" >{{ name }}</a></li>
<li><a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a></li>
{% endfor %}
</ul>
</nav>