diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html --- a/ennstatus/templates/status/macros.html +++ b/ennstatus/templates/status/macros.html @@ -55,46 +55,48 @@ {% set headers = ('#', 'Name', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated ') %} {% endif %}
{{ name|safe }} | +
---|
{{ name|safe }} | + {% endfor %} +||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ loop.index }} | + {% if server_type in ('exit', 'relay') %} +{{ create_name(server.name) }} | +{{ server.ip }} | +{{ server.ip6 or 'N/A' }} | + {% else %} ++ {% if server.name in config['ENNSTATUS_BRIDGE_PROGRAM'] %} + {{ server.name }} + {% else %} + {{ server.name }} + {% endif %} + | + {% endif %} +{{ colorize_status(server.status) }} | +{{ create_country(server.country) }} | +{{ create_fingerprint(server.fingerprint, server.type) }} | + {% if server_type == 'bridge' %} +{{ colorize_obfs(server.obfs) }} | +{{ colorize_obfs(server.fteproxy) }} | +{{ colorize_obfs(server.flashproxy) }} | +{{ colorize_obfs(server.meek) }} | + {% endif %} +{{ create_date(server.last_updated) }} + | +
{{ loop.index }} | - {% if server_type in ('exit', 'relay') %} -{{ create_name(server.name) }} | -{{ server.ip }} | -{{ server.ip6 or 'N/A' }} | - {% else %} -- {% if server.name in config['ENNSTATUS_BRIDGE_PROGRAM'] %} - {{ server.name }} - {% else %} - {{ server.name }} - {% endif %} - | - {% endif %} -{{ colorize_status(server.status) }} | -{{ create_country(server.country) }} | -{{ create_fingerprint(server.fingerprint, server.type) }} | - {% if server_type == 'bridge' %} -{{ colorize_obfs(server.obfs) }} | -{{ colorize_obfs(server.fteproxy) }} | -{{ colorize_obfs(server.flashproxy) }} | -{{ colorize_obfs(server.meek) }} | - {% endif %} -{{ create_date(server.last_updated) }} - | -