From 9c587ea12e9812bce47c7a2a317674f61a364cd9 Mon Sep 17 00:00:00 2001
From: Jordan <me@jordan.im>
Date: Wed, 16 Sep 2020 13:14:07 -0700
Subject: combine exit/middle count columns in misc pages, looks cleaner

---
 tor-metrics/templates/misc-families.html | 16 ++++++----------
 tor-metrics/templates/misc-networks.html | 15 +++++----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/tor-metrics/templates/misc-families.html b/tor-metrics/templates/misc-families.html
index 8df7d6d..5a151cb 100644
--- a/tor-metrics/templates/misc-families.html
+++ b/tor-metrics/templates/misc-families.html
@@ -14,14 +14,11 @@
         {% endif %}
         <th class="visible-md visible-lg">Contact</th>
         {% if sorted_by_label == 'exit_count' %}
-        <th>Exit Count</th>
+        <th>Exit / <a href="families-by-middle-count.html">Middle</a></th>
+        {% elif sorted_by_label == 'middle_count' %}
+        <th><a href="families-by-exit-count.html">Exit</a> / Middle</th>
         {% else %}
-        <th><a href="families-by-exit-count.html">Exit Count</a></th>
-        {% endif %}
-        {% if sorted_by_label == 'middle_count' %}
-        <th>Middle Count</th>
-        {% else %}
-        <th><a href="families-by-middle-count.html">Middle Count</a></th>
+        <th><a href="families-by-exit-count.html">Exit</a> / <a href="families-by-middle-count.html">Middle</a></th>
         {% endif %}
         {% if sorted_by_label == 'first_seen' %}
         <th>First Seen</th>
@@ -48,10 +45,9 @@
             {% else %}
             <td>none</td>{% endif %}
 
-            <td>{{ v['exit_count'] }}</td>
-            <td>{{ v['middle_count'] }}</td>
+            <td>{{ v['exit_count'] }} / {{ v['middle_count'] }}</td>
 
-            <td>{{ v['first_seen'].split(' ', 1)[0]|escape }}</td>
+            <td><a href="{{ path_prefix }}first_seen/{{ v['first_seen'].split(' ', 1)[0]|escape }}">{{ v['first_seen'].split(' ', 1)[0]|escape }}</a></td>
 
             {% for r in v['relays'] %}
             {% set _dummy = processed.update({relays.json['relay_subset'][r]['fingerprint']: None}) %}
diff --git a/tor-metrics/templates/misc-networks.html b/tor-metrics/templates/misc-networks.html
index 97b7c28..2eeabb1 100644
--- a/tor-metrics/templates/misc-networks.html
+++ b/tor-metrics/templates/misc-networks.html
@@ -15,14 +15,11 @@
         <th><a href="networks-by-bandwidth.html">Bandwidth</a></th>
         {% endif %}
         {% if sorted_by_label == 'exit_count' %}
-        <th>Exit Count</th>
+        <th>Exit / <a href="networks-by-middle-count.html">Middle</a></th>
+        {% elif sorted_by_label == 'middle_count' %}
+        <th><a href="networks-by-exit-count.html">Exit</a> / Middle</th>
         {% else %}
-        <th><a href="networks-by-exit-count.html">Exit Count</a></th>
-        {% endif %}
-        {% if sorted_by_label == 'middle_count' %}
-        <th>Middle Count</th>
-        {% else %}
-        <th><a href="networks-by-middle-count.html">Middle Count</a></th>
+        <th><a href="networks-by-exit-count.html">Exit</a> / <a href="families-by-middle-count.html">Middle</a></th>
         {% endif %}
     </tr>
     <tbody>
@@ -49,9 +46,7 @@
 
             <td>{{ obs_bandwidth }}</td>
 
-            <td>{{ v['exit_count'] }}</td>
-
-            <td>{{ v['middle_count'] }}</td>
+            <td>{{ v['exit_count'] }} / {{ v['middle_count'] }}</td>
         </tr>
         {% endfor %}
     </tbody>
-- 
cgit v1.2.3-54-g00ecf