diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html --- a/ennstatus/templates/base.html +++ b/ennstatus/templates/base.html @@ -2,6 +2,14 @@ {% import 'macros.html' as base_macros with context %} +{% if '.onion' in request.url_root %} + {% set wiki_url = config['ENNSTATUS_WIKI_ONION_ADDRESS'] %} +{% elif '.bit' in request.url_root %} + {% set wiki_url = config['ENNSTATUS_WIKI_BIT_ADDRESS'] %} +{% else %} + {% set wiki_url = "//wiki.enn.lu" %} +{% endif %} + {% block title %} Frënn vun der Ënn - {{ title }} {% endblock %} @@ -38,7 +46,7 @@
  • Mirrors
  • -
  • Wiki
  • +
  • Wiki
  • About Ennstatus
  • diff --git a/ennstatus/templates/macros.html b/ennstatus/templates/macros.html --- a/ennstatus/templates/macros.html +++ b/ennstatus/templates/macros.html @@ -16,13 +16,3 @@ {{ message }} {% endmacro %} - -{% macro get_wiki_address() %} - {% if '.onion' in request.url_root %} - {{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }} - {% elif '.bit' in request.url_root %} - {{ config['ENNSTATUS_WIKI_BIT_ADDRESS'] }} - {% else %} - //wiki.enn.lu - {% endif %} -{% endmacro %} diff --git a/ennstatus/templates/root/abuse.html b/ennstatus/templates/root/abuse.html --- a/ennstatus/templates/root/abuse.html +++ b/ennstatus/templates/root/abuse.html @@ -19,7 +19,7 @@
  • your contact information

  • - For transparency reasons we publish monthly abuse mail statistics. + For transparency reasons we publish monthly abuse mail statistics.

    Abuse contact

    diff --git a/ennstatus/templates/root/mirrors.html b/ennstatus/templates/root/mirrors.html --- a/ennstatus/templates/root/mirrors.html +++ b/ennstatus/templates/root/mirrors.html @@ -2,15 +2,13 @@ {% set title = "Partners" %} -{% macro get_globe_address() %} - {% if '.onion' in request.url_root %} - {{ config['ENNSTATUS_GLOBE_ONION_ADDRESS'] }} - {% elif '.bit' in request.url_root %} - {{ config['ENNSTATUS_GLOBE_BIT_ADDRESS'] }} - {% else %} - //globe.enn.lu - {% endif %} -{% endmacro %} +{% if '.onion' in request.url_root %} + {% set globe_url = config['ENNSTATUS_GLOBE_ONION_ADDRESS'] %} +{% elif '.bit' in request.url_root %} + {% set globe_url = config['ENNSTATUS_GLOBE_BIT_ADDRESS'] %} +{% else %} + {% set globe_url = "//globe.enn.lu" %} +{% endif %} {% block content %}
    @@ -27,7 +25,7 @@
    tails.enn.lu
    A Tails Download mirror. Tails is a live operating system, that you can start on almost any computer from a DVD, USB stick, or SD card. It aims at preserving your privacy and anonymity. Learn more about Tails

    -
    globe.enn.lu
    +
    globe.enn.lu
    Globe is a Tor relay and bridge explorer.