FVDE/ennstatus Changeset - b19b4a06afa6 · Chaos Computer Club Lëtzebuerg Projects

Changeset - b19b4a06afa6

Parent rev.

Child rev.

[Not reviewed]

Merge dev

0 6 1

Dennis Fink - 8 years ago 2017-07-10 17:10:25
dennis.fink@c3l.lu

Merged default

7 files changed with 182 insertions and 87 deletions:

ennstatus/static/videos/subtitles/Tor_animation.lb.vtt

167

ennstatus/templates/base.html

ennstatus/templates/donate/index.html

ennstatus/templates/root/about.html

ennstatus/templates/root/index.html

ennstatus/templates/status/macros.html

setup.py

0 comments (0 inline, 0 general)

ennstatus/static/videos/subtitles/Tor_animation.lb.vtt

➞

Show inline comments

@@ new file 100644 @@
 WEBVTT
 :00:02.000 --> 00:00:04.500
 Den Internet ass scho laang zum Alldag ginn.
 :00:04.700 --> 00:00:07.700
 Mir deelen déi ganzen Zäit, Informatiounen
 iwwert eis selwer an aus eisem Privatliewen
 :00:08.000 --> 00:00:11.000
 wat mer iessen, Leit déi mer treffen,
 :00:11.200 --> 00:00:14.200
 wouhinner mer ginn a wat mer liesen.
 :00:14.500 --> 00:00:16.400
 Looss et mech méi genee erklären.
 :00:16.600 --> 00:00:19.600
 Genau an dësem Moment,
 wann ee probéiert eppes iwwert dech erauszefannen,
 :00:19.800 --> 00:00:23.200
 gesinn se deng réel Identitéit,
 wous de dech genee befënns, däi Betribssystem,
 :00:23.400 --> 00:00:26.500
 all d'Websäiten déi s de besicht hues,
 de Browser deen s de benotz fir am Internet ze surfen,
 :00:26.700 --> 00:00:29.000
 an esou vill méi Informatiounen
 iwwert dech an däi Liewen
 :00:29.200 --> 00:00:31.500
 Wat s de wahrscheinlech net wollts
 mat Friemen deelen,
 :00:32.200 --> 00:00:34.000
 Friemer déi des Daten
 fir hier Zwecker ausnotze kennen.
 :00:34.500 --> 00:00:37.000
 Dat geschitt net, wann een Tor benotzt!
 :00:37.200 --> 00:00:40.800
 Den Tor Browser schützt eis Privatsphär
 an eis Identitéit am Internet.
 :00:41.000 --> 00:00:44.800
 Tor séchert är Verbindung
 mat dräi Schichte vu Verschlësselung
 :00:45.000 --> 00:00:49.300
 a leet se duerch dräi fräiwëlleg bedriwwen
 Server iwwert ganz Welt,
 :00:49.500 --> 00:00:54.500
 wat et eis erlaabt anonym
 am Internet ze kommunizéieren.
 :00:56.100 --> 00:00:57.400
 Tor schützt och eis Daten
 :00:57.600 --> 00:01:02.600
 géint Masseniwwerwaachung
 vu Firmen oder Regierungen.
 :01:02.800 --> 00:01:07.800
 Vläit liefs de an engem Land,
 dat probéiert den Internet ze zenséieren an ze kontrolléieren.
 :01:08.000 --> 00:01:13.200
 Oder du wëlls einfach net, datt Grouss Firmen
 ee Gewënn aus denge perséinlechen Daten erzielen.
 :01:13.800 --> 00:01:16.500
 Tor mécht, datt all seng Benotzer
 d'selwecht ausgesinn
 :01:16.700 --> 00:01:20.800
 an dat bréngt den Nokucker duercherneen
 a mecht dech Anonym.
 :01:21.900 --> 00:01:25.700
 Wat also méi Leit d'Tor Netzwierk benotzen,
 em sou méi staark gëtt et.
 :01:25.800 --> 00:01:29.800
 Well et ass méi einfach sech an enger Grupp
 vu Leit ze verstoppen déi d'selwecht ausgesi wei ee selwer.
 :01:30.000 --> 00:01:32.500
 Du kanns Zensur ëmgoen
 ouni fäerten ze mussen,
 :01:32.700 --> 00:01:36.100
 datt den Zenséierer weess wat s du
 um Internet mëss.
 :01:37.000 --> 00:01:39.200
 Reklamme wäerten dech net méi
 Méint laang verfollegen,
 :01:39.400 --> 00:01:43.500
 well s du eemol
 op e Produit geklickt hues.
 :01:44.500 --> 00:01:49.200
 An deem s de Tor benotz, wäerten d'Websäiten
 déi s du besichs net méi wësse ween s du bass,
 :01:49.800 --> 00:01:52.100
 oder vu wat fir engem Deel aus der Welt s
 du grad kenns,
 :01:52.800 --> 00:01:54.400
 ausser du loggs dech an a sees et hinnen.
 :01:55.200 --> 00:01:56.400
 An deem s de Tor erofluets a benotz,
 :01:56.800 --> 00:01:59.100
 kanns du Leit schützen
 déi Anonymitéit brauchen.
 :01:59.800 --> 00:02:03.900
 wéi Aktivisten, Journalisten a Blogger.
 :02:04.200 --> 00:02:15.200
 Download a benotz Tor!
 Oder bedreif e Relais an erziel aneren dovunner!

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -108,13 +108,13 @@ @@
             <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>
           </ul>
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistics <b class="caret"></b></a>
           <ul class="dropdown-menu">
