commit 8e964c0cffb0fac94ce846019eb05cf9649e6174 Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Nov 25 15:00:55 2014 +0100
Remove category pages, move links to start page. --- website/web/WEB-INF/banner.jsp | 12 --------- website/web/WEB-INF/index.jsp | 56 ++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp index 07c09b2..3127b26 100644 --- a/website/web/WEB-INF/banner.jsp +++ b/website/web/WEB-INF/banner.jsp @@ -8,18 +8,6 @@ <% String currentPage = request.getRequestURI(); %> <a <% if (currentPage.endsWith("index.jsp")) { %>class="current"<%} else {%>href="/index.html"<%}%>>Home</a> - <a <% if (currentPage.endsWith("network.jsp")) { - %>class="current"<%} else {%>href="/network.html"<%}%>>Servers</a> - <a <% if (currentPage.endsWith("bandwidth.jsp")) { - %>class="current"<%} else {%>href="/bandwidth.html"<%}%>>Bandwidth</a> - <a <% if (currentPage.endsWith("bubbles.jsp")) { - %>class="current"<%} else {%>href="/bubbles.html"<%} - %>>Diversity</a> - <a <% if (currentPage.endsWith("users.jsp")) { - %>class="current"<%} else {%>href="/users.html"<%}%>>Users</a> - <a <% if (currentPage.endsWith("performance.jsp")) { - %>class="current"<%} else {%>href="/performance.html"<%} - %>>Performance</a> <a <% if (currentPage.endsWith("about.jsp")) { %>class="current"<%} else {%>href="/about.html"<%}%>>About</a> </td> diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index c0e3c15..bc9148d 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -19,29 +19,69 @@ <p><small>*And if you come across something that is missing here, please let us know.</small></p>
- <a href="network.html"><h3>Servers</h3></a> + <h3>Servers</h3> <p>How many relays and bridges are in the network? How many of them permit exiting?</p> +<ul> +<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li> +<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li> +<li><a href="versions.html">Graph: Relays by version</a></li> +<li><a href="platforms.html">Graph: Relays by platform</a></li> +<li><a href="cloudbridges.html">Graph: Tor Cloud bridges</a></li> +<li><a href="servers-data.html">Data: Number of relays and bridges</a></li> +</ul>
- <a href="bandwidth.html"><h3>Bandwidth</h3></a> + <h3>Bandwidth</h3> <p>How much bandwidth do relays advertise? And how much of that is actually consumed?</p>
- <a href="bubbles.html"><h3>Diversity</h3></a> +<ul> +<li><a href="bandwidth.html">Graph: Total relay bandwidth in the network</a></li> +<li><a href="bwhist-flags.html">Graph: Relay bandwidth by Exit and/or Guard flags</a></li> +<li><a href="bandwidth-flags.html">Graph: Advertised bandwidth and bandwidth history by relay flags</a></li> +<li><a href="dirbytes.html">Graph: Number of bytes spent on answering directory requests</a></li> +<li><a href="advbwdist-perc.html">Graph: Advertised bandwidth distribution</a></li> +<li><a href="advbwdist-relay.html">Graph: Advertised bandwidth of n-th fastest relays</a></li> +<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li> +<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li> +</ul> + + <h3>Diversity</h3> <p>How diverse is the network? In which countries are relays located?</p>
- <a href="users.html"><h3>Users</h3></a> +<ul> +<li><a href="bubbles.html">Graph: Network bubble graphs</a></li> +</ul> + + <h3>Users</h3> <p>Where do users come from? What transports and IP versions are they using?</p>
- <a href="performance.html"><h3>Performance</h3></a> +<ul> +<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li> +<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li> +<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li> +<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li> +<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li> +<li><a href="userstats-bridge-transport.html">Graph: Bridge users by transport</a></li> +<li><a href="userstats-bridge-version.html">Graph: Bridge users by IP version</a></li> +<li><a href="oxford-anonymous-internet.html">Link: Tor users as percentage of larger Internet population</a></li> +<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li> +</ul> + + <h3>Performance</h3> <p>How long does it take to download a megabyte of data over Tor? How about five?</p>
- <a href="about.html"><h3>About</h3></a> - <p>How do you obtain all these facts in an anonymity network - without hurting user privacy?</p> +<ul> +<li><a href="torperf.html">Graph: Time to download files over Tor</a></li> +<li><a href="torperf-failures.html">Graph: Timeouts and failures of downloading files over Tor</a></li> +<li><a href="connbidirect.html">Graph: Fraction of connections used uni-/bidirectionally</a></li> +<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li> +<li><a href="connbidirect-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> +</ul> + </div> </div> <div class="bottom" id="bottom">