[or-cvs] [ernie/master] Make minor changes to website.
karsten at torproject.org
karsten at torproject.org
Mon Jul 12 18:04:07 UTC 2010
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon, 12 Jul 2010 20:02:55 +0200
Subject: Make minor changes to website.
Commit: d51f6a681398f08a1861a59c0ba29eada26a6e56
---
.../WEB-INF/templates/graphs_bridge-users.tpl.jsp | 32 ++++++++++----------
.../WEB-INF/templates/graphs_exit-relays.tpl.jsp | 10 +++---
.../WEB-INF/templates/graphs_network-size.tpl.jsp | 8 ++--
jsp/war/WEB-INF/templates/index.tpl.jsp | 8 ++--
jsp/war/WEB-INF/templates/research.tpl.jsp | 4 +-
jsp/war/WEB-INF/templates/research_data.tpl.jsp | 12 +++++++-
src/LoggingConfiguration.java | 2 +-
7 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
index 0c453bd..7511230 100644
--- a/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_bridge-users.tpl.jsp
@@ -9,27 +9,27 @@
graphs display an estimate of Tor users via bridges based on the
unique IP addresses as seen by a few hundred bridges.</p>
<ul>
- <li><a href=\"#bahrain\">Bahrain</a></li>
- <li><a href=\"#china\">China</a></li>
- <li><a href=\"#cuba\">Cuba</a></li>
- <li><a href=\"#ethiopia\">Ethiopia</a></li>
- <li><a href=\"#iran\">Iran</a></li>
- <li><a href=\"#burma\">Burma</a></li>
- <li><a href=\"#saudi\">Saudi</a></li>
- <li><a href=\"#syria\">Syria</a></li>
- <li><a href=\"#tunisia\">Tunisia</a></li>
- <li><a href=\"#turkmenistan\">Turkmenistan</a></li>
- <li><a href=\"#uzbekistan\">Uzbekistan</a></li>
- <li><a href=\"#vietnam\">Vietnam</a></li>
- <li><a href=\"#yemen\">Yemen</a></li>
+ <li><a href="#bahrain">Bahrain</a></li>
+ <li><a href="#china">China</a></li>
+ <li><a href="#cuba">Cuba</a></li>
+ <li><a href="#ethiopia">Ethiopia</a></li>
+ <li><a href="#iran">Iran</a></li>
+ <li><a href="#burma">Burma</a></li>
+ <li><a href="#saudi">Saudi</a></li>
+ <li><a href="#syria">Syria</a></li>
+ <li><a href="#tunisia">Tunisia</a></li>
+ <li><a href="#turkmenistan">Turkmenistan</a></li>
+ <li><a href="#uzbekistan">Uzbekistan</a></li>
+ <li><a href="#vietnam">Vietnam</a></li>
+ <li><a href="#yemen">Yemen</a></li>
</ul>
<ul>
- <li><a href=\"csv/bridge-users.csv\">CSV</a> file containing all
+ <li><a href="csv/bridge-users.csv">CSV</a> file containing all
data.</li>
- <li><a href=\"csv/monthly-users-peak.csv\">CSV</a> file
+ <li><a href="csv/monthly-users-peak.csv">CSV</a> file
containing peak daily Tor users (recurring and bridge) per month
by country.</li>
- <li><a href=\"csv/monthly-users-average.csv\">CSV</a> file
+ <li><a href="csv/monthly-users-average.csv">CSV</a> file
containing average daily Tor users (recurring and bridge) per
month by country.</li>
</ul>
diff --git a/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp
index 75e7283..f433d1e 100644
--- a/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_exit-relays.tpl.jsp
@@ -7,12 +7,12 @@
<p>The number of exit relays in the Tor network can be extracted from
the hourly published network status consensuses.</p>
<ul>
- <li>Past <a href=\"#exit-72h\">72 hours</a> up to
+ <li>Past <a href="#exit-72h">72 hours</a> up to
now</li>
- <li>Past <a href=\"#exit-30d\">30</a>,
- <a href=\"#exit-90d\">90</a>,
- <a href=\"#exit-180d\">180</a> days</li>
- <li><a href=\"#exit-all\">All data</a> up to today</li>
+ <li>Past <a href="#exit-30d">30</a>,
+ <a href="#exit-90d">90</a>,
+ <a href="#exit-180d">180</a> days</li>
+ <li><a href="#exit-all">All data</a> up to today</li>
<%
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
Calendar lastQuarter = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
diff --git a/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp b/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp
index 825bf2e..199fbec 100644
--- a/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/graphs_network-size.tpl.jsp
@@ -8,10 +8,10 @@
extracted from the hourly published network status consensuses
and sanitized bridge statuses.</p>
<ul>
- <li>Past <a href=\"#networksize-30d\">30</a>,
- <a href=\"#networksize-90d\">90</a>,
- <a href=\"#networksize-180d\">180</a> days</li>
- <li><a href=\"#networksize-all\">All data</a> up to today</li>
+ <li>Past <a href="#networksize-30d">30</a>,
+ <a href="#networksize-90d">90</a>,
+ <a href="#networksize-180d">180</a> days</li>
+ <li><a href="#networksize-all">All data</a> up to today</li>
<%
Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
Calendar lastQuarter = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
diff --git a/jsp/war/WEB-INF/templates/index.tpl.jsp b/jsp/war/WEB-INF/templates/index.tpl.jsp
index 22c0211..3449b52 100644
--- a/jsp/war/WEB-INF/templates/index.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/index.tpl.jsp
@@ -12,9 +12,9 @@
<li>Read <a href="papers.html">papers</a> and technical reports
on the measurement techniques and results of statistical
analysis of metrics data</li>
- <li>Download the <a href="/research/data.html">data</a> that is behind the
+ <li>Download the <a href="data.html">data</a> that is behind the
graphs and reports to make your own evaluations</li>
- <li>Try out the <a href="/research/tools.html">tools</a> to parse and
+ <li>Try out the <a href="tools.html">tools</a> to parse and
evaluate the metrics data</li>
</ul>
<br/>
@@ -39,8 +39,8 @@
transition to ggplot2 and will greatly facilitate dynamic graph
generation in the future.</li>
<li>May 26, 2010: The monthly
- <a href="/research/data.html#relaydesc">relay</a> and
- <a href="/research/data.html#bridgedesc">bridge descriptor tarballs</a>
+ <a href="data.html#relaydesc">relay</a> and
+ <a href="data.html#bridgedesc">bridge descriptor tarballs</a>
are now updated every day. Beginning with May 2010, the bridge
descriptor tarballs do not contain country codes anymore,
because it was tough to maintain. If your research requires this
diff --git a/jsp/war/WEB-INF/templates/research.tpl.jsp b/jsp/war/WEB-INF/templates/research.tpl.jsp
index 1e5de20..7cefddc 100644
--- a/jsp/war/WEB-INF/templates/research.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/research.tpl.jsp
@@ -3,8 +3,8 @@
<p>The Tor Metrics Project aims at supporting privacy enhancing
technologies research by making <a href="papers.html">papers</a>
and technical reports, gathered network
- <a href="/research/data.html">data</a>, and
- <a href="/research/tools.html">tools</a>
+ <a href="data.html">data</a>, and
+ <a href="tools.html">tools</a>
for processing these data available to the public. If you are
missing anything for your Tor-related research or want to share
your research results with others, please
diff --git a/jsp/war/WEB-INF/templates/research_data.tpl.jsp b/jsp/war/WEB-INF/templates/research_data.tpl.jsp
index 0632d3e..7262df8 100644
--- a/jsp/war/WEB-INF/templates/research_data.tpl.jsp
+++ b/jsp/war/WEB-INF/templates/research_data.tpl.jsp
@@ -948,6 +948,15 @@
<td><a href="/data/votes-2010-06.tar.bz2">v3 votes</a></td>
<td><a href="/data/consensuses-2010-06.tar.bz2">v3 consensuses</a></td>
</tr>
+ <tr>
+ <td>July 2010</td>
+ <td/>
+ <td/>
+ <td><a href="/data/server-descriptors-2010-07.tar.bz2">server descriptors</a></td>
+ <td><a href="/data/extra-infos-2010-07.tar.bz2">extra-infos</a></td>
+ <td><a href="/data/votes-2010-07.tar.bz2">v3 votes</a></td>
+ <td><a href="/data/consensuses-2010-07.tar.bz2">v3 consensuses</a></td>
+ </tr>
</table>
<br/>
<a id="bridgedesc"/>
@@ -1012,7 +1021,8 @@
<tr><td><a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-04.tar.bz2">April 2010</a>
(<a href="http://archive.torproject.org/tor-metrics-archive/bridge-descriptors-2010-04.tar.bz2.asc">sig</a>)</td></tr>
<tr><td><a href="/data/bridge-descriptors-2010-05.tar.bz2">May 2010</a></td></tr>
- <tr><td><a href="/data/bridge-descriptors-2010-05.tar.bz2">June 2010</a></td></tr>
+ <tr><td><a href="/data/bridge-descriptors-2010-06.tar.bz2">June 2010</a></td></tr>
+ <tr><td><a href="/data/bridge-descriptors-2010-07.tar.bz2">July 2010</a></td></tr>
</table>
<p/>
<br/>
diff --git a/src/LoggingConfiguration.java b/src/LoggingConfiguration.java
index 73e979e..bf322ce 100644
--- a/src/LoggingConfiguration.java
+++ b/src/LoggingConfiguration.java
@@ -120,7 +120,7 @@ public class LoggingConfiguration {
+ " <font size=\"2\">\n"
+ " <a href=\"exonerator.html\">ExoneraTor</a>\n"
+ " <a href=\"consensus-health.html\">Consensus Health</a>\n"
- + " <a class=\"current\">Last log</a>\n"
+ + " <a class=\"current\">Last Log</a>\n"
+ " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
--
1.7.1
More information about the tor-commits
mailing list