Changeset - 79ad6e6c998c
[Not reviewed]
Merge version_5
0 5 0
Dennis Fink - 9 years ago 2015-10-16 20:13:47
dennis.fink@c3l.lu
Merged upstream
5 files changed with 25 insertions and 25 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
Show inline comments
 
@@ -26,87 +26,89 @@
 
  <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="{{ 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>
 
          </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 class="divider"></li>
 
            </li>
 
            <li><a href="{{ url_for('root.mirrors') }}">Mirrors</a></li>
 
            <li><a href="{{ wiki_url }}">Wiki</a></li>
 
            <li class="divider"></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('donate.received') }}">Donation history</a></li>
 
            <li><a href="{{ url_for('root.member') }}">Join us</a></li>
 
            <li><a href="{{ url_for('root.bridgeprogram')}}">Adopt a Bridge</a></li>
 
            <li class="divider"></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>
 
            <li class="divider"></li>
 
            <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>
 
            <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</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>
ennstatus/templates/root/about.html
Show inline comments
 
{% extends "base.html" %}
 

	
 
{% set title = "Who we are" %}
 

	
 
{% block content %}
 
    <!--
 
    <div class="col-md-4 text-center">
 
      <img class="img-rounded" alt="WhoIs" src="{{ url_for('static', filename='images/WhoIs.png') }}" width="160" height="189"></img>
 
      <h3>Who we are</h3>
 
      </div> -->
 

	
 
  <div class="col-md-offset-1 col-md-11">
 
  <div class="col-md-offset-1 col-md-10">
 
    <h2>Who we are</h2>
 
    <h3>Organization</h3>
 
    <p class="lead">
 
      <i>Frënn vun der Ënn a.s.b.l.</i> is a non-profit organization based in Luxembourg (EU).
 
      It has been founded by members of <i>Chaos Computer Club Lëtzebuerg a.s.b.l.</i> in 2013.
 
    </p>
 
    <p>
 
      As defined in the statutes (see below), the goals of our organization are:
 
      <ul>
 
        <li>defending civil rights, especially on the internet</li>
 
        <li>defending the right to anonymity on the internet by supporting Tor Project Inc.</li>
 
        <li>fighting against censorship and ensuring free access to information</li>
 
        <li>defending the freedom of expression</li>
 
        <li>protecting privacy</li>
 
        <li>promoting free software</li>
 
      </ul>
 
    </p>
 
    <p>
 
      The name <i>Frënn vun der Ënn</i> is Luxembourgish and stands for <i>Friends of the Onion</i>.
 
      The onion is used as a logo by the Tor Project Inc. and many other related organizations.
 
    </p>
 
    <h3>Administrative Council &amp; Staff</h3>
 
    <p>
 
      <dl class="dl-horizontal" >
ennstatus/templates/root/bridgeprogram.html
Show inline comments
 
{% extends "base.html" %}
 

	
 
{% import 'bootstrap/wtf.html' as wtf %}
 

	
 
{% set title = "Bridge Program" %}
 

	
 
{% block content %}
 
  <div class="col-md-offset-1 col-md-11">
 
  <div class="col-md-offset-1 col-md-10">
 
    <h2>Bridge Program</h2>
 
    <p class="lead">We are happy to announce our new partner program which allows you to support the Tor network by funding a Tor bridge.</p>
 
    <p> Rather than making a single donation which we would use to cover our expenses for our different projects and administrative charges, you can now fund a Tor bridge on your own.
 
    Bridges are an important element in the Tor network because they allow people to use the network even if the direct acces to its entry-nodes is blocked in their country. This is mainly the case for people living under oppressive regimes.</p>
 
    <p class="lead">Fight censorship! Our bridge program allows you to support the Tor network by adopting a Tor bridge.</p>
 
    <p> Rather than making a single donation, you can now fund a Tor bridge on your own. Bridges are an important element in the Tor network because they allow people to use the network even if the direct acces to its entry-nodes is blocked in their country. This is mainly the case for people living under oppressive regimes. <a href="https://www.torproject.org/docs/bridges" target="blank"><strong>Read more about Tor bridges</strong></a></p>
 
    <p>With a recurring contribution of 3 EUR/month (duration min. 12 months) you can help us keep such a bridge up and running. The servers for this project are located in Luxembourg.</p>
 
    <center>
 
      <img src="{{ url_for('static', filename='images/Tor_bridge_users.png') }}" alt="bridge users">
 
    </center>
 
    <h3>How to participate?</h3>
 
    <p>Interested? Our <a href="//wiki.enn.lu/doku.php?id=user:kahpa">bridge operator</a> will give you further information about the project.</p>
 
    <p><strong>Get in touch:</strong> <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:bridges@enn.lu">bridges@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?op=get&search=0x3F917F479C5D0F3B">0x9C5D0F3B</a> (DE, EN, LB, FR)</p>
 
    <h3>Interaction</h3>
 
    <p>As a partner in our project you can choose the nickname of your bridge and follow it on <a href="{{ url_for('status.index') }}">Ënnstatus</a>, our self-made information-panel.</p>
 
    <p>You want to know more about our work? Our staff is always happy to answer your questions, don't hestitate to <a href="{{ url_for('root.contact') }}">contact us.</a></p>
 
  </div>
 
  <div class="col-md-offset-1 col-md-11">
 
  <div class="col-md-1">
 
  </div>
 
  <div class="col-md-offset-1 col-md-6">
 
    <h2>Apply for the bridge program</h2>
 
    <form method="post" class="form form-horizontal" role="form">
 
      {{ form.hidden_tag() }}
 
      {{ wtf.form_field(form.fullname, form_type='horizontal') }}
 
      {{ wtf.form_field(form.email, form_type='horizontal') }}
 
      {{ wtf.form_field(form.bridgename, form_type='horizontal') }}
 
      <div class="form-group {% if form.duration.errors %} has-error {% endif %} required">
 
        {{ form.duration.label(class_='control-label col-lg-2') }}
 
        <div class="col-lg-10">
 
        {% for field in form.duration %}
 
          <div class="radio">
 
            {{ field() }}
 
            <div class="btn-group">
 
              <label class="btn btn-success" for="{{ field.id }}">
 
                <span class="glyphicon glyphicon-plus"></span>
 
                <span class="glyphicon glyphicon-minus"></span>
 
              </label>
 
              <label class="btn btn-default" for="{{ field.id }}">
 
                {{ field.label.text }}
 
              </label>
 
            </div>
 
          </div>
 
        {% endfor %}
 
        </div>
 
