diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html --- a/ennstatus/templates/base.html +++ b/ennstatus/templates/base.html @@ -47,6 +47,7 @@ About @@ -59,9 +60,11 @@ +
  • Mirrors
  • Wiki
    • +
  • About Ennstatus
    • @@ -70,12 +73,10 @@ @@ -83,9 +84,10 @@ Contact diff --git a/ennstatus/templates/root/about.html b/ennstatus/templates/root/about.html --- a/ennstatus/templates/root/about.html +++ b/ennstatus/templates/root/about.html @@ -9,7 +9,7 @@

    Who we are

    --> -
    +

    Who we are

    Organization

    diff --git a/ennstatus/templates/root/bridgeprogram.html b/ennstatus/templates/root/bridgeprogram.html --- a/ennstatus/templates/root/bridgeprogram.html +++ b/ennstatus/templates/root/bridgeprogram.html @@ -5,23 +5,16 @@ {% set title = "Bridge Program" %} {% block content %} -

    +

    Bridge Program

    -

    We are happy to announce our new partner program which allows you to support the Tor network by funding a Tor bridge.

    -

    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.

    +

    Fight censorship! Our bridge program allows you to support the Tor network by adopting a Tor bridge.

    +

    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. Read more about Tor bridges

    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.

    -
    - bridge users -
    -

    How to participate?

    -

    Interested? Our bridge operator will give you further information about the project.

    -

    Get in touch: : bridges@enn.lu GPG: 0x9C5D0F3B (DE, EN, LB, FR)

    -

    Interaction

    As a partner in our project you can choose the nickname of your bridge and follow it on Ënnstatus, our self-made information-panel.

    -

    You want to know more about our work? Our staff is always happy to answer your questions, don't hestitate to contact us.

    -
    +
    +
    +

    Apply for the bridge program

    {{ form.hidden_tag() }} @@ -87,4 +80,10 @@
    +
    +

    More information

    +

    You want to know more about our work?

    +

    Our bridge operator will give you further information about the project.

    +

    Get in touch: : bridges@enn.lu GPG: 0x9C5D0F3B

    +
    {% endblock %} diff --git a/ennstatus/templates/root/index.html b/ennstatus/templates/root/index.html --- a/ennstatus/templates/root/index.html +++ b/ennstatus/templates/root/index.html @@ -2,7 +2,7 @@ {% set title = "Index" %} -{% block styles %} +{% block styles %} {{ super() }} {% endblock %} @@ -33,7 +33,7 @@
    -

    You have something to hide!

     +

    You have something to hide!
    The Martian Humorist
    @@ -85,4 +85,3 @@ videojs.options.flash.swf = "{{ url_for('static', filename='js/video.js/dist/video-js.swf') }}" {% endblock %} - diff --git a/ennstatus/templates/root/member.html b/ennstatus/templates/root/member.html --- a/ennstatus/templates/root/member.html +++ b/ennstatus/templates/root/member.html @@ -42,11 +42,11 @@ Download the following membership form and fill in the necessary information. - The form will be automatically submitted. We encrypt your information with GnuPG. + The form will be automatically submitted. We encrypt your data with GnuPG. Send the membership form to one of our email or snailmail addresses. - Pay your annually membership fee. Use one of the payment methods (except Flattr or BPM Points) + Pay your annual membership fee. Use one of the payment methods (except Flattr or BPM Points) specified on our donations page. Try to include your username as a statement if possible!