-            <li><a href="https://stats.enn.lu/">Exit Nodes Traffic</a></li>
             <li><a href="https://stats.enn.lu/">Traffic</a></li>
             <li class="divider"></li>
             <li><a href="{{ url_for('statistics.worldmap') }}">Worldmap</a></li>
           </ul>
         </li>
       </ul>
     </div>

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -16,32 +16,12 @@ @@
 #}
 {% extends "base.html" %}
 {% set title = "Donate" %}
 {% block styles %}
   {{ super() }}
   <style>
     .bitpay-donate { margin:20px 0;}
     .bitpay-donate fieldset {border:0;}
     .bitpay-donate input {padding:4px 10px;}
     .bitpay-donate select {padding:3px 10px;}
     .bitpay-donate ul, .bitpay-donate li {padding:0;margin:0;list-style:none;}
     .bitpay-donate li {padding:10px 0;}
     .bitpay-donate-field {clear:both;}
     .bitpay-donate-field label {float:left;width:100px;}
     .bitpay-donate-field div {float:left;}
     .bitpay-donate-field-email {width:80%;}
     .bitpay-donate-field-price {width:40%;}
     .bitpay-donate-field-currency {width:40%;}
     .bitpay-donate-button-wrapper {clear:both;margin:auto;text-align:center;}
     input.bitpay-donate-error {border:2px solid red;}
   </style>
 {% endblock %}
 {% block content %}
   <div class="col-md-4">
     <img src="{{ url_for('static', filename='images/Support.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>
     <div class="text-center">
       <h2>Support us!</h2>
     </div>
@@ @@ -60,22 +40,22 @@ @@
         <center>
           <h3>Wire Transfer </h3>
         </center>
         <div class="well well-sm">
           <p>
             <strong>Account holder:</strong> Frënn vun der Ënn A.S.B.L.<br>
-            <strong>BIC/SWIFT:</strong> BCEELULL<br>
+            <strong>BIC/SWIFT:</strong> BCEELULLXXX<br>
             <strong>IBAN:</strong> LU65 0019 4055 6782 7000<br>
           </p>
        </div>
        <div class="well well-sm">
        <p>
          <strong>Account holder:</strong> Chaos Computer Club Lëtzebuerg A.S.B.L.<br>
-         <strong>BIC/SWIFT:</strong> BCEELULL<br>
+         <strong>BIC/SWIFT:</strong> BCEELULLXXX<br>
          <strong>IBAN:</strong> LU29 0019 2855 3890 4000<br>
-         <strong>Subject:</strong> * to FVDE<br>
+         <strong>Subject:</strong> Donation FVDE<br>
        </p>
        </div>
       </div>
     </div>
     <div class="col-md-4 clearfix">
       <div class="thumbnail">
