Changeset - 6a8a02e0083b
[Not reviewed]
Merge default
0 1 0
Dennis Fink - 10 years ago 2014-12-10 23:07:24
dennis.fink@c3l.lu
Added ipv6 in table for exits and relays
1 file changed with 2 insertions and 1 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/status/macros.html
Show inline comments
 
@@ -35,13 +35,13 @@
 
{% macro create_name(name) %}
 
  <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>
 
{% endmacro %}
 

	
 
{% macro create_server_table(server_type, servers) %}
 
  {% if server_type in ('Exit', 'Relay') %}
 
    {% set headers = ('#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)') %}
 
    {% set headers = ('#', 'Name', 'IP', 'IP6', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)') %}
 
  {% else %}
 
    {% set headers = ('#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated (UTC)') %}
 
  {% endif %}
 
  <h2>{{ server_type }}</h2>
 
  <table class="table table-bordered table-striped">
 
    <thead>
 
@@ -55,12 +55,13 @@
 
      {% for server in servers|sort(attribute='server_name')|sort(attribute='country') %}
 
      <tr {% if server['server_name'] in config['ENNSTATUS_BRIDGE_PROGRAM'] %}class="info"{% endif %}>
 
          <td>{{ loop.index }}</td>
 
          {% if server_type in ('Exit', 'Relay') %}
 
            <td>{{ create_name(server['server_name']) }}</td>
 
            <td>{{ server['ip'] }}</td>
 
            <td>{{ server.get('ip6', 'N/A') }}</td>
 
          {% else %}
 
            {% if server['server_name'] in config['ENNSTATUS_BRIDGE_PROGRAM'] %}
 
              <td><a href="{{ url_for('root.bridgeprogram') }}">{{ server['server_name'] }}</a></td>
 
            {% else %}
 
              <td>{{ server['server_name'] }}</td>
 
            {% endif %}
0 comments (0 inline, 0 general)