Changeset - f61943d9a6b7
[Not reviewed]
Merge dev
0 4 0
Dennis Fink - 9 years ago 2015-10-20 00:38:32
dennis.fink@c3l.lu
Merged hotfix-onion-address
3 files changed with 6 insertions and 6 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
Show inline comments
 
@@ -7,7 +7,7 @@
 
{% elif '.bit' in request.url_root %}
 
  {% set wiki_url = config['ENNSTATUS_WIKI_BIT_ADDRESS'] %}
 
{% else %}
 
  {% set wiki_url = "//wiki.enn.lu" %}
 
  {% set wiki_url = "wiki.enn.lu" %}
 
{% endif %}
 

	
 
{% block title %}
 
@@ -52,7 +52,7 @@
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ wiki_url }}/doku.php?id=news" target="blank">News</a></li>
 
            <li><a href="//{{ wiki_url }}/doku.php?id=news" target="blank">News</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('root.about') }}">Organization</a></li>
 
            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
 
@@ -73,7 +73,7 @@
 
            <li class="divider"></li>
 
            </li>
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
 
            <li><a href="{{ wiki_url }}">Wiki</a></li>
 
            <li><a href="//{{ wiki_url }}">Wiki</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('root.ennstatus') }}">About Ënnstatus</a></li>
 
          </ul>
ennstatus/templates/root/abuse.html
Show inline comments
 
@@ -17,7 +17,7 @@
 
      <li>your contact information</li>
 
    </ul><br>
 
    <p>
 
    For transparency reasons we publish monthly <a href="{{ wiki_url }}/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.
 
    For transparency reasons we publish monthly <a href="//{{ wiki_url }}/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.
 
    </p>
 
    <h3>Abuse contact</h3>
 
    <address>
ennstatus/templates/root/mirrors.html
Show inline comments
 
@@ -7,7 +7,7 @@
 
{% elif '.bit' in request.url_root %}
 
  {% set globe_url = config['ENNSTATUS_GLOBE_BIT_ADDRESS'] %}
 
{% else %}
 
  {% set globe_url = "//globe.enn.lu" %}
 
  {% set globe_url = "globe.enn.lu" %}
 
{% endif %}
 

	
 
{% block content %}
 
@@ -25,7 +25,7 @@
 
      <dt><a href="http://tails.c3l.lu/" target="_blank">tails.enn.lu</a></dt>
 
      <dd>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. <a href="https://tails.boum.org/" target="blank">Learn more about Tails</a></dd>
 
      <br>
 
      <dt><a href="{{ globe_url }}" target="_blank">globe.enn.lu</a></dt>
 
      <dt><a href="//{{ globe_url }}" target="_blank">globe.enn.lu</a></dt>
 
      <dd>Globe is a Tor relay and bridge explorer.</dd>
 
    </dl>
 
  </div>
0 comments (0 inline, 0 general)