commit 6e4af910bd7120198e68a76ce9d84f7f16f61d90 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Mon Dec 9 15:51:06 2013 +0100 Change CSV links to new stats/* files. --- web/WEB-INF/network.jsp | 18 +++++++++--------- web/WEB-INF/performance.jsp | 6 +++--- web/WEB-INF/users.jsp | 6 +----- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 9d286c9..e0b297a 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -41,7 +41,7 @@ bridges in the network.</p> <p>Download graph as <a href="networksize.pdf${networksize_url}">PDF</a> or <a href="networksize.svg${networksize_url}">SVG</a>.</p> -<p><a href="csv/networksize.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="relayflags"></a> @@ -79,7 +79,7 @@ average number of relays with these flags assigned.</p> <p>Download graph as <a href="relayflags.pdf${relayflags_url}">PDF</a> or <a href="relayflags.svg${relayflags_url}">SVG</a>.</p> -<p><a href="csv/relayflags.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="versions"></a> @@ -112,7 +112,7 @@ The following graph shows the number of relays by version.</p> <p>Download graph as <a href="versions.pdf${versions_url}">PDF</a> or <a href="versions.svg${versions_url}">SVG</a>.</p> -<p><a href="csv/versions.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="platforms"></a> @@ -141,7 +141,7 @@ platform.</p> <p>Download graph as <a href="platforms.pdf${platforms_url}">PDF</a> or <a href="platforms.svg${platforms_url}">SVG</a>.</p> -<p><a href="csv/platforms.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="cloudbridges"></a> @@ -170,7 +170,7 @@ network.</p> <p>Download graph as <a href="cloudbridges.pdf${cloudbridges_url}">PDF</a> or <a href="cloudbridges.svg${cloudbridges_url}">SVG</a>.</p> -<p><a href="csv/cloudbridges.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="bandwidth"></a> @@ -201,7 +201,7 @@ in the network.</p> <p>Download graph as <a href="bandwidth.pdf${bandwidth_url}">PDF</a> or <a href="bandwidth.svg${bandwidth_url}">SVG</a>.</p> -<p><a href="csv/bandwidth.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> <a name="bwhist-flags"></a> @@ -230,7 +230,7 @@ Exit and/or Guard flags assigned by the directory authorities.</p> <p>Download graph as <a href="bwhist-flags.pdf${bwhist_flags_url}">PDF</a> or <a href="bwhist-flags.svg${bwhist_flags_url}">SVG</a>.</p> -<p><a href="csv/bwhist-flags.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> <a name="bandwidth-flags"></a> @@ -262,7 +262,7 @@ Guard flag.</p> <p>Download graph as <a href="bandwidth-flags.pdf${bandwidth_flags_url}">PDF</a> or <a href="bandwidth-flags.svg${bandwidth_flags_url}">SVG</a>.</p> -<p><a href="csv/bandwidth-flags.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> <a name="dirbytes"></a> @@ -294,7 +294,7 @@ the number of written and read dir bytes by all relays.</p> <p>Download graph as <a href="dirbytes.pdf${dirbytes_url}">PDF</a> or <a href="dirbytes.svg${dirbytes_url}">SVG</a>.</p> -<p><a href="csv/dirbytes.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> </div> </div> diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index d41232f..e220b59 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -56,7 +56,7 @@ graph.</p> <p>Download graph as <a href="torperf.pdf${torperf_url}">PDF</a> or <a href="torperf.svg${torperf_url}">SVG</a>.</p> -<p><a href="csv/torperf.csv">CSV</a> file containing all data.</p> +<p><a href="stats/torperf.csv">CSV</a> file containing all data.</p> <br> <a name="torperf-failures"></a> @@ -100,7 +100,7 @@ than 50 KiB (1 MiB, 5 MiB).</p> <p>Download graph as <a href="torperf-failures.pdf${torperf_failures_url}">PDF</a> or <a href="torperf-failures.svg${torperf_failures_url}">SVG</a>.</p> -<p><a href="csv/torperf-failures.csv">CSV</a> file containing all data.</p> +<p><a href="stats/torperf.csv">CSV</a> file containing all data.</p> <br> <a name="connbidirect"></a> @@ -138,7 +138,7 @@ classifying connections, read and write counters are reset for the next <p>Download graph as <a href="connbidirect.pdf${connbidirect_url}">PDF</a> or <a href="connbidirect.svg${connbidirect_url}">SVG</a>.</p> -<p><a href="csv/connbidirect.csv">CSV</a> file containing all data.</p> +<p><a href="stats/connbidirect.csv">CSV</a> file containing all data.</p> <br> </div> diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 788b3a8..45ecdee 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -247,12 +247,8 @@ <a href="userstats-bridge-version.svg${userstats_bridge_version_url}">SVG</a>.</p> <hr> -<p><a href="csv/userstats.csv">CSV</a> file containing new user +<p><a href="stats/clients.csv">CSV</a> file containing new user estimates.</p> -<p><a href="csv/monthly-userstats-peak.csv">CSV</a> file containing peak -daily Tor users (direct and bridge) per month by country.</p> -<p><a href="csv/monthly-userstats-average.csv">CSV</a> file containing -average daily Tor users (direct and bridge) per month by country.</p> <br> <hr>