Changeset - fbc229d3812b
[Not reviewed]
default
0 1 0
Dennis Fink - 11 years ago 2014-09-13 19:03:30
dennis.fink@c3l.lu
Sort the servers by country and server_name
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/status/macros.html
Show inline comments
 
@@ -31,49 +31,49 @@
 
  {% endif %}
 
  <a href="http://globe.enn.lu/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>
 
{% endmacro %}
 

	
 
{% 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)') %}
 
  {% 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>
 
      <tr>
 
        {% for name in headers %}
 
          <th>{{ name }}</th>
 
        {% endfor %}
 
      </tr>
 
    </thead>
 
    <tbody>
 
      {% for server in servers %}
 
      {% 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>
 
          {% 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 %}
 
          {% endif %}
 
          {% for status in (server['server_status'], server['tor_status']) %}
 
            <td>{{ colorize_status(status) }}</td>
 
          {% endfor %}
 
          <td>{{ create_country(server['country']) }}</td>
 
          <td>{{ create_fingerprint(server['fingerprint'], server['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>{{ server['last_updated'] }}</td>
0 comments (0 inline, 0 general)