From 49011d7240eef38d55d803c150cfdfdd1dc2ee11 Mon Sep 17 00:00:00 2001 From: Jordan Date: Wed, 16 Sep 2020 02:17:26 -0700 Subject: smaller, relay-prefixed running column, related to #1 --- tor-metrics/templates/relay-list.html | 14 +++++++------- tor-metrics/templates/skeleton.html | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tor-metrics/templates/relay-list.html b/tor-metrics/templates/relay-list.html index 4ecadd6..ada0b2b 100644 --- a/tor-metrics/templates/relay-list.html +++ b/tor-metrics/templates/relay-list.html @@ -5,6 +5,7 @@

{% block description %}{% endblock %}

+ @@ -14,7 +15,6 @@ - @@ -27,6 +27,12 @@ {% else %} {% set obs_bandwidth = '%s %s'|format((relay['observed_bandwidth'] / 1000)|round(2, 'common'), 'KB/s') %}{% endif %} + {% if relay['running'] %} + + {% else %} + + {% endif %} + {% if key != 'family' and relay['effective_family']|length > 1 %} {% else %} @@ -79,12 +85,6 @@ - {% if relay['running'] %} - - {% else %} - - {% endif %} - {% if key != 'first_seen' %} {% else %} diff --git a/tor-metrics/templates/skeleton.html b/tor-metrics/templates/skeleton.html index 2f67bb1..239d11d 100644 --- a/tor-metrics/templates/skeleton.html +++ b/tor-metrics/templates/skeleton.html @@ -7,6 +7,14 @@ + {% endblock %} -- cgit v1.2.3-54-g00ecf

	Nickname		Bandwidth	Country	Platform	Flags	Running	First Seen
⚫	⚫	{{ relay['nickname']\|truncate(10)\|escape }} ({{ relay['effective_family']\|length }})	{% for flag in relay['flags'] %}{% if flag != 'StaleDesc' %} {% endif %}{% endfor %}	True	False	{{ relay['first_seen'].split(' ', 1)[0]\|escape }}