@@ -66,25 +59,31 @@
 
                <span class="glyphicon glyphicon-minus"></span>
 
              </label>
 
              <label class="btn btn-default" for="{{ field.id }}">
 
                {{ field.label.text }}
 
              </label>
 
            </div>
 
          </div>
 
        {% endfor %}
 
        </div>
 
        {% if form.payment.errors %}
 
          <div class="col-lg-offset-2 col-lg-10">
 
            {% for error in form.payment.errors %}
 
              <p class="help-block">{{ error }}</p>
 
            {% endfor %}
 
          </div>
 
        {% endif %}
 
      </div>
 
      <div class="form-group">
 
        <div class="col-lg-offset-2 col-lg-10">
 
          {{ form.submit(class_='btn btn-primary') }}
 
        </div>
 
      </div>
 
    </form>
 
  </div>
 
  <div class="col-md-4">
 
    <h3>More information</h3>
 
    <p>You want to know more about our work?</p>
 
    <p>Our <a href="//wiki.enn.lu/doku.php?id=user:kahpa">bridge operator</a> will give you further information about the project.</p>
 
    <p><strong>Get in touch:</strong> <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:bridges@enn.lu">bridges@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?op=get&search=0x3F917F479C5D0F3B">0x9C5D0F3B</a></p>
 
  </div>
 
{% endblock %}
ennstatus/templates/root/index.html
Show inline comments
 
{% extends "base.html" %}
 

	
 
{% set title = "Index" %}
 

	
 
{% block styles %} 
 
{% block styles %}
 
  {{ super() }}
 
  <link rel="stylesheet" href="{{ url_for('static', filename='js/video.js/dist/video-js.min.css') }}">
 
{% endblock %}
 

	
 
{% block content %}
 
  <div class="col-md-4 text-center">
 
    <img class="img-rounded" alt="FVDE_Logo" src="{{ url_for('static', filename='images/logo/FVDE_logo_resize.png') }}"></img>
 
  </div>
 
  <div class="col-md-8">
 
    <div class="jumbotron">
 
      <h2>Frënn vun der Ënn A.S.B.L.</h2>
 
	    <p><em>Luxembourg based non-profit organization defending civil rights on the internet.</em></p>
 
      <p>We provide high-bandwidth Tor nodes all over the world to protect <strong>online privacy</strong>, <strong>anonymity</strong>, <strong>freedom of speech</strong> and fight <strong>censorship</strong>!
 
      </p>
 
      <h3><a href="{{ url_for('root.member') }}"><span class="label label-success">Become a Member</span></a> <a href="{{ url_for('donate.index') }}"><span class="label label-primary">Donate</span></a>
 
        <a class="pull-right" href="https://twitter.com/FrennVunDerEnn" target="blank"><span class="label label-info">@FrennVunDerEnn</span></a></h3>
 
    </div>
 
  </div>
 
  <div class="col-md-1">
 
  </div>
 
  <div class="col-md-8">
 
    <blockquote>
 
      <p>
 
        <em>I support <abbr title="Frënn vun der Ënn a.s.b.l.">FVDE</abbr> because even small organizations can contribute to protect fundamental civil rights. This noble goal can be pursued by making use of technology and putting knowledge to the service of users who want to maintain their privacy.</em>
 
        <footer>Georges, Teacher</footer>
 
      </p>
 
    </blockquote>
 
  </div>
 
  <div class="col-md-3">
 
    <blockquote>
 
      <a href="https://martianhumorist.me/" target="blank"><h2 class="text-center">You have something to hide!</h2></a>
 
      <a href="https://martianhumorist.me/141015-2/" target="blank"><h2 class="text-center">You have something to hide!</h2></a>
 
      <footer>The Martian Humorist</footer>
 
    </blockquote>
 
  </div>
 
  <div class="col-md-6">
 
    <p>
 
      <video id="tor-animation" width="560" height="315" controls class="video-js vjs-default-skin vjs-big-play-centered" data-setup="">
 
        <source src="{{ url_for('static', filename='videos/Tor_Animation.webm') }}" type='video/webm' />
 
        <source src="{{ url_for('static', filename='videos/Tor_Animation.mp4') }}" type='video/mp4' />
 

	
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.de.vtt') }}" srclang="de" label="Deutsch">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.en.vtt') }}" srclang="en" label="English">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.fr.vtt') }}" srclang="fr" label="Français">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.ar.vtt') }}" srclang="ar" label="العربية">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.ca.vtt') }}" srclang="ca" label="Català">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.es.vtt') }}" srclang="es" label="Español">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.eu.vtt') }}" srclang="eu" label="Euskal">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.fa.vtt') }}" srclang="fa" label="فارسی">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.fi.vtt') }}" srclang="fi" label="Suomi">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.id.vtt') }}" srclang="id" label="Indonesian">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.it.vtt') }}" srclang="it" label="Italinao">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.lv.vtt') }}" srclang="lv" label="Latvijā">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.pl.vtt') }}" srclang="pl" label="Polskie">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.pt.vtt') }}" srclang="pt" label="Português">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.ru.vtt') }}" srclang="ru" label="русский">
 
