Changeset - d6232077c929
[Not reviewed]
version_5
0 3 0
Dennis Fink - 10 years ago 2015-10-13 19:55:54
dennis.fink@c3l.lu
Use alternative addresses for wiki and globe if connecting to the hidden service
3 files changed with 22 insertions and 2 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
Show inline comments
 
@@ -7,97 +7,97 @@
 
{% endblock %}
 

	
 
{% block metas %}
 
  {{ super() }}
 
  <meta charset="utf-8">
 
  <meta name="application-name" content="Ënnstatus">
 
  <meta name="author" content="Frënn vun der Ënn">
 
{% endblock %}
 

	
 
{% block styles %}
 
  {{ super() }}
 
  <link rel="stylesheet" href="{{ url_for('static', filename='css/ennstatus.css') }}" />
 
  <link rel="shortcut icon" href="{{ url_for('static', filename='images/favicon.png') }}">
 
{% endblock %}
 

	
 
{% block body %}
 
<a href="#content" class="sr-only">Skip to main content</a>
 
<div class="container">
 
  {% block navbar %}
 
  <div class="navbar navbar-default">
 
    <div class="navbar-header">
 
      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
 
        <span class="icon-bar"></span>
 
        <span class="icon-bar"></span>
 
        <span class="icon-bar"></span>
 
      </button>
 
      <img class="navbar-brand" src="{{ url_for('static', filename='images/logo/FVDE_logo_thumbnail.png') }}"></img>
 
      <a class="navbar-brand" href="{{ url_for('root.index') }}">Enn.lu</a>
 
    </div>
 
    <div class="navbar-collapse collapse">
 
      <ul class="nav navbar-nav">
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('root.about') }}">Organization</a></li>
 
            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
 
          </ul>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li class="dropdown-submenu">
 
              <a>Tor Servers</a>
 
              <ul class="dropdown-menu">
 
                <li><a href="{{ url_for('status.index') }}">Ennstatus Panel</a></li>
 
              </ul>
 
            </li>
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
 
            <li><a href="https://wiki.enn.lu">Wiki</a></li>
 
            <li><a href="{{ get_wiki_address() }}">Wiki</a></li>
 
            <li><a href="{{ url_for('root.disclaimer') }}">About Ennstatus</a></li>
 
          </ul>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('donate.index') }}">Donate</a></li>
 
            <li><a href="{{ url_for('root.member') }}">Join us</a></li>
 
            <li class="dropdown-submenu">
 
              <a>Special programs</a>
 
              <ul class="dropdown-menu">
 
                <li><a href="{{ url_for('root.bridgeprogram')}}">Bridge program</a></li>
 
              </ul>
 
            </li>
 
          </ul>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="{{ url_for('root.contact') }}">General</a></li>
 
            <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
 
          </ul>
 
        </li>
 
      </ul>
 
    </div>
 
  </div>
 
  {% endblock %}
 
  <div class="row" id="content">
 
  {% with messages = get_flashed_messages(with_categories=True) %}
 
    {% if messages %}
 
      <div class="col-md-12">
 
        {% for category, message in messages %}
 
          {{ base_macros.display_error(category, message) }}
 
        {% endfor %}
 
      </div>
 
    {% endif %}
 
  {% endwith %}
 
  {% block content %}
 
  {% endblock %}
 
  </div>
 
  <footer>
 
    <hr style="margin-bottom: 0.5%;">
 
    <div class="col-md-12 text-center">
 
      <a class="pull-left" href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>
 
      <address><strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>
 
      <a class="pull-right" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a></address>
 
    </div>
 
  </footer>
ennstatus/templates/macros.html
Show inline comments
 
{% set category_colors = {'error': 'alert-danger', 'success': 'alert-success'} %}
 

	
 
{% macro get_category_color(category) %}
 
  {% if category in category_colors %}
 
    {{ category_colors[category] }}
 
  {% else %}
 
    "alert-info"
 
  {% endif %}
 
{% endmacro %}
 
    
 

	
 
{% macro display_error(category, message) %}
 
  {% set color = get_category_color(category) %}
 
  <div class="{{ ' '.join(('alert', color)) }}">
 
    <button type="button" class="close" data-dismiss="alert">&times;</button>
 
    {{ message }}
 
  </div>
 
{% 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 %}
ennstatus/templates/root/mirrors.html
Show inline comments
 
{% extends "base.html" %}
 

	
 
{% 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 %}
 

	
 
{% block content %}
 
  <div class="col-md-4 text-center">
 
    <img src="{{ url_for('static', filename='images/Services.png') }}" class="img-rounded" alt="Partners" width="160"></img>
 
    <h3>Mirrors</h3>
 
  </div>
 
  <div class="col-md-8">
 
    <h2>Mirrors</h2>
 
    <p class="lead">In addition to our Tor relays we are providing mirrors for some popular services.</p>
 
    <dl>
 
      <dt><a href="http://torproject.lu" target="_blank">torproject.lu</a></dt>
 
      <dd>This is a mirror of the the Tor Project's main website torproject.org</dd>
 
      <br>
 
      <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="https://globe.enn.lu/" target="_blank">globe.enn.lu</a></dt>
 
      <dt><a href="{{ get_globe_address() }}" target="_blank">globe.enn.lu</a></dt>
 
      <dd>Globe is a Tor relay and bridge explorer.</dd>
 
    </dl>
 
  </div>
 
{% endblock %}
0 comments (0 inline, 0 general)