From cb5b8c8d95b62ea55f3717566dd3a580938ca6a3 Mon Sep 17 00:00:00 2001 From: Jordan Date: Wed, 16 Sep 2020 13:36:37 -0700 Subject: encapsulate family fingerprints and contact strings in tags --- tor-metrics/templates/family.html | 4 ++-- tor-metrics/templates/misc-families.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tor-metrics/templates/family.html b/tor-metrics/templates/family.html index 9f1d092..b4d88d8 100644 --- a/tor-metrics/templates/family.html +++ b/tor-metrics/templates/family.html @@ -1,4 +1,4 @@ {% extends "relay-list.html" %} {% block title %}Tor Relays :: Family {{ value|escape }}{% endblock %} -{% block header %}Home :: Family {{ value|escape }}{% endblock %} -{% block description %}Relays with effective family member {{ value|escape }} are responsible for ~{{ bandwidth }} MB/s of traffic, with {% if middle_count > 0 %}{{ middle_count }} middle relay{% if middle_count > 1 %}s{% endif %}{% if exit_count > 0 %} and {% endif %}{% endif %}{% if exit_count > 0 %}{{ exit_count }} exit relay{% if exit_count > 1 %}s{% endif %}{% endif %}.{% endblock %} +{% block header %}Home :: Family {{ value|escape }}{% endblock %} +{% block description %}Relays with effective family member {{ value|escape }} are responsible for ~{{ bandwidth }} MB/s of traffic, with {% if middle_count > 0 %}{{ middle_count }} middle relay{% if middle_count > 1 %}s{% endif %}{% if exit_count > 0 %} and {% endif %}{% endif %}{% if exit_count > 0 %}{{ exit_count }} exit relay{% if exit_count > 1 %}s{% endif %}{% endif %}.{% endblock %} diff --git a/tor-metrics/templates/misc-families.html b/tor-metrics/templates/misc-families.html index 5a151cb..7eb2de2 100644 --- a/tor-metrics/templates/misc-families.html +++ b/tor-metrics/templates/misc-families.html @@ -36,12 +36,12 @@ {% else %} {% set obs_bandwidth = '%s %s'|format((v['bandwidth'] / 1000)|round(2, 'common'), 'KB/s') %}{% endif %} - {{ k|escape }} + {{ k|escape }} {{ obs_bandwidth }} {% if v['contact'] %} - {{ v['contact']|truncate(50)|escape }} + {{ v['contact']|truncate(50)|escape }} {% else %} none{% endif %} -- cgit v1.2.3-54-g00ecf