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

Changeset - af07a4cf2b54

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Dennis Fink - 11 years ago 2014-07-12 17:46:58
dennis.fink@c3l.lu

Add fingerprint in bridges

2 files changed with 4 insertions and 7 deletions:

ennstatus/api/functions.py

ennstatus/templates/status/macros.html

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -75,10 +75,8 @@ def update_server(server, ip): @@
     if server['server_type'] == 'Bridge':
         server['obfs'] = literal_eval(server['obfs'])
         for key in ('fingerprint', 'ip'):
             if key in server:
                 del server[key]
         if 'ip' in server:
             del server['ip']
     else:
         if 'obfs' in server:
             del server['obfs']

ennstatus/templates/status/macros.html

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ @@
   {% if server_type in ('Exit', 'Relay') %}
     {% set headers = ['#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)'] %}
   {% else %}
     {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'OBFS', 'Last Updated (UTC)'] %}
+    {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'Last Updated (UTC)'] %}
   {% endif %}
   <h2>{{ server_type }}</h2>
   <table class="table table-bordered table-striped">
@@ @@ -62,9 +62,8 @@ @@
             <td>{{ colorize_status(status) }}</td>
           {% endfor %}
           <td>{{ create_country(server['country']) }}</td>
           {% if server_type in ('Exit', 'Relay') %}
             <td>{{ create_fingerprint(server['fingerprint']) }}</td>
-          {% else %}
+          {% if server_type == 'Bridge' %}
             <td>{{ colorize_obfs(server['obfs']) }}</td>
           {% endif %}
           <td>{{ server['last_updated'] }}</td>

0 comments (0 inline, 0 general)