@@ -64,25 +64,24 @@
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.zh-CN.vtt') }}" srclang="zh-CN" label="Chinese (China)">
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.zh-HK.vtt') }}" srclang="zh-HK" label="Chinese (Hongkong)">
 
      </video>
 
    </p>
 
  </div>
 
  <div class="col-md-6">
 
      <p class=lead>
 
        <br>
 
        Tor is free software and an open network that helps you defend against network surveillance and preserve your personal freedom and privacy on the Internet.
 
      </p>
 
      <p>
 
        By bouncing your communications around a distributed network of relays run by volunteers all around the world, it prevents somebody watching your Internet connection from learning what sites you visit, and it prevents the sites you visit from learning your physical location.
 
      </p>
 
      <h2><a href="http://torproject.lu" target="blank"><span class="label label-info">Learn more about Tor</span></a></h2>
 
  </div>
 
{% endblock %}
 

	
 
{% block scripts %}
 
  {{ super() }}
 
  <script src="{{ url_for('static', filename='js/video.js/dist/video.min.js') }}"></script>
 
  <script>
 
    videojs.options.flash.swf = "{{ url_for('static', filename='js/video.js/dist/video-js.swf') }}"
 
  </script>
 
{% endblock %}
 

	
ennstatus/templates/root/member.html
Show inline comments
 
@@ -21,38 +21,38 @@
 
       Regularly we meet to discuss political or philosophical questions or
 
       just have a convivial evening.</p>
 

	
 
    <p>Protecting civil liberties and human rights (such as privacy, freedom of
 
       speech, free access to information,...) is our common conviction!</p>
 

	
 
    <p>If you share our goals and are eager to socialize with like-minded
 
       people, then: Stand up for a free internet! Join us today!</p>
 

	
 
    <h3>How to become a member</h3>
 
    <p>Becoming a member is very simple. Just follow these steps:</p>
 
    <table class="table table-bordered">
 
      <thead>
 
        <tr class="info">
 
          <th>Online subscription</th>
 
          <th>PDF subscription form</th>
 
        </tr>
 
      </thead>
 
      <tbody>
 
        <tr>
 
          <td>Use the <a href="{{ url_for('root.membership') }}">online form</a>.</td>
 
          <td>Download the following <a href="{{ url_for('static', filename='files/MembershipForm.pdf') }}">membership form</a> and fill in the necessary information.</td>
 
        </tr>
 
        <tr>
 
          <td>The form will be automatically submitted. We encrypt your information with GnuPG.</td>
 
          <td>The form will be automatically submitted. We encrypt your data with GnuPG.</td>
 
          <td>Send the membership form to one of our <a href="{{ url_for('root.contact') }}">email or snailmail</a> addresses.</td>
 
        </tr>
 
        <tr>
 
          <td colspan="2">Pay your annually membership fee. Use one of the payment methods (except <a href="{{ url_for('donate.index') }}">Flattr</a> or <a href="{{ url_for('donate.index') }}">BPM Points</a>)
 
          <td colspan="2">Pay your annual membership fee. Use one of the payment methods (except <a href="{{ url_for('donate.index') }}">Flattr</a> or <a href="{{ url_for('donate.index') }}">BPM Points</a>)
 
              specified on our <a href="{{ url_for('donate.index') }}">donations</a> page. Try to include your username as a statement if possible!</td>
 
        </tr>
 
        <tr>
 
          <td colspan="2">We will get back in touch with you as soon as the payment has been completed.</td>
 
        </tr>
 
      </tbody>
 
    </table>
 
  </div>
 
{% endblock %}
0 comments (0 inline, 0 general)