From e0794ec80ca90a8f0bb7705ed34551f3988f95db Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 30 Nov 2020 23:27:16 +0100
Subject: [PATCH] Remove use of newtab
---
templates/base.html | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/templates/base.html b/templates/base.html
index 9e25cc8..04335af 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,13 +8,6 @@
{% endif %}
{% endmacro %}
-{% macro newtab(string, force=False) %}
- {% if ( string.startswith('http://') or
- string.startswith('https://')) %}
- target="_blank"
- {% endif %}
-{% endmacro %}
-
<!DOCTYPE html>
<html lang="{{ DEFAULT_LANG }}">
@@ -60,12 +53,9 @@
<ul class="nav navbar-nav navbar-right" id="menuitem-list">
{% for title,url in MENUITEMS %}
{% if url is string %}
- {% if title != 'Search' %}
- <li {% if output_file == url %}class="active"{% endif %}>
- <a href="{{ genurl( url ) }}" {{ newtab(url) }}>{{ title }}</a>
- </li>
- {% endif %}
-
+ <li {% if output_file == url %}class="active"{% endif %}>
+ <a href="{{ genurl( url ) }}" >{{ title }}</a>
+ </li>
{% elif url is iterable %}
<li class="btn-group
{%- for title,item_url in url -%}
@@ -80,7 +70,7 @@
<ul class="dropdown-menu" role="menu">
{% for title,item_url in url %}
<li {% if item_url == output_url %}class="active"{% endif %}>
- <a href="{{ genurl( item_url ) }}" {{ newtab(item_url) }}>{{ title }}</a>
+ <a href="{{ genurl( item_url ) }}">{{ title }}</a>
</li>
{% endfor %}
</ul>
@@ -105,7 +95,7 @@
<!-- Template Content footer -->
{% block template_content_footer %}{% endblock %}
- <!-- Sponsoren Footer -->
+ <!-- Sponsoren-Footer -->
<footer class="page-footer" id="sponsoren-footer">
<div class="container">
<div class="row">
@@ -147,7 +137,6 @@
<script src="/{{ THEME_STATIC_DIR }}/js/jquery.min.js"></script>
<script src="/{{ THEME_STATIC_DIR }}/js/bootstrap.min.js"></script>
-
</body>
</html>
--
GitLab