[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [ernie/master 3/3] Reorganize navigation by adding Research and Status pages.
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Tue, 8 Jun 2010 11:32:36 +0200
Subject: Reorganize navigation by adding Research and Status pages.
Commit: 0d6e09d7b8ca64e41d1f396990c479b30c727714
---
src/ConsensusHealthChecker.java | 11 ++--
src/LoggingConfiguration.java | 9 ++--
.../ernie/web/BridgeUsersGraphsServlet.java | 5 +-
.../ernie/web/ConsensusGraphsServlet.java | 5 +-
.../torproject/ernie/web/ExoneraTorServlet.java | 13 +++++-
.../ernie/web/NewUsersGraphsServlet.java | 5 +-
.../ernie/web/RecurringUsersGraphsServlet.java | 5 +-
website/data.html | 11 +++-
website/gettor-graphs.html | 5 +-
website/graphs.html | 5 +-
website/index.html | 5 +-
website/papers.html | 11 +++-
website/research.html | 47 +++++++++++++++++++
website/status.html | 49 ++++++++++++++++++++
website/tools.html | 11 ++--
website/torperf-graphs.html | 5 +-
16 files changed, 154 insertions(+), 48 deletions(-)
create mode 100644 website/research.html
create mode 100644 website/status.html
diff --git a/src/ConsensusHealthChecker.java b/src/ConsensusHealthChecker.java
index 5badebd..cf23e6a 100644
--- a/src/ConsensusHealthChecker.java
+++ b/src/ConsensusHealthChecker.java
@@ -333,14 +333,13 @@ public class ConsensusHealthChecker {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"papers.html\">Papers</a>\n"
- + " <a href=\"data.html\">Data</a>\n"
- + " <a href=\"tools.html\">Tools</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ " <br/>\n"
+ " <font size=\"2\">\n"
- + " <a href=\"ernie-howto.html\">ERNIE Howto</a>\n"
- + " <a href=\"log.html\">Last log</a>\n"
- + " <a class=\"current\">Consensus health</a>\n"
+ + " <a href=\"exonerator.html\">ExoneraTor</a>\n"
+ + " <a class=\"current\">Consensus Health</a>\n"
+ + " <a href=\"log.html\">Last Log</a>\n"
+ " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
diff --git a/src/LoggingConfiguration.java b/src/LoggingConfiguration.java
index 17ec918..73e979e 100644
--- a/src/LoggingConfiguration.java
+++ b/src/LoggingConfiguration.java
@@ -114,14 +114,13 @@ public class LoggingConfiguration {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"papers.html\">Papers</a>\n"
- + " <a href=\"data.html\">Data</a>\n"
- + " <a href=\"tools.html\">Tools</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ " <br/>\n"
+ " <font size=\"2\">\n"
- + " <a href=\"ernie-howto.html\">ERNIE Howto</a>\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 href=\"consensus-health.html\">Consensus health</a>\n"
+ " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
diff --git a/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java b/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
index a201555..8eaf50b 100644
--- a/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
+++ b/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
@@ -28,9 +28,8 @@ public class BridgeUsersGraphsServlet extends HttpServlet {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"papers.html\">Papers</a>\n"
- + " <a href=\"data.html\">Data</a>\n"
- + " <a href=\"tools.html\">Tools</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ " <br/>\n"
+ " <font size=\"2\">\n"
+ " <a href=\"consensus-graphs.html\">Network size</a>\n"
diff --git a/src/org/torproject/ernie/web/ConsensusGraphsServlet.java b/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
index 2ca802d..9b7948a 100644
--- a/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
+++ b/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
@@ -28,9 +28,8 @@ public class ConsensusGraphsServlet extends HttpServlet {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"papers.html\">Papers</a>\n"
- + " <a href=\"data.html\">Data</a>\n"
- + " <a href=\"tools.html\">Tools</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ " <br/>\n"
+ " <font size=\"2\">\n"
+ " <a class=\"current\">Network size</a>\n"
diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java
index 394d5ce..a98677f 100644
--- a/src/org/torproject/ernie/web/ExoneraTorServlet.java
+++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java
@@ -38,7 +38,18 @@ public class ExoneraTorServlet extends HttpServlet {
+ "src=\"http://www.torproject.org/images/top-left.png\"; "
+ "alt=\"Click to go to home page\" width=\"193\" "
+ "height=\"79\"></a></td>\n"
- + " <td class=\"banner-middle\"></td>\n"
+ + " <td class=\"banner-middle\">\n"
+ + " <a href=\"/\">Home</a>\n"
+ + " <a href=\"graphs.html\">Graphs</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ + " <br/>\n"
+ + " <font size=\"2\">\n"
+ + " <a class=\"current\">ExoneraTor</a>\n"
+ + " <a href=\"consensus-health.html\">Consensus Health</a>\n"
+ + " <a href=\"log.html\">Last Log</a>\n"
+ + " </font>\n"
+ + " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
+ " </tr>\n"
+ " </table>\n"
diff --git a/src/org/torproject/ernie/web/NewUsersGraphsServlet.java b/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
index b1cc015..c284d8a 100644
--- a/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
+++ b/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
@@ -28,9 +28,8 @@ public class NewUsersGraphsServlet extends HttpServlet {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"papers.html\">Papers</a>\n"
- + " <a href=\"data.html\">Data</a>\n"
- + " <a href=\"tools.html\">Tools</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ " <br/>\n"
+ " <font size=\"2\">\n"
+ " <a href=\"consensus-graphs.html\">Network size</a>\n"
diff --git a/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java b/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
index a75aec3..e609f0d 100644
--- a/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
+++ b/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
@@ -28,9 +28,8 @@ public class RecurringUsersGraphsServlet extends HttpServlet {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"papers.html\">Papers</a>\n"
- + " <a href=\"data.html\">Data</a>\n"
- + " <a href=\"tools.html\">Tools</a>\n"
+ + " <a href=\"research.html\">Research</a>\n"
+ + " <a href=\"status.html\">Status</a>\n"
+ " <br/>\n"
+ " <font size=\"2\">\n"
+ " <a href=\"consensus-graphs.html\">Network size</a>\n"
diff --git a/website/data.html b/website/data.html
index 83da03f..0247c91 100644
--- a/website/data.html
+++ b/website/data.html
@@ -14,9 +14,14 @@
<td class="banner-middle">
<a href="/">Home</a>
<a href="graphs.html">Graphs</a>
- <a href="papers.html">Papers</a>
- <a class="current">Data</a>
- <a href="tools.html">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
+ <br/>
+ <font size="2">
+ <a href="papers.html">Papers</a>
+ <a class="current">Data</a>
+ <a href="tools.html">Tools</a>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/gettor-graphs.html b/website/gettor-graphs.html
index 166eb06..9882ec1 100644
--- a/website/gettor-graphs.html
+++ b/website/gettor-graphs.html
@@ -14,9 +14,8 @@
<td class="banner-middle">
<a href="/">Home</a>
<a href="graphs.html">Graphs</a>
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
<br/>
<font size="2">
<a href="consensus-graphs.html">Network size</a>
diff --git a/website/graphs.html b/website/graphs.html
index 430ca70..2a479e1 100644
--- a/website/graphs.html
+++ b/website/graphs.html
@@ -14,9 +14,8 @@
<td class="banner-middle">
<a href="/">Home</a>
<a class="current">Graphs</a>
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
<br/>
<font size="2">
<a href="consensus-graphs.html">Network size</a>
diff --git a/website/index.html b/website/index.html
index fa75dbe..113ea84 100644
--- a/website/index.html
+++ b/website/index.html
@@ -14,9 +14,8 @@
<td class="banner-middle">
<a class="current">Home</a>
<a href="graphs.html">Graphs</a>
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/papers.html b/website/papers.html
index 0ecb089..27a560f 100644
--- a/website/papers.html
+++ b/website/papers.html
@@ -14,9 +14,14 @@
<td class="banner-middle">
<a href="/">Home</a>
<a href="graphs.html">Graphs</a>
- <a class="current">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
+ <br/>
+ <font size="2">
+ <a class="current">Papers</a>
+ <a href="data.html">Data</a>
+ <a href="tools.html">Tools</a>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/research.html b/website/research.html
new file mode 100644
index 0000000..11ffc72
--- /dev/null
+++ b/website/research.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+ <head>
+ <title>Tor Metrics Portal: Research</title>
+ <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+ <link href="http://www.torproject.org/stylesheet-ltr.css"; type=text/css rel=stylesheet>
+ <link href="http://www.torproject.org/favicon.ico"; type=image/x-icon rel="shortcut icon">
+ </head>
+ <body>
+ <div class="center">
+ <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
+ <tr>
+ <td class="banner-left"><a href="https://www.torproject.org/";><img src="http://www.torproject.org/images/top-left.png"; alt="Click to go to home page" width="193" heigth="79"></a></td>
+ <td class="banner-middle">
+ <a href="/">Home</a>
+ <a href="graphs.html">Graphs</a>
+ <a class="current">Research</a>
+ <a href="status.html">Status</a>
+ <br/>
+ <font size="2">
+ <a href="papers.html">Papers</a>
+ <a href="data.html">Data</a>
+ <a href="tools.html">Tools</a>
+ </font>
+ </td>
+ <td class="banner-right"></td>
+ </tr>
+ </table>
+ <div class="main-column">
+ <h2>Tor Metrics Portal: Research</h2>
+ <br/>
+ <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="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
+ <a href="mailto:tor-assistants@xxxxxxxxxxxxx";>let us know</a>!
+ </div>
+ </div>
+ <div class="bottom" id="bottom">
+ <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en";>registered trademarks</a> of The Tor Project, Inc.</p>
+ </div>
+ </body>
+</html>
+
diff --git a/website/status.html b/website/status.html
new file mode 100644
index 0000000..3288e41
--- /dev/null
+++ b/website/status.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+ <head>
+ <title>Tor Metrics Portal: Status</title>
+ <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+ <link href="http://www.torproject.org/stylesheet-ltr.css"; type=text/css rel=stylesheet>
+ <link href="http://www.torproject.org/favicon.ico"; type=image/x-icon rel="shortcut icon">
+ </head>
+ <body>
+ <div class="center">
+ <table class="banner" border="0" cellpadding="0" cellspacing="0" summary="">
+ <tr>
+ <td class="banner-left"><a href="https://www.torproject.org/";><img src="http://www.torproject.org/images/top-left.png"; alt="Click to go to home page" width="193" heigth="79"></a></td>
+ <td class="banner-middle">
+ <a href="/">Home</a>
+ <a href="graphs.html">Graphs</a>
+ <a href="research.html">Research</a>
+ <a class="current">Status</a>
+ <br/>
+ <font size="2">
+ <a href="exonerator.html">ExoneraTor</a>
+ <a href="consensus-health.html">Consensus Health</a>
+ <a href="log.html">Last Log</a>
+ </font>
+ </td>
+ <td class="banner-right"></td>
+ </tr>
+ </table>
+ <div class="main-column">
+ <h2>Tor Metrics Portal: Status</h2>
+ <br/>
+ <p>The network data collected by the Tor Metrics Project can be
+ used to analyze the Tor network status from a few years ago until
+ an hour ago. There are currently two applications for this data:
+ The <a href="exonerator.html">ExoneraTor</a> tells you whether
+ some IP address was a Tor relay at a given time, and the
+ <a href="consensus-health.html">Consensus Health</a> summarizes
+ information about the latest network consensus voting process.
+ The <a href="log.html">Last Log</a> of the metrics portal software
+ execution also falls under this category to evaluate how recent
+ and complete the presented data are.
+ </div>
+ </div>
+ <div class="bottom" id="bottom">
+ <p>"Tor" and the "Onion Logo" are <a href="https://www.torproject.org/trademark-faq.html.en";>registered trademarks</a> of The Tor Project, Inc.</p>
+ </div>
+ </body>
+</html>
+
diff --git a/website/tools.html b/website/tools.html
index c2706e7..8584b4f 100644
--- a/website/tools.html
+++ b/website/tools.html
@@ -14,14 +14,13 @@
<td class="banner-middle">
<a href="/">Home</a>
<a href="graphs.html">Graphs</a>
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a class="current">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
<br/>
<font size="2">
- <a href="ernie-howto.html">ERNIE Howto</a>
- <a href="log.html">Last log</a>
- <a href="consensus-health.html">Consensus health</a>
+ <a href="papers.html">Papers</a>
+ <a href="data.html">Data</a>
+ <a class="current">Tools</a>
</font>
</td>
<td class="banner-right"></td>
diff --git a/website/torperf-graphs.html b/website/torperf-graphs.html
index c4c4a5e..8ff3827 100644
--- a/website/torperf-graphs.html
+++ b/website/torperf-graphs.html
@@ -14,9 +14,8 @@
<td class="banner-middle">
<a href="/">Home</a>
<a href="graphs.html">Graphs</a>
- <a href="papers.html">Papers</a>
- <a href="data.html">Data</a>
- <a href="tools.html">Tools</a>
+ <a href="research.html">Research</a>
+ <a href="status.html">Status</a>
<br/>
<font size="2">
<a href="consensus-graphs.html">Network size</a>
--
1.6.5