diff --git a/content/header/_index.md b/content/header/_index.md index a0da849..3e043f5 100644 --- a/content/header/_index.md +++ b/content/header/_index.md @@ -42,5 +42,4 @@ extra: {% end %} -- [Knowledge]("https://ourworldventures.github.io/info_ourworld/intro/intro.html") -- [Contact]("mailto:info@ourworld.tf") \ No newline at end of file +- [Knowledge]("https://ourworldventures.github.io/info_ourworld/intro/intro.html") \ No newline at end of file diff --git a/static/js/custom.js b/static/js/custom.js index 4871c33..1af8ac1 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -114,10 +114,24 @@ window.onload = function () { }); }) + var links = document.links; + var internal_hosts = [ + 'www.ourworld.tf', + 'ourworld.tf', + 'www2.ourworld.tf', + 'localhost', + '127.0.0.1' + ] + for (var i = 0, linksLength = links.length; i < linksLength; i++) { + if (!internal_hosts.includes(links[i].hostname)) { + links[i].target = '_blank'; + } + } + document.getElementById("filter-btn").addEventListener('click', toggleFilter); document.getElementById("mobile-learn-btn").addEventListener('click', toggleMenu); } function openInNewTab(url) { window.open(url, '_blank').focus() -} \ No newline at end of file +} diff --git a/templates/_default/base.html b/templates/_default/base.html index a609dd3..b486a15 100644 --- a/templates/_default/base.html +++ b/templates/_default/base.html @@ -1,14 +1,15 @@ +{% include "partials/head.html" %} + + + + {% include "partials/header.html" %} +
+ {% block content %}{% endblock %} +
+ {% include "partials/footer.html" %} + + - {% include "partials/head.html" %} - - - {% include "partials/header.html" %} -
- {% block content %}{% endblock %} -
- {% include "partials/footer.html" %} - - \ No newline at end of file diff --git a/templates/page.html b/templates/page.html index 2ad741b..bf803ff 100644 --- a/templates/page.html +++ b/templates/page.html @@ -3,8 +3,8 @@ {% block content %}
- - + +
{% if page %} {{page.content | safe}} diff --git a/templates/partials/head.html b/templates/partials/head.html index c23e2dc..f327159 100644 --- a/templates/partials/head.html +++ b/templates/partials/head.html @@ -52,50 +52,7 @@ cookieconsent.run({ "notice_banner_type": "headline", "consent_type": "express", "palette": "light", "language": "en", "page_load_consent_levels": ["strictly-necessary"], "notice_banner_reject_button_hide": false, "preferences_center_close_button_hide": false, "website_name": "https://ourworld.tf/", "website_privacy_policy_url": "https://library.threefold.me/info/legal/#/legal__privacypolicy" }); }); - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/partials/header_custom.html b/templates/partials/header_custom.html index 67b45cd..cb68160 100644 --- a/templates/partials/header_custom.html +++ b/templates/partials/header_custom.html @@ -31,38 +31,40 @@