@@ @@ -97,71 +77,18 @@ @@
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
           <h3>Bitcoin</h3>
         </center>
         <div class="well well-sm">
          <center>
           <p>
             <strong>Bitcoin Address:</strong> 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC
             <b>Bitcoin Address:</b> 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC
             <a href="bitcoin:1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC?label=FVDE"><img src="{{ url_for('static', filename='images/btc.png') }}" width="200"></a>
           </p>
           <form class="bitpay-donate form-horizontal" action="https://bitpay.com/checkout" method="POST" onsubmit="return checkRequiredFields(this);">
             <input name="action" type="hidden" value="checkout">
             <div class="form-group">
               <label class="col-sm-2 control-label">Email:</label>
               <div class="col-sm-10">
                 <input class="bitpay-donate-field-email form-control" name="orderID" type="email" placeholder="Email address (optional)" maxlenght=50 autocapitalize=off autocorrect=off />
               </div>
             </div>
             <div class="form-group">
               <label class="col-sm-2 control-label">Amount:</label>
               <div class="col-sm-10">
                 <input class="bitpay-donate-field-price form-control" style="display: inline;" name="price" type="number" value="0.1" placeholder="Amount" maxlenght="10" min="0.000006" step="0.000001" />
                 <select class="bitpay-donate-field-currency form-control" style="display: inline;" value="" name="currency">
                   <option selected="selected" value="BTC">BTC</option>
                   <option value="USD">USD</option>
                   <option value="EUR">EUR</option>
                   <option value="GBP">GBP</option>
                   <option value="AUD">AUD</option>
                   <option value="BGN">BGN</option>
                   <option value="BRL">BRL</option>
                   <option value="CAD">CAD</option>
                   <option value="CHF">CHF</option>
                   <option value="CNY">CNY</option>
                   <option value="CZK">CZK</option>
                   <option value="DKK">DKK</option>
                   <option value="HKD">HKD</option>
                   <option value="HRK">HRK</option>
                   <option value="HUF">HUF</option>
                   <option value="IDR">IDR</option>
                   <option value="ILS">ILS</option>
                   <option value="INR">INR</option>
                   <option value="JPY">JPY</option>
                   <option value="KRW">KRW</option>
                   <option value="LTL">LTL</option>
                   <option value="LVL">LVL</option>
                   <option value="MXN">MXN</option>
                   <option value="MYR">MYR</option>
                   <option value="NOK">NOK</option>
                   <option value="NZD">NZD</option>
                   <option value="PHP">PHP</option>
                   <option value="PLN">PLN</option>
                   <option value="RON">RON</option>
                   <option value="RUB">RUB</option>
                   <option value="SEK">SEK</option>
                   <option value="SGD">SGD</option>
                   <option value="THB">THB</option>
                   <option value="TRY">TRY</option>
                   <option value="ZAR">ZAR</option>
                 </select>
               </div>
             </div>
             <input type="hidden" name="data" value="k3TZs7wPLcCaurVVZ8iW/MCwDwe94LwJrA22SKBNMwOmVLQ3AAW4TncxqpNFPVNScSCIqoQR+zwgYJSRtFBFciNwQ7Ezcnqb3JptfVNnDubnNy1KVTFCYXZ8m/83aFxFC0p6Lyf07a0HCEWTBMQhmVjFLuQYSa57kYQd+fzlL+lbi5pkBW8ok884l1ELYq6W">
             <div class="bitpay-donate-button-wrapper form-group">
               <input class="bitpay-donate-button" name="submit" src="https://bitpay.com/img/donate-button.svg" onerror="this.onerror=null; this.src='https://bitpay.com/img/donate-button-md.png'" width="126" height="48" type="image" alt="BitPay, the easy way the easy way to pay with bitcoins." border="0">
             </div>
           </form>
          </center>
         </div>
       </div>
     </div>
   </div>
   <div class="col-md-12">
     <div class="col-md-4">

ennstatus/templates/root/about.html

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ @@
       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" >
         <dt>President</dt><dd>Sam Grüneisen</dd>
-        <dt>Secretary</dt><dd>Nadine Schneider</dd>
+        <dt>Secretary</dt><dd>Max Wahl</dd>
         <dt>Treasurer</dt><dd>Patrick Kahr</dd>
         <dt>International Ambassador</dt><dd>Christophe Kemp</dd>
         <dt>Developers</dt><dd>Dennis Fink (Ënnstatus Lead Developer), Sam Grüneisen</dd>
       </dl>
     </p>
     <h3>Statutes</h3>

ennstatus/templates/root/index.html

➞

Show inline comments

@@ @@ -48,14 +48,14 @@ @@
         <footer>Georges, Teacher</footer>
       </p>
     </blockquote>
   </div>
   <div class="col-md-3">
     <blockquote>
       <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>
       <a href="https://vimeo.com/160952562" target="blank"><h2 class="text-center">Privacy is the right to a free mind!</h2></a>
       <footer>Edward J. Snowden</footer>
     </blockquote>
   </div>
   <div class="col-md-6">
     <div class="embed-responsive embed-responsive-16by9">
       <video id="tor-animation" width="560" height="315" controls preload="none" class="video-js vjs-default-skin vjs-big-play-centered embed-responsive-item" data-setup="">
         <source src="{{ url_for('static', filename='videos/Tor_Animation.webm') }}" type='video/webm' />
@@ @@ -69,12 +69,13 @@ @@
         <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.lb.vtt') }}" srclang="lb" label="Lëtzebuergesch">
         <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="русский">
         <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.sq.vtt') }}" srclang="sq" label="Shqiptar">
         <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.sv.vtt') }}" srclang="sv" label="Svenska">

ennstatus/templates/status/macros.html

➞

Show inline comments

@@ @@ -48,15 +48,15 @@ @@
   {% endif %}
   {% if '.onion' in request.url_root %}
     {% set url_root = '//%s' % config['ENNSTATUS_GLOBE_ONION_ADDRESS'] %}
   {% elif '.bit' in request.url_root %}
     {% set url_root = '//%s' % config['ENNSTATUS_GLOBE_BIT_ADDRESS'] %}
   {% else %}
-    {% set url_root = '//globe.enn.lu' %}
+    {% set url_root = '//atlas.enn.lu' %}
   {% endif %}
-  <a href="{{ url_root }}/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
+  <a href="{{ url_root }}/#details/{{ fingerprint }}">{{ fingerprint|upper}}</a>
 {% endmacro %}
 {% macro create_name(name) %}
   <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>
 {% endmacro %}

setup.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ def _get_requirements(): @@
     lines = [line[:-1] for line in lines if not line.startswith('#')]
     return lines
 setup(name='Ennstatus',
-      version='5.6.3',
+      version='5.6.5',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',
       author_email='info@enn.lu',
       url='https://bitbucket.org/fvde/ennstatus',
       license='GPLv3+',

0 comments (0 inline, 0 general)