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

Changeset - 447435fa7bff

Parent rev.

Child rev.

[Not reviewed]

Merge default

2 21 0

Dennis Fink - 9 years ago 2015-10-23 00:30:15
dennis.fink@c3l.lu

Merge dev

23 files changed with 149 insertions and 165 deletions:

.hgignore

ennstatus/api/views.py

ennstatus/root/functions.py

ennstatus/root/views.py

ennstatus/static/css/ennstatus.css

ennstatus/status/views.py

ennstatus/templates/base.html

ennstatus/templates/donate/index.html

ennstatus/templates/donate/received.html

ennstatus/templates/root/about.html

ennstatus/templates/root/abuse.html

ennstatus/templates/root/bridgeprogram.html

ennstatus/templates/root/contact.html

ennstatus/templates/root/index.html

ennstatus/templates/root/member.html

ennstatus/templates/root/membership.html

ennstatus/templates/root/mirrors.html

ennstatus/templates/root/partners.html

ennstatus/templates/root/services.html

ennstatus/templates/statistics/worldmap.html

ennstatus/templates/status/about.html

ennstatus/templates/status/macros.html

setup.py

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

@@ @@ -16,3 +16,7 @@ test/* @@
 run.py
 *.csv
 *.json
 *.orig
 Ennstatus.egg-info/*
 doc/*

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -12,6 +12,7 @@ import strict_rfc3339 @@
 import pygeoip
 import requests
 from ennstatus import csrf
 from ennstatus.status.functions import (single_server, all_servers,
                                         all_servers_by_type)
 from .model import Server
@@ @@ -22,6 +23,7 @@ gi4 = pygeoip.GeoIP('/usr/share/GeoIP/Ge @@
 gi6 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIPv6.dat', pygeoip.MEMORY_CACHE)
 @csrf.exempt
 @api_page.route('/update', methods=('POST',))
 @httpauth.login_required
 def update():

ennstatus/root/functions.py

➞

Show inline comments

@@ @@ -44,7 +44,7 @@ def send_membership_mail(form): @@
                 current_app.logger.debug(body)
                 msg.body = encrypted_body if encrypted_body else body
                 conn.send(msg)
-        flash('Application successfully sended!', 'success')
+        flash('Application successfully submitted!', 'success')
     except KeyError:
         flash(
             'Internal server error! Please get in touch with us at info@enn.lu!',
@@ @@ -92,7 +92,7 @@ def send_bridgeprogram_mail(form): @@
                 msg.body = encrypted_body if encrypted_body else body
                 conn.send(msg)
         flash(
-            'Application successfully sended! We will send you an email with further information!',
+            'Application successfully submitted! We will send you an email with further information!',
             'success'
+        )
     except KeyError:

ennstatus/root/views.py

➞

Show inline comments

@@ @@ -19,11 +19,6 @@ def about(): @@
     return render_template('root/about.html')
 @root_page.route('/services')
 def services():
     return render_template('root/services.html')
 @root_page.route('/partners')
 def partners():
     return render_template('root/partners.html')

ennstatus/static/css/ennstatus.css

➞

Show inline comments

@@ @@ -62,7 +62,6 @@ a, a:hover, a:active, a:visited { @@
+}
 /* Multi level dropdown menu http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3 */
 .dropdown-submenu {
@@ @@ -166,3 +165,37 @@ a, a:hover, a:active, a:visited { @@
 .checkbox label, .radio label {
     padding-left: 12px;
+}
 .btn {
     margin-top: 5px;
     margin-bottom: 5px;
+}
 .highlighted-label {
     font-size: 24px;
     margin-bottom: 10px;
     font-weight: 500;
     line-height: 1.1;
     box-sizing: border-box;
     display: inline-block;
+}
 .highlighted-label-big {
     font-size: 30px;
     margin-bottom: 10px;
     font-weight: 500;
     line-height: 1.1;
     box-sizing: border-box;
     display: inline-block;
+}
 .btn-enn {
     color: #fff;
     background-color: #00ae18;
     border-color: #009414;
+}
 footer {
     margin-bottom: 20px;
+}

ennstatus/status/views.py

➞

Show inline comments

@@ @@ -40,8 +40,3 @@ def single(server_name): @@
     server = single_server(server_name.lower())
     kwargs = {server['server_type'].lower(): [server]}
     return render_template('status/index.html', **kwargs)
 @status_page.route('/about')
 def about():
     return render_template('status/about.html')

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -117,12 +117,16 @@ @@
   {% block content %}
   {% endblock %}
   </div>
   <footer>
+  <footer class="col-md-12">
     <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 class="text-center clearfix">
       <div class="pull-left">
         <a href="https://twitter.com/FrennVunDerEnn" target="blank">@FrennVunDerEnn</a>
       </div>
       <strong>Frënn vun der Enn a.s.b.l.</strong>  <em>(R.C.S. Luxembourg F 9.478)</em>
       <div class="pull-right">
         <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US" target="blank">CC-BY-NC-SA</a>
       </div>
     </div>
   </footer>
 </div>

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -23,16 +23,18 @@ @@
 {% endblock %}
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Support.png') }}" class="img-rounded" alt="WhoIs" width="160"></img>
     <h2>Support us!</h2>
   <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>
   </div>
   <div class="col-md-8">
     <div class="jumbotron">
       <h2>Take action for a <strong>#FreeInternet</strong>! Support us today!</h2>
       <p>As a non-profit organization we are 100% community funded. Donations from our members and supporters will be used to <strong>power Tor nodes</strong>, <strong>print flyers and posters</strong> or cover administrative charges.</p>
       <h3><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a>
       <a href="{{ url_for('root.bridgeprogram') }}"><span class="label label-primary">Adopt a Tor Bridge</span></a></h3>
       <span class='highlighted-label'><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a></span>
       <span class='highlighted-label'><a href="{{ url_for('root.bridgeprogram') }}"><span class="label label-primary">Adopt a Tor Bridge</span></a></span>
     </div>
   </div>
   <div class="col-md-12">
@@ @@ -58,7 +60,7 @@ @@
        </div>
       </div>
     </div>
     <div class="col-md-4">
+    <div class="col-md-4 clearfix">
       <div class="thumbnail">
         <center>
           <h3>SnailMail</h3>
@@ @@ -68,12 +70,11 @@ @@
             <form class="form-inline" role="form" method="POST" action"{{ url_for('donate.index') }}">
               {{ form.hidden_tag() }}
               <div class="form-group">
                 {{ form.country(_class="form-class") }}
                 {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
                 <noscript><input type="submit" class="btn btn-enn btn-sm" value="Submit"></noscript>
               </div>
               <input type="submit" class="btn btn-primary btn-sm" value="Submit">
             </form>
           </div>
           <div class="clearfix"></div>
           <address>
             <strong>Frënn vun der Ënn, ASBL</strong><br>
                     BPM 381892<br>
@@ @@ -85,7 +86,7 @@ @@
       </div>
     </div>
     <div class="col-md-4">
       <div>
+      <div class="thumbnail">
         <center>
           <h3>Bitcoin</h3>
         </center>

ennstatus/templates/donate/received.html

➞

Show inline comments

@@ @@ -6,6 +6,8 @@ @@
 {% block content %}
   <div class="col-md-12">
     <h2>Received Donations</h2>
   </div>
   <div class="col-md-12 clearfix">
     <div class="pull-left">
       {% if csv_file %}
         <h3>{{ '-'.join([year, month]) }}</h3>
@@ @@ -18,15 +20,14 @@ @@
         {{ form.hidden_tag() }}
         <div class="form-group">
           {{ form.year.label }}
-          {{ form.year(_class="form-control") }}
+          {{ form.year(class_='form-control input-sm') }}
           {{ form.month.label }}
           {{ form.month(_class="form-control") }}
           {{ form.month(class_='form-control input-sm') }}
           <input type="submit" class="btn btn-enn btn-sm" value="Submit">
         </div>
         <input type="submit" class="btn btn-primary btn-sm" value="Submit">
       </form>
     </div>
   </div>
   <div class="clearfix"></div>
   <div class="col-md-12">
     {% if csv_file %}
       {{ macros.create_donations_table(csv_file) }}

ennstatus/templates/root/about.html

➞

Show inline comments

@@ @@ -3,12 +3,6 @@ @@
 {% 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">
     <h2>Who we are</h2>
     <h3>Organization</h3>

ennstatus/templates/root/abuse.html

➞

Show inline comments

@@ @@ -3,10 +3,6 @@ @@
 {% set title = "Abuse" %}
 {% block content %}
   <!-- <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Abuse.png') }}" class="img-rounded" alt="FVDE_Logo_LQ" width="160"></img>
     <h2>Report Abuse!</h2>
   </div> -->
   <div class="col-md-offset-1 col-md-11">
     <h2>Abuse handling</h2>
     <p class="lead">We take our mission very seriously and carefully examine abuse cases.</p>

ennstatus/templates/root/bridgeprogram.html

➞

Show inline comments

@@ @@ -75,7 +75,7 @@ @@
       </div>
       <div class="form-group">
         <div class="col-lg-offset-2 col-lg-10">
-          {{ form.submit(class_='btn btn-primary') }}
+          {{ form.submit(class_='btn btn-enn') }}
         </div>
       </div>
     </form>

ennstatus/templates/root/contact.html

➞

Show inline comments

@@ @@ -3,24 +3,25 @@ @@
 {% set title = "Contact" %}
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Contact.png') }}" class="img-rounded" alt="WhoIs" width="160"></img>
     <h2>Contact</h2>
   <div class="col-md-4">
     <img src="{{ url_for('static', filename='images/Contact.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>
     <div class="text-center">
       <h2>Contact</h2>
     </div>
   </div>
   <div class="col-md-8">
     <h2>General</h2>
   <div class="col-md-8 clearfix">
     <h2 class="pull-left">General</h2>
     <div class="pull-right">
       <form class="form-inline" role="form" method="POST" action="{{ url_for('root.contact') }}">
         {{ form.hidden_tag()}}
         <div class="form-group">
           {{ form.country.label }}
           {{ form.country(_class="form-control") }}
           {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
           <noscript><input type="submit" class="btn btn-enn btn-sm" value="Submit"></noscript>
         </div>
         <input type="submit" class="btn btn-primary btn-sm" value="Submit">
       </form>
     </div>
     <div class="clearfix"></div>
   </div>
   <div class="col-md-8">
     <p>Please mail all general inquiries to:</p>
     <address>
       <strong>Frënn vun der Ënn, ASBL</strong><br>

ennstatus/templates/root/index.html

➞

Show inline comments

@@ @@ -8,8 +8,8 @@ @@
 {% 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 class="col-md-4">
     <img class="img-rounded center-block" alt="FVDE_Logo" src="{{ url_for('static', filename='images/logo/FVDE_logo_resize.png') }}"></img>
   </div>
   <div class="col-md-8">
     <div class="jumbotron">
@@ @@ -17,8 +17,9 @@ @@
 	    <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>
       <span class="highlighted-label"><a href="{{ url_for('root.member') }}"><span class="label label-success">Become a Member</span></a></span>
       <span class="highlighted-label"><a href="{{ url_for('donate.index') }}"><span class="label label-primary">Donate</span></a></span>
       <span class="highlighted-label pull-right"><a href="https://twitter.com/FrennVunDerEnn" target="blank"><span class="label label-info">@FrennVunDerEnn</span></a></span>
     </div>
   </div>
   <div class="col-md-1">
@@ @@ -38,8 +39,8 @@ @@
     </blockquote>
   </div>
   <div class="col-md-6">
     <p>
       <video id="tor-animation" width="560" height="315" controls preload="none" class="video-js vjs-default-skin vjs-big-play-centered" data-setup="">
     <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' />
         <source src="{{ url_for('static', filename='videos/Tor_Animation.mp4') }}" type='video/mp4' />
@@ @@ -64,7 +65,7 @@ @@
         <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>
   <div class="col-md-6">
       <p class=lead>
@@ @@ -74,7 +75,7 @@ @@
       <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>
+      <span class="highlighted-label-big"><a href="http://torproject.lu" target="blank"><span class="label label-info">Learn more about Tor</span></a></span>
   </div>
 {% endblock %}

ennstatus/templates/root/member.html

➞

Show inline comments

@@ @@ -3,9 +3,11 @@ @@
 {% set title = "Member" %}
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Partners.png') }}" class="img-rounded" alt="Partners" width="160"></img>
     <h3>Join</h3>
   <div class="col-md-4">
     <img src="{{ url_for('static', filename='images/Partners.png') }}" class="img-responsive img-rounded center-block" alt="Partners" width="160"></img>
     <div class="text-center">
       <h2>Join</h2>
     </div>
   </div>
   <div class="col-md-8">
     <h2>Membership</h2>

ennstatus/templates/root/membership.html

➞

Show inline comments

@@ @@ -60,7 +60,7 @@ @@
       </div>
       <div class="form-group">
         <div class="col-lg-offset-2 col-lg-10">
-        {{ form.submit(class_='btn btn-primary') }}
+        {{ form.submit(class_='btn btn-enn') }}
         </div>
       </div>
     </div>

ennstatus/templates/root/mirrors.html

➞

Show inline comments

@@ @@ -11,9 +11,11 @@ @@
 {% endif %}
 {% 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 class="col-md-4">
     <img src="{{ url_for('static', filename='images/Services.png') }}" class="img-responsive img-rounded center-block" alt="Partners" width="160"></img>
     <div class="text-center">
       <h2>Mirrors</h2>
     </div>
   </div>
   <div class="col-md-8">
     <h2>Mirrors</h2>

ennstatus/templates/root/partners.html

➞

Show inline comments

@@ @@ -3,9 +3,11 @@ @@
 {% set title = "Partners" %}
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Partners.png') }}" class="img-rounded" alt="Partners" width="160"></img>
     <h3>Partners</h3>
   <div class="col-md-4">
     <img src="{{ url_for('static', filename='images/Partners.png') }}" class="img-responsive img-rounded center-block" alt="Partners" width="160"></img>
     <div class="text-center">
       <h2>Partners</h2>
     </div>
   </div>
   <div class="col-md-8">
     <h2>Partners</h2>

ennstatus/templates/root/services.html

➞

Show inline comments

deleted file

ennstatus/templates/statistics/worldmap.html

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
 {% block scripts %}
   {{ super() }}
   <script src="{{ url_for('static', filename="js/d3/d3.min.js") }}"></script>
   <script src="{{ url_for('static', filename="js/topojson/topojson.js") }}"></script>
   <script src="{{ url_for('static', filename="js/worldmap.js") }}"></script>
   <script src="{{ url_for('static', filename='js/d3/d3.min.js') }}"></script>
   <script src="{{ url_for('static', filename='js/topojson/topojson.js') }}"></script>
   <script src="{{ url_for('static', filename='js/worldmap.js') }}"></script>
 {% endblock %}

ennstatus/templates/status/about.html

➞

Show inline comments

deleted file

ennstatus/templates/status/macros.html

➞

Show inline comments

@@ @@ -55,46 +55,48 @@ @@
     {% set headers = ('#', 'Name', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated <noscript>(UTC)</noscript>') %}
   {% endif %}
   <h2>{{ server_type|title }}</h2>
   <table class="table table-bordered table-striped sortable">
     <thead>
       <tr>
         {% for name in headers %}
           <th>{{ name|safe }}</th>
   <div class="table-responsive">
     <table class="table table-bordered table-striped sortable">
       <thead>
         <tr>
           {% for name in headers %}
             <th>{{ name|safe }}</th>
           {% endfor %}
         </tr>
       </thead>
       <tbody>
         {% for server in servers|sort(attribute='name')|sort(attribute='country') %}
         <tr {% if server.name in config['ENNSTATUS_BRIDGE_PROGRAM'] %}class="info"{% endif %}>
             <td>{{ loop.index }}</td>
             {% if server_type in ('exit', 'relay') %}
               <td>{{ create_name(server.name) }}</td>
               <td>{{ server.ip }}</td>
               <td>{{ server.ip6 or 'N/A' }}</td>
             {% else %}
               <td>
                 {% if server.name in config['ENNSTATUS_BRIDGE_PROGRAM'] %}
                   <a href="{{ url_for('root.bridgeprogram') }}">{{ server.name }}</a>
                 {% else %}
                   {{ server.name }}
                 {% endif %}
               </td>
             {% endif %}
             <td>{{ colorize_status(server.status) }}</td>
             <td>{{ create_country(server.country) }}</td>
             <td>{{ create_fingerprint(server.fingerprint, server.type) }}</td>
             {% if server_type == 'bridge' %}
               <td>{{ colorize_obfs(server.obfs) }}</td>
               <td>{{ colorize_obfs(server.fteproxy) }}</td>
               <td>{{ colorize_obfs(server.flashproxy) }}</td>
               <td>{{ colorize_obfs(server.meek) }}</td>
             {% endif %}
             <td>{{ create_date(server.last_updated) }}
             </td>
           </tr>
         {% endfor %}
       </tr>
     </thead>
     <tbody>
       {% for server in servers|sort(attribute='name')|sort(attribute='country') %}
       <tr {% if server.name in config['ENNSTATUS_BRIDGE_PROGRAM'] %}class="info"{% endif %}>
           <td>{{ loop.index }}</td>
           {% if server_type in ('exit', 'relay') %}
             <td>{{ create_name(server.name) }}</td>
             <td>{{ server.ip }}</td>
             <td>{{ server.ip6 or 'N/A' }}</td>
           {% else %}
             <td>
               {% if server.name in config['ENNSTATUS_BRIDGE_PROGRAM'] %}
                 <a href="{{ url_for('root.bridgeprogram') }}">{{ server.name }}</a>
               {% else %}
                 {{ server.name }}
               {% endif %}
             </td>
           {% endif %}
           <td>{{ colorize_status(server.status) }}</td>
           <td>{{ create_country(server.country) }}</td>
           <td>{{ create_fingerprint(server.fingerprint, server.type) }}</td>
           {% if server_type == 'bridge' %}
             <td>{{ colorize_obfs(server.obfs) }}</td>
             <td>{{ colorize_obfs(server.fteproxy) }}</td>
             <td>{{ colorize_obfs(server.flashproxy) }}</td>
             <td>{{ colorize_obfs(server.meek) }}</td>
           {% endif %}
           <td>{{ create_date(server.last_updated) }}
           </td>
         </tr>
       {% endfor %}
     </tbody>
   </table>
       </tbody>
     </table>
   </div>
   {% if server_type == 'bridge' %}
     <div class="alert alert-info alert-dismissible" role="alert">
       <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>

setup.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ def _get_requirements(): @@
 setup(name='Ennstatus',
       version='5.0.3',
+      version='5.0.3-dev',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',

0 comments (0 inline, 0 general)