commit 40fdc07c251eb2a954f898737be60edc39c58b0a Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Wed Nov 2 09:34:13 2011 +0100 Turn <h3> headers into links and move anchors above them. Enhancement and implementation suggested by web guru Sebastian. --- web/WEB-INF/network.jsp | 37 +++++++++++++++++++++---------------- web/WEB-INF/packages.jsp | 4 ++-- web/WEB-INF/performance.jsp | 15 +++++++++------ web/WEB-INF/users.jsp | 9 +++++---- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 9d83cf1..dc7facc 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -15,11 +15,12 @@ <div class="main-column"> <h2>Tor Metrics Portal: Network</h2> <br> -<h3>Relays and bridges in the network</h3> +<a name="networksize"></a> +<h3><a href="#networksize" class="anchor">Relays and bridges in the +network</a></h3> <br> <p>The following graph shows the average daily number of relays and bridges in the network.</p> -<a name="networksize"></a> <img src="networksize.png${networksize_url}" width="576" height="360" alt="Network size graph"> <form action="network.html#networksize"> @@ -46,11 +47,11 @@ bridges in the network.</p> <p><a href="csv/networksize.csv">CSV</a> file containing all data.</p> <br> -<h3>Relays by country</h3> +<a name="relaycountries"></a> +<h3><a href="#relaycountries" class="anchor">Relays by country</a></h3> <br> <p>The following graph shows the average daily number of relays by country.</p> -<a name="relaycountries"></a> <img src="relaycountries.png${relaycountries_url}" width="576" height="360" alt="Relay countries graph"> <form action="network.html#relaycountries"> @@ -84,12 +85,13 @@ country.</p> <p><a href="csv/relaycountries.csv">CSV</a> file containing all data.</p> <br> -<h3>Relays with Exit, Fast, Guard, and Stable flags</h3> +<a name="relayflags"></a> +<h3><a href="#relayflags" class="anchor">Relays with Exit, Fast, Guard, +and Stable flags</a></h3> <br> <p>The directory authorities assign certain flags to relays that clients use for their path selection decisions. The following graph shows the average number of relays with these flags assigned.</p> -<a name="relayflags"></a> <img src="relayflags.png${relayflags_url}" width="576" height="360" alt="Relay flags graph"> <form action="network.html#relayflags"> @@ -127,7 +129,8 @@ average number of relays with these flags assigned.</p> <p><a href="csv/relayflags.csv">CSV</a> file containing all data.</p> <br> -<h3>Relays by version</h3> +<a name="versions"></a> +<h3><a href="#versions" class="anchor">Relays by version</a></h3> <br> <p>Relays report the Tor version that they are running to the directory authorities. See the @@ -136,7 +139,6 @@ page</a> and <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">ChangeLog file</a> to find out which Tor versions are stable and unstable. The following graph shows the number of relays by version.</p> -<a name="versions"></a> <img src="versions.png${versions_url}" width="576" height="360" alt="Relay versions graph"> <form action="network.html#versions"> @@ -165,12 +167,12 @@ The following graph shows the number of relays by version.</p> platform strings of currently running relays.</p> <br> -<h3>Relays by platform</h3> +<a name="platforms"></a> +<h3><a href="#platforms" class="anchor">Relays by platform</a></h3> <br> <p>Relays report the operating system they are running to the directory authorities. The following graph shows the number of relays by platform.</p> -<a name="platforms"></a> <img src="platforms.png${platforms_url}" width="576" height="360" alt="Relay platforms graph"> <form action="network.html#platforms"> @@ -199,13 +201,14 @@ platform.</p> platform strings of currently running relays.</p> <br> -<h3>Total relay bandwidth in the network</h3> +<a name="bandwidth"></a> +<h3><a href="#bandwidth" class="anchor">Total relay bandwidth in the +network</a></h3> <br> <p>Relays report how much bandwidth they are willing to contribute and how many bytes they have read and written in the past 24 hours. The following graph shows total advertised bandwidth and bandwidth history of all relays in the network.</p> -<a name="bandwidth"></a> <img src="bandwidth.png${bandwidth_url}" width="576" height="360" alt="Relay bandwidth graph"> <form action="network.html#bandwidth"> @@ -262,11 +265,12 @@ in the network.</p> </div> </form> -<h3>Relay bandwidth by Exit and/or Guard flags</h3> +<a name="bwhist-flags"></a> +<h3><a href="#bwhist-flags" class="anchor">Relay bandwidth by Exit and/or +Guard flags</a></h3> <br> <p>The following graph shows the relay bandwidth of all relays with the Exit and/or Guard flags assigned by the directory authorities.</p> -<a name="bwhist-flags"></a> <img src="bwhist-flags.png${bwhist_flags_url}" width="576" height="360" alt="Relay bandwidth by flags graph"> <form action="network.html#bwhist-flags"> @@ -293,14 +297,15 @@ Exit and/or Guard flags assigned by the directory authorities.</p> <p><a href="csv/bwhist-flags.csv">CSV</a> file containing all data.</p> <br> -<h3>Number of bytes spent on answering directory requests</h3> +<a name="dirbytes"></a> +<h3><a href="#dirbytes" class="anchor">Number of bytes spent on answering +directory requests</a></h3> <br> <p>Relays running on 0.2.2.15-alpha or higher report the number of bytes they spend on answering directory requests. The following graph shows total written and read bytes as well as written and read dir bytes. The dir bytes are extrapolated from those relays who report them to reflect the number of written and read dir bytes by all relays.</p> -<a name="dirbytes"></a> <img src="dirbytes.png${dirbytes_url}" width="576" height="360" alt="Dir bytes graph"> <form action="network.html#dirbytes"> diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp index 9bfee70..afe5e50 100644 --- a/web/WEB-INF/packages.jsp +++ b/web/WEB-INF/packages.jsp @@ -14,12 +14,12 @@ <div class="main-column"> <h2>Tor Metrics Portal: Packages</h2> <br> -<h3>Packages requested from GetTor</h3> +<a name="gettor"></a> +<h3><a href="#gettor" class="anchor">Packages requested from GetTor</a></h3> <br> <p>GetTor allows users to fetch the Tor software via email. The following graph shows the number of packages requested from GetTor per day.</p> <p> -<a name="gettor"></a> <img src="gettor.png${gettor_url}" width="576" height="360" alt="GetTor graph"> <form action="packages.html#gettor"> diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index 095bda2..05b9bf3 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -14,13 +14,14 @@ <div class="main-column"> <h2>Tor Metrics Portal: Performance</h2> <br> -<h3>Time to download files over Tor</h3> +<a name="torperf"></a> +<h3><a href="#torperf" class="anchor">Time to download files over +Tor</a></h3> <br> <p>The following graphs show the performance of the Tor network as experienced by its users. The graphs contain the average (median) time to request files of three different sizes over Tor as well as first and third quartile of request times.</p> -<a name="torperf"></a> <img src="torperf.png${torperf_url}" width="576" height="360" alt="Torperf graph"> <form action="performance.html#torperf"> @@ -58,7 +59,9 @@ quartile of request times.</p> <p><a href="csv/torperf.csv">CSV</a> file containing all data.</p> <br> -<h3>Timeouts and failures of downloading files over Tor</h3> +<a name="torperf-failures"></a> +<h3><a href="#torperf-failures" class="anchor">Timeouts and failures of +downloading files over Tor</a></h3> <br> <p>The following graphs show the fraction of timeouts and failures of downloading files over Tor as experienced by users. @@ -66,7 +69,6 @@ A timeout occurs when a 50 KiB (1 MiB, 5 MiB) download does not complete within 4:55 minutes (29:55 minutes, 59:55 minutes). A failure occurs when the download completes, but the response is smaller than 50 KiB (1 MiB, 5 MiB).</p> -<a name="torperf-failures"></a> <img src="torperf-failures.png${torperf_failures_url}" width="576" height="360" alt="Torperf failures graph"> <form action="performance.html#torperf-failures"> @@ -104,7 +106,9 @@ than 50 KiB (1 MiB, 5 MiB).</p> <p><a href="csv/torperf-failures.csv">CSV</a> file containing all data.</p> <br> -<h3>Fraction of connections used uni-/bidirectionally</h3> +<a name="connbidirect"></a> +<h3><a href="#connbidirect" class="anchor">Fraction of connections used +uni-/bidirectionally</a></h3> <br> <p>The following graph shows the fraction of connections that is used uni- or bi-directionally. Every 10 seconds, relays determine for every @@ -116,7 +120,6 @@ connection as "Mostly reading" or "Mostly writing," respectively. All other connections are classified as "Both reading and writing." After classifying connections, read and write counters are reset for the next 10-second interval. Statistics are aggregated over 24 hours.</p> -<a name="connbidirect"></a> <img src="connbidirect.png${connbidirect_url}" width="576" height="360" alt="Fraction of direct connections used uni-/bidirectionally"> diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 5c89fe7..bdd01b4 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -16,14 +16,15 @@ <h2>Tor Metrics Portal: Users</h2> <br> -<h3>Directly connecting Tor users</h3> +<a name="direct-users"></a> +<h3><a href="#direct-users" class="anchor">Directly connecting Tor +users</a></h3> <br> <p>After being connected to the Tor network, users need to refresh their list of running relays on a regular basis. They send their requests to one out of a few hundred directory mirrors to save bandwidth of the directory authorities. The following graphs show an estimate of recurring Tor users based on the requests seen by a few dozen directory mirrors.</p> -<a name="direct-users"></a> <p><b>Daily directly connecting users:</b></p> <img src="direct-users.png${direct_users_url}" width="576" height="360" alt="Direct users graph"> @@ -132,13 +133,13 @@ Tor users (direct and bridge) per month by country.</p> daily Tor users (direct and bridge) per month by country.</p> <br> -<h3>Tor users via bridges</h3> +<a name="bridge-users"></a> +<h3><a href="#bridge-users" class="anchor">Tor users via bridges</a></h3> <br> <p>Users who cannot connect directly to the Tor network instead connect via bridges, which are non-public relays. The following graphs display an estimate of Tor users via bridges based on the unique IP addresses as seen by a few hundred bridges.</p> -<a name="bridge-users"></a> <img src="bridge-users.png${bridge_users_url}" width="576" height="360" alt="Bridge users graph"> <form action="users.html#bridge-users">