[tor-commits] [metrics-web/master] Remove navigation bar.
karsten at torproject.org
karsten at torproject.org
Tue Nov 25 15:42:09 UTC 2014
commit 3359b4f845e997569bc4ca1e1fff71630b5079f7
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Tue Nov 25 16:37:19 2014 +0100
Remove navigation bar.
---
website/web/WEB-INF/about.jsp | 4 ++--
website/web/WEB-INF/advbwdist-data.jsp | 6 +++---
website/web/WEB-INF/advbwdist-perc.jsp | 4 ++--
website/web/WEB-INF/advbwdist-relay.jsp | 4 ++--
website/web/WEB-INF/bandwidth-data.jsp | 4 ++--
website/web/WEB-INF/bandwidth-flags.jsp | 4 ++--
website/web/WEB-INF/bandwidth.jsp | 6 +++---
website/web/WEB-INF/banner.jsp | 16 ----------------
website/web/WEB-INF/bubbles.jsp | 6 +++---
website/web/WEB-INF/bwhist-flags.jsp | 4 ++--
website/web/WEB-INF/clients-data.jsp | 4 ++--
website/web/WEB-INF/cloudbridges.jsp | 4 ++--
website/web/WEB-INF/connbidirect-data.jsp | 4 ++--
website/web/WEB-INF/connbidirect.jsp | 4 ++--
website/web/WEB-INF/dir.jsp | 4 ++--
website/web/WEB-INF/dirbytes.jsp | 4 ++--
website/web/WEB-INF/error.jsp | 4 ++--
website/web/WEB-INF/footer.jsp | 1 +
website/web/WEB-INF/index.jsp | 2 +-
website/web/WEB-INF/network.jsp | 4 ++--
website/web/WEB-INF/networksize.jsp | 4 ++--
website/web/WEB-INF/oxford-anonymous-internet.jsp | 4 ++--
website/web/WEB-INF/performance.jsp | 4 ++--
website/web/WEB-INF/platforms.jsp | 4 ++--
website/web/WEB-INF/relayflags.jsp | 4 ++--
website/web/WEB-INF/servers-data.jsp | 4 ++--
website/web/WEB-INF/stats.jsp | 5 +++--
website/web/WEB-INF/torperf-data.jsp | 4 ++--
website/web/WEB-INF/torperf-failures.jsp | 4 ++--
website/web/WEB-INF/torperf.jsp | 4 ++--
website/web/WEB-INF/users.jsp | 4 ++--
website/web/WEB-INF/userstats-bridge-country.jsp | 4 ++--
website/web/WEB-INF/userstats-bridge-table.jsp | 4 ++--
website/web/WEB-INF/userstats-bridge-transport.jsp | 4 ++--
website/web/WEB-INF/userstats-bridge-version.jsp | 4 ++--
website/web/WEB-INF/userstats-censorship-events.jsp | 4 ++--
website/web/WEB-INF/userstats-relay-country.jsp | 4 ++--
website/web/WEB-INF/userstats-relay-table.jsp | 4 ++--
website/web/WEB-INF/versions.jsp | 4 ++--
39 files changed, 78 insertions(+), 92 deletions(-)
diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp
index 57d0155..7d3e51b 100644
--- a/website/web/WEB-INF/about.jsp
+++ b/website/web/WEB-INF/about.jsp
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: About</title>
+ <title>Tor Metrics — About</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="../css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -10,7 +10,7 @@
<div class="center">
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: About</h2>
+<h2><a href="/">Tor Metrics</a> — About</h2>
<br>
<h3>Frequently used terms</h3>
diff --git a/website/web/WEB-INF/advbwdist-data.jsp b/website/web/WEB-INF/advbwdist-data.jsp
index 10fa543..c7d1768 100644
--- a/website/web/WEB-INF/advbwdist-data.jsp
+++ b/website/web/WEB-INF/advbwdist-data.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Advertised bandwidth distribution and n-th fastest relays</title>
+ <title>Tor Metrics — Advertised bandwidth distribution and n-th fastest relays</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,8 +13,8 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Advertised bandwidth distribution and n-th fastest
-relays</h3>
+<h2><a href="/">Tor Metrics</a> — Advertised bandwidth distribution and n-th fastest
+relays</h2>
<br>
<p>The following data file contains statistics on the distribution of
<a href="about.html#advertised-bandwidth">advertised bandwidth</a> of
diff --git a/website/web/WEB-INF/advbwdist-perc.jsp b/website/web/WEB-INF/advbwdist-perc.jsp
index 6906727..c51902b 100644
--- a/website/web/WEB-INF/advbwdist-perc.jsp
+++ b/website/web/WEB-INF/advbwdist-perc.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Advertised bandwidth distribution</title>
+ <title>Tor Metrics — Advertised bandwidth distribution</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Advertised bandwidth distribution</h3>
+<h2><a href="/">Tor Metrics</a> — Advertised bandwidth distribution</h2>
<br>
<p>The following graph shows the distribution of the
<a href="about.html#advertised-bandwidth">advertised bandwidth</a> of
diff --git a/website/web/WEB-INF/advbwdist-relay.jsp b/website/web/WEB-INF/advbwdist-relay.jsp
index 6f7f300..0de9400 100644
--- a/website/web/WEB-INF/advbwdist-relay.jsp
+++ b/website/web/WEB-INF/advbwdist-relay.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Advertised bandwidth of n-th fastest relays</title>
+ <title>Tor Metrics — Advertised bandwidth of n-th fastest relays</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Advertised bandwidth of n-th fastest relays</h3>
+<h2><a href="/">Tor Metrics</a> — Advertised bandwidth of n-th fastest relays</h2>
<br>
<p>The following graph shows the
<a href="about.html#advertised-bandwidth">advertised bandwidth</a> of the
diff --git a/website/web/WEB-INF/bandwidth-data.jsp b/website/web/WEB-INF/bandwidth-data.jsp
index 8d401ae..2499e4a 100644
--- a/website/web/WEB-INF/bandwidth-data.jsp
+++ b/website/web/WEB-INF/bandwidth-data.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Bandwidth provided and consumed by relays</title>
+ <title>Tor Metrics — Bandwidth provided and consumed by relays</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Bandwidth provided and consumed by relays</h3>
+<h2><a href="/">Tor Metrics</a> — Bandwidth provided and consumed by relays</h2>
<br>
<p>The following data file contains statistics on
<a href="about.html#advertised-bandwidth">advertised</a> and
diff --git a/website/web/WEB-INF/bandwidth-flags.jsp b/website/web/WEB-INF/bandwidth-flags.jsp
index a2d154b..7207b9b 100644
--- a/website/web/WEB-INF/bandwidth-flags.jsp
+++ b/website/web/WEB-INF/bandwidth-flags.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Advertised bandwidth and bandwidth history by relay flags</title>
+ <title>Tor Metrics — Advertised bandwidth and bandwidth history by relay flags</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Advertised bandwidth and bandwidth history by relay flags</h3>
+<h2><a href="/">Tor Metrics</a> — Advertised bandwidth and bandwidth history by relay flags</h2>
<br>
<p>The following graph shows
<a href="about.html#advertised-bandwidth">advertised</a> and
diff --git a/website/web/WEB-INF/bandwidth.jsp b/website/web/WEB-INF/bandwidth.jsp
index 6c78dc5..3d84d59 100644
--- a/website/web/WEB-INF/bandwidth.jsp
+++ b/website/web/WEB-INF/bandwidth.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Total relay bandwidth in the network</title>
+ <title>Tor Metrics — Total relay bandwidth in the network</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Bandwidth</h2>
+<h2><a href="/">Tor Metrics</a> — Bandwidth</h2>
<br>
<p>The graphs on this page (except one) have moved to their own subpages.
This is part of an effort to make navigation on this website more intuitive.
@@ -35,7 +35,7 @@ Sorry for any inconvenience caused by this.</p>
<hr>
<br>
-<h3>Tor Metrics: Total relay bandwidth in the network</h3>
+<h2><a href="/">Tor Metrics</a> — Total relay bandwidth in the network</h2>
<br>
<p>The following graph shows the total
<a href="about.html#advertised-bandwidth">advertised</a> and
diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp
index 3127b26..e69de29 100644
--- a/website/web/WEB-INF/banner.jsp
+++ b/website/web/WEB-INF/banner.jsp
@@ -1,16 +0,0 @@
-<table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
-<tr>
- <td class="banner-left">
- <a href="/index.html">
- <img src="/images/top-left.png" alt="Click to go to home page"
- width="193" height="79"></a></td>
- <td class="banner-middle">
- <% String currentPage = request.getRequestURI(); %>
- <a <% if (currentPage.endsWith("index.jsp")) {
- %>class="current"<%} else {%>href="/index.html"<%}%>>Home</a>
- <a <% if (currentPage.endsWith("about.jsp")) {
- %>class="current"<%} else {%>href="/about.html"<%}%>>About</a>
- </td>
- <td class="banner-right"></td>
-</tr>
-</table>
diff --git a/website/web/WEB-INF/bubbles.jsp b/website/web/WEB-INF/bubbles.jsp
index 118d23f..eb57a04 100644
--- a/website/web/WEB-INF/bubbles.jsp
+++ b/website/web/WEB-INF/bubbles.jsp
@@ -2,7 +2,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Network bubble graphs</title>
+ <title>Tor Metrics — Network bubble graphs</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Diversity</h2>
+<h2><a href="/">Tor Metrics</a> — Diversity</h2>
<br>
<p>The graph on this page will soon move to its own subpages.
This is part of an effort to make navigation on this website more intuitive.
@@ -28,7 +28,7 @@ Sorry for any inconvenience caused by this.</p>
<hr>
<br>
-<h3>Tor Metrics: Network bubble graphs</h3>
+<h2><a href="/">Tor Metrics</a> — Network bubble graphs</h2>
<br>
<p>The following graph visualizes diversity of currently running
<a href="about.html#relay">relays</a> in terms of their probability to be
diff --git a/website/web/WEB-INF/bwhist-flags.jsp b/website/web/WEB-INF/bwhist-flags.jsp
index a550b06..36e3cd5 100644
--- a/website/web/WEB-INF/bwhist-flags.jsp
+++ b/website/web/WEB-INF/bwhist-flags.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Relay bandwidth by Exit and/or Guard flags</title>
+ <title>Tor Metrics — Relay bandwidth by Exit and/or Guard flags</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Relay bandwidth by Exit and/or Guard flags</h3>
+<h2><a href="/">Tor Metrics</a> — Relay bandwidth by Exit and/or Guard flags</h2>
<br>
<p>The following graph shows the
<a href="about.html#bandwidth-history">consumed bandwidth</a> reported by
diff --git a/website/web/WEB-INF/clients-data.jsp b/website/web/WEB-INF/clients-data.jsp
index ec80e33..a6dcbc3 100644
--- a/website/web/WEB-INF/clients-data.jsp
+++ b/website/web/WEB-INF/clients-data.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Estimated number of clients in the Tor network</title>
+ <title>Tor Metrics — Estimated number of clients in the Tor network</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Estimated number of clients in the Tor network</h3>
+<h2><a href="/">Tor Metrics</a> — Estimated number of clients in the Tor network</h2>
<br>
<p>The following data file contains estimates on the number of
<a href="about.html#client">clients</a> in the network.
diff --git a/website/web/WEB-INF/cloudbridges.jsp b/website/web/WEB-INF/cloudbridges.jsp
index c470a40..df80a34 100644
--- a/website/web/WEB-INF/cloudbridges.jsp
+++ b/website/web/WEB-INF/cloudbridges.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Tor Cloud bridges</title>
+ <title>Tor Metrics — Tor Cloud bridges</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -15,7 +15,7 @@
<div class="main-column">
<a name="cloudbridges"></a>
-<h3>Tor Metrics: Tor Cloud bridges</h3>
+<h2><a href="/">Tor Metrics</a> — Tor Cloud bridges</h2>
<br>
<p>The following graph shows the number of running
<a href="about.html#bridge">bridges</a> that are deployed in
diff --git a/website/web/WEB-INF/connbidirect-data.jsp b/website/web/WEB-INF/connbidirect-data.jsp
index c343585..51c78a7 100644
--- a/website/web/WEB-INF/connbidirect-data.jsp
+++ b/website/web/WEB-INF/connbidirect-data.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Fraction of connections used uni-/bidirectionally</title>
+ <title>Tor Metrics — Fraction of connections used uni-/bidirectionally</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Fraction of connections used uni-/bidirectionally</h3>
+<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally</h2>
<br>
<p>The following data file contains statistics on the fraction of direct
connections between a <a href="about.html#relay">relay</a> and other nodes
diff --git a/website/web/WEB-INF/connbidirect.jsp b/website/web/WEB-INF/connbidirect.jsp
index d6f06a6..affa329 100644
--- a/website/web/WEB-INF/connbidirect.jsp
+++ b/website/web/WEB-INF/connbidirect.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Fraction of connections used uni-/bidirectionally</title>
+ <title>Tor Metrics — Fraction of connections used uni-/bidirectionally</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Fraction of connections used uni-/bidirectionally</h3>
+<h2><a href="/">Tor Metrics</a> — Fraction of connections used uni-/bidirectionally</h2>
<br>
<p>The following graph shows the fraction of direct connections between a
<a href="about.html#relay">relay</a> and other nodes in the network that
diff --git a/website/web/WEB-INF/dir.jsp b/website/web/WEB-INF/dir.jsp
index ac4aca3..9aa3cb9 100644
--- a/website/web/WEB-INF/dir.jsp
+++ b/website/web/WEB-INF/dir.jsp
@@ -2,7 +2,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Index of ${directory}</title>
+ <title>Tor Metrics — Index of ${directory}</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -11,7 +11,7 @@
<div class="center">
<%@ include file="banner.jsp"%>
<div class="main-column">
- <h2>Tor Metrics: Index of ${directory}</h2>
+ <h2><a href="/">Tor Metrics</a> — Index of ${directory}</h2>
<br>
<c:forEach var="file" items="${files}" >
<a href="${directory}/${file}${extension}">${file}${extension}</a><br>
diff --git a/website/web/WEB-INF/dirbytes.jsp b/website/web/WEB-INF/dirbytes.jsp
index e628b12..384f71c 100644
--- a/website/web/WEB-INF/dirbytes.jsp
+++ b/website/web/WEB-INF/dirbytes.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Number of bytes spent on answering directory requests</title>
+ <title>Tor Metrics — Number of bytes spent on answering directory requests</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Number of bytes spent on answering directory requests</h3>
+<h2><a href="/">Tor Metrics</a> — Number of bytes spent on answering directory requests</h2>
<br>
<p>The following graph shows the portion of
<a href="about.html#bandwidth-history">consumed bandwidth</a> that
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index a0484dc..a712ef1 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Error</title>
+ <title>Tor Metrics — Error</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -12,7 +12,7 @@
<div class="center">
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Error</h2>
+<h2><a href="/">Tor Metrics</a> — Error</h2>
<br>
<p>
Oops! Something went wrong here! We encountered a
diff --git a/website/web/WEB-INF/footer.jsp b/website/web/WEB-INF/footer.jsp
index cab9e7f..a4feba7 100644
--- a/website/web/WEB-INF/footer.jsp
+++ b/website/web/WEB-INF/footer.jsp
@@ -1,3 +1,4 @@
+ <p><a href="about.html">About Tor Metrics</a></p>
<p>This material is supported in part by the National Science
Foundation under Grant No. CNS-0959138. Any opinions,
finding, and conclusions or recommendations expressed in this
diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp
index bc9148d..92fd44d 100644
--- a/website/web/WEB-INF/index.jsp
+++ b/website/web/WEB-INF/index.jsp
@@ -10,7 +10,7 @@
<div class="center">
<%@ include file="banner.jsp"%>
<div class="main-column">
- <h2>Tor Metrics</h2>
+ <h2><a href="/">Tor Metrics</a></h2>
<br>
<p>Welcome to Tor Metrics, the primary place to learn interesting
facts about the Tor network, the largest deployed anonymity
diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp
index 83216b0..4b43420 100644
--- a/website/web/WEB-INF/network.jsp
+++ b/website/web/WEB-INF/network.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Servers</title>
+ <title>Tor Metrics — Servers</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<div class="center">
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Servers</h2>
+<h2><a href="/">Tor Metrics</a> — Servers</h2>
<br>
<p>The graphs on this page have moved to their own subpages.
diff --git a/website/web/WEB-INF/networksize.jsp b/website/web/WEB-INF/networksize.jsp
index 30af831..24d00d8 100644
--- a/website/web/WEB-INF/networksize.jsp
+++ b/website/web/WEB-INF/networksize.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Relays and bridges in the network</title>
+ <title>Tor Metrics — Relays and bridges in the network</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Relays and bridges in the network</h3>
+<h2><a href="/">Tor Metrics</a> — Relays and bridges in the network</h2>
<br>
<p>The following graph shows the number of running
<a href="about.html#relay">relays</a> and
diff --git a/website/web/WEB-INF/oxford-anonymous-internet.jsp b/website/web/WEB-INF/oxford-anonymous-internet.jsp
index bc659d0..3fa46d6 100644
--- a/website/web/WEB-INF/oxford-anonymous-internet.jsp
+++ b/website/web/WEB-INF/oxford-anonymous-internet.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Tor users as percentage of larger Internet population</title>
+ <title>Tor Metrics — Tor users as percentage of larger Internet population</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Tor users as percentage of larger Internet population</h3>
+<h2><a href="/">Tor Metrics</a> — Tor users as percentage of larger Internet population</h2>
<br>
<p>The Oxford Internet Institute made a cartogram visualization of Tor
users as compared to the overall Internet population.
diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp
index dd5d980..04231d3 100644
--- a/website/web/WEB-INF/performance.jsp
+++ b/website/web/WEB-INF/performance.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Performance</title>
+ <title>Tor Metrics — Performance</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Performance</h2>
+<h2><a href="/">Tor Metrics</a> — Performance</h2>
<br>
<p>The graphs on this page have moved to their own subpages.
This is part of an effort to make navigation on this website more intuitive.
diff --git a/website/web/WEB-INF/platforms.jsp b/website/web/WEB-INF/platforms.jsp
index d3d89c5..2a223c0 100644
--- a/website/web/WEB-INF/platforms.jsp
+++ b/website/web/WEB-INF/platforms.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Relays by platform</title>
+ <title>Tor Metrics — Relays by platform</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Relays by platform</a></h3>
+<h2><a href="/">Tor Metrics</a> — Relays by platform</a></h2>
<br>
<p>The following graph shows the number of running
<a href="about.html#relay">relays</a> by operating system.
diff --git a/website/web/WEB-INF/relayflags.jsp b/website/web/WEB-INF/relayflags.jsp
index b885a8a..d0c3e1f 100644
--- a/website/web/WEB-INF/relayflags.jsp
+++ b/website/web/WEB-INF/relayflags.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Relays with Exit, Fast, Guard, Stable, and HSDir flags</title>
+ <title>Tor Metrics — Relays with Exit, Fast, Guard, Stable, and HSDir flags</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Relays with Exit, Fast, Guard, Stable, and HSDir flags</h3>
+<h2><a href="/">Tor Metrics</a> — Relays with Exit, Fast, Guard, Stable, and HSDir flags</h2>
<br>
<p>The following graph shows the number of running
diff --git a/website/web/WEB-INF/servers-data.jsp b/website/web/WEB-INF/servers-data.jsp
index d455d6e..a28269f 100644
--- a/website/web/WEB-INF/servers-data.jsp
+++ b/website/web/WEB-INF/servers-data.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Number of relays and bridges</title>
+ <title>Tor Metrics — Number of relays and bridges</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Number of relays and bridges</h3>
+<h2><a href="/">Tor Metrics</a> — Number of relays and bridges</h2>
<br>
<p>The following data file contains the number of running
<a href="about.html#relay">relays</a> and
diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp
index 21a0e07..6a807ac 100644
--- a/website/web/WEB-INF/stats.jsp
+++ b/website/web/WEB-INF/stats.jsp
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Statistics</title>
+ <title>Tor Metrics — Statistics</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -10,7 +10,8 @@
<div class="center">
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Statistics</h2>
+
+<h2><a href="/">Tor Metrics</a> — Statistics</h2>
<br>
<p>The data file specifications on this page have moved to their own subpages.
This is part of an effort to make navigation on this website more intuitive.
diff --git a/website/web/WEB-INF/torperf-data.jsp b/website/web/WEB-INF/torperf-data.jsp
index 5dc0af2..fc9d55c 100644
--- a/website/web/WEB-INF/torperf-data.jsp
+++ b/website/web/WEB-INF/torperf-data.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Performance of downloading static files over Tor</title>
+ <title>Tor Metrics — Performance of downloading static files over Tor</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Performance of downloading static files over Tor</h3>
+<h2><a href="/">Tor Metrics</a> — Performance of downloading static files over Tor</h2>
<br>
<p>The following data file contains aggregate statistics on performance
when downloading static files of different sizes over Tor.
diff --git a/website/web/WEB-INF/torperf-failures.jsp b/website/web/WEB-INF/torperf-failures.jsp
index 7897fab..154423f 100644
--- a/website/web/WEB-INF/torperf-failures.jsp
+++ b/website/web/WEB-INF/torperf-failures.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Timeouts and failures of downloading files over Tor</title>
+ <title>Tor Metrics — Timeouts and failures of downloading files over Tor</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Timeouts and failures of downloading files over Tor</h3>
+<h2><a href="/">Tor Metrics</a> — Timeouts and failures of downloading files over Tor</h2>
<br>
<p>The following graph shows the fraction of timeouts and failures when
downloading static files of different sizes over Tor.
diff --git a/website/web/WEB-INF/torperf.jsp b/website/web/WEB-INF/torperf.jsp
index 90aa880..562c210 100644
--- a/website/web/WEB-INF/torperf.jsp
+++ b/website/web/WEB-INF/torperf.jsp
@@ -3,7 +3,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Time to download files over Tor</title>
+ <title>Tor Metrics — Time to download files over Tor</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -13,7 +13,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Time to download files over Tor</h3>
+<h2><a href="/">Tor Metrics</a> — Time to download files over Tor</h2>
<br>
<p>The following graph shows overall performance when downloading static
files of different sizes over Tor.
diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp
index 015eea9..0b693a4 100644
--- a/website/web/WEB-INF/users.jsp
+++ b/website/web/WEB-INF/users.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Users</title>
+ <title>Tor Metrics — Users</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h2>Tor Metrics: Users</h2>
+<h2><a href="/">Tor Metrics</a> — Users</h2>
<br>
<p>The graphs and tables on this page have moved to their own subpages.
diff --git a/website/web/WEB-INF/userstats-bridge-country.jsp b/website/web/WEB-INF/userstats-bridge-country.jsp
index 2cbe715..814d33d 100644
--- a/website/web/WEB-INF/userstats-bridge-country.jsp
+++ b/website/web/WEB-INF/userstats-bridge-country.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Bridge users by country</title>
+ <title>Tor Metrics — Bridge users by country</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Bridge users by country</h3>
+<h2><a href="/">Tor Metrics</a> — Bridge users by country</h2>
<br>
<p>The following graph shows the estimated number of
<a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp
index 2b300e4..a243399 100644
--- a/website/web/WEB-INF/userstats-bridge-table.jsp
+++ b/website/web/WEB-INF/userstats-bridge-table.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Top-10 countries by bridge users</title>
+ <title>Tor Metrics — Top-10 countries by bridge users</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Top-10 countries by bridge users</h3>
+<h2><a href="/">Tor Metrics</a> — Top-10 countries by bridge users</h2>
<br>
<p>The following table shows the top-10 countries by estimated number of
<a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp
index 629c093..b9e4e04 100644
--- a/website/web/WEB-INF/userstats-bridge-transport.jsp
+++ b/website/web/WEB-INF/userstats-bridge-transport.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Bridge users by transport</title>
+ <title>Tor Metrics — Bridge users by transport</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Bridge users by transport</h3>
+<h2><a href="/">Tor Metrics</a> — Bridge users by transport</h2>
<br>
<p>The following graph shows the estimated number of
<a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-bridge-version.jsp b/website/web/WEB-INF/userstats-bridge-version.jsp
index 4cf4292..a8ac85b 100644
--- a/website/web/WEB-INF/userstats-bridge-version.jsp
+++ b/website/web/WEB-INF/userstats-bridge-version.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Bridge users by IP version</title>
+ <title>Tor Metrics — Bridge users by IP version</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Bridge users by IP version</h3>
+<h2><a href="/">Tor Metrics</a> — Bridge users by IP version</h2>
<br>
<p>The following graph shows the estimated number of
<a href="about.html#client">clients</a> connecting via
diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp
index 0f82f8a..1400192 100644
--- a/website/web/WEB-INF/userstats-censorship-events.jsp
+++ b/website/web/WEB-INF/userstats-censorship-events.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Top-10 countries by possible censorship events</title>
+ <title>Tor Metrics — Top-10 countries by possible censorship events</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Top-10 countries by possible censorship events</h3>
+<h2><a href="/">Tor Metrics</a> — Top-10 countries by possible censorship events</h2>
<br>
<p>The following table shows the top-10 countries by possible censorship
events, as obtained from an anomaly-based censorship-detection system (for
diff --git a/website/web/WEB-INF/userstats-relay-country.jsp b/website/web/WEB-INF/userstats-relay-country.jsp
index 2723241..c27afb1 100644
--- a/website/web/WEB-INF/userstats-relay-country.jsp
+++ b/website/web/WEB-INF/userstats-relay-country.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Direct users by country</title>
+ <title>Tor Metrics — Direct users by country</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Direct users by country</h3>
+<h2><a href="/">Tor Metrics</a> — Direct users by country</h2>
<br>
<p>The following graph shows the estimated number of directly-connecting
<a href="about.html#client">clients</a>; that is, it excludes clients
diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp
index c36c7a2..d565360 100644
--- a/website/web/WEB-INF/userstats-relay-table.jsp
+++ b/website/web/WEB-INF/userstats-relay-table.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Top-10 countries by directly connecting users</title>
+ <title>Tor Metrics — Top-10 countries by directly connecting users</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Top-10 countries by directly connecting users</h3>
+<h2><a href="/">Tor Metrics</a> — Top-10 countries by directly connecting users</h2>
<br>
<p>The following table shows the top-10 countries by estimated number of
directly-connecting <a href="about.html#client">clients</a>.
diff --git a/website/web/WEB-INF/versions.jsp b/website/web/WEB-INF/versions.jsp
index ebbef39..2e516ce 100644
--- a/website/web/WEB-INF/versions.jsp
+++ b/website/web/WEB-INF/versions.jsp
@@ -4,7 +4,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title>Tor Metrics: Relays by version</title>
+ <title>Tor Metrics — Relays by version</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
<link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
@@ -14,7 +14,7 @@
<%@ include file="banner.jsp"%>
<div class="main-column">
-<h3>Tor Metrics: Relays by version</h3>
+<h2><a href="/">Tor Metrics</a> — Relays by version</h2>
<br>
<p>The following graph shows the number of running
<a href="about.html#relay">relays</a> by tor software version.
More information about the tor-commits
mailing list