[or-cvs] [ernie/master] Add second navigation level to Graphs and Tools pages.
karsten at torproject.org
karsten at torproject.org
Wed May 19 21:10:27 UTC 2010
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Wed, 19 May 2010 23:07:13 +0200
Subject: Add second navigation level to Graphs and Tools pages.
Commit: 9204fce079c76c1fcea585a22a9a99980dc7baa2
---
src/ConsensusHealthChecker.java | 6 ++++++
src/LoggingConfiguration.java | 7 ++++++-
.../ernie/web/BridgeUsersGraphsServlet.java | 11 ++++++++++-
.../ernie/web/ConsensusGraphsServlet.java | 12 ++++++++++--
.../ernie/web/NewUsersGraphsServlet.java | 11 ++++++++++-
.../ernie/web/RecurringUsersGraphsServlet.java | 12 ++++++++++--
website/ernie-howto.html | 8 +++++++-
website/gettor-graphs.html | 11 ++++++++++-
website/graphs.html | 9 +++++++++
website/tools.html | 6 ++++++
website/torperf-graphs.html | 11 ++++++++++-
11 files changed, 94 insertions(+), 10 deletions(-)
diff --git a/src/ConsensusHealthChecker.java b/src/ConsensusHealthChecker.java
index 4bccddc..dd88611 100644
--- a/src/ConsensusHealthChecker.java
+++ b/src/ConsensusHealthChecker.java
@@ -336,6 +336,12 @@ public class ConsensusHealthChecker {
+ " <a href=\"papers.html\">Papers</a>\n"
+ " <a href=\"data.html\">Data</a>\n"
+ " <a href=\"tools.html\">Tools</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 href=\"consensus-health.html\">Consensus health</a>\n"
+ + " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
+ " </tr>\n"
diff --git a/src/LoggingConfiguration.java b/src/LoggingConfiguration.java
index c29d5e3..17ec918 100644
--- a/src/LoggingConfiguration.java
+++ b/src/LoggingConfiguration.java
@@ -114,10 +114,15 @@ public class LoggingConfiguration {
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
+ " <a href=\"graphs.html\">Graphs</a>\n"
- + " <a href=\"reports.html\">Reports</a>\n"
+ " <a href=\"papers.html\">Papers</a>\n"
+ " <a href=\"data.html\">Data</a>\n"
+ " <a href=\"tools.html\">Tools</a>\n"
+ + " <br/>\n"
+ + " <font size=\"2\">\n"
+ + " <a href=\"ernie-howto.html\">ERNIE Howto</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"
+ " </tr>\n"
diff --git a/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java b/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
index c8c0d45..14d84b3 100644
--- a/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
+++ b/src/org/torproject/ernie/web/BridgeUsersGraphsServlet.java
@@ -27,10 +27,19 @@ public class BridgeUsersGraphsServlet extends HttpServlet {
+ " <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\" height=\"79\"></a></td>\n"
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
- + " <a class=\"current\">Graphs</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"
+ + " <br/>\n"
+ + " <font size=\"2\">\n"
+ + " <a href=\"consensus-graphs.html\">Network size</a>\n"
+ + " <a href=\"new-users-graphs.html\">New users</a>\n"
+ + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
+ + " <a class=\"current\">Bridge users</a>\n"
+ + " <a href=\"torperf-graphs.html\">torperf</a>\n"
+ + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
+ + " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
+ " </tr>\n"
diff --git a/src/org/torproject/ernie/web/ConsensusGraphsServlet.java b/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
index 28721d5..2ca802d 100644
--- a/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
+++ b/src/org/torproject/ernie/web/ConsensusGraphsServlet.java
@@ -27,11 +27,19 @@ public class ConsensusGraphsServlet extends HttpServlet {
+ " <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\" height=\"79\"></a></td>\n"
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
- + " <a class=\"current\">Graphs</a>\n"
- + " <a href=\"reports.html\">Reports</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"
+ + " <br/>\n"
+ + " <font size=\"2\">\n"
+ + " <a class=\"current\">Network size</a>\n"
+ + " <a href=\"new-users-graphs.html\">New users</a>\n"
+ + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
+ + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
+ + " <a href=\"torperf-graphs.html\">torperf</a>\n"
+ + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
+ + " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
+ " </tr>\n"
diff --git a/src/org/torproject/ernie/web/NewUsersGraphsServlet.java b/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
index 293a3bf..b1cc015 100644
--- a/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
+++ b/src/org/torproject/ernie/web/NewUsersGraphsServlet.java
@@ -27,10 +27,19 @@ public class NewUsersGraphsServlet extends HttpServlet {
+ " <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\" height=\"79\"></a></td>\n"
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
- + " <a class=\"current\">Graphs</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"
+ + " <br/>\n"
+ + " <font size=\"2\">\n"
+ + " <a href=\"consensus-graphs.html\">Network size</a>\n"
+ + " <a class=\"current\">New users</a>\n"
+ + " <a href=\"recurring-users-graphs.html\">Recurring users</a>\n"
+ + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
+ + " <a href=\"torperf-graphs.html\">torperf</a>\n"
+ + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
+ + " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
+ " </tr>\n"
diff --git a/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java b/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
index afdfb75..4b1b30d 100644
--- a/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
+++ b/src/org/torproject/ernie/web/RecurringUsersGraphsServlet.java
@@ -27,11 +27,19 @@ public class RecurringUsersGraphsServlet extends HttpServlet {
+ " <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\" height=\"79\"></a></td>\n"
+ " <td class=\"banner-middle\">\n"
+ " <a href=\"/\">Home</a>\n"
- + " <a class=\"current\">Graphs</a>\n"
- + " <a href=\"reports.html\">Reports</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"
+ + " <br/>\n"
+ + " <font size=\"2\">\n"
+ + " <a href=\"consensus-graphs.html\">Network size</a>\n"
+ + " <a href=\"new-users-graphs.html\">New users</a>\n"
+ + " <a class=\"current\">Recurring users</a>\n"
+ + " <a href=\"bridge-users-graphs.html\">Bridge users</a>\n"
+ + " <a href=\"torperf-graphs.html\">torperf</a>\n"
+ + " <a href=\"gettor-graphs.html\">GetTor</a>\n"
+ + " </font>\n"
+ " </td>\n"
+ " <td class=\"banner-right\"></td>\n"
+ " </tr>\n"
diff --git a/website/ernie-howto.html b/website/ernie-howto.html
index cb0a357..8097a1d 100644
--- a/website/ernie-howto.html
+++ b/website/ernie-howto.html
@@ -16,7 +16,13 @@
<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="tools.html">Tools</a>
+ <br/>
+ <font size="2">
+ <a class="current">ERNIE Howto</a>
+ <a href="log.html">Last log</a>
+ <a href="consensus-health.html">Consensus health</a>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/gettor-graphs.html b/website/gettor-graphs.html
index 9de3fd6..166eb06 100644
--- a/website/gettor-graphs.html
+++ b/website/gettor-graphs.html
@@ -13,10 +13,19 @@
<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" height="79"></a></td>
<td class="banner-middle">
<a href="/">Home</a>
- <a class="current">Graphs</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>
+ <br/>
+ <font size="2">
+ <a href="consensus-graphs.html">Network size</a>
+ <a href="new-users-graphs.html">New users</a>
+ <a href="recurring-users-graphs.html">Recurring users</a>
+ <a href="bridge-users-graphs.html">Bridge users</a>
+ <a href="torperf-graphs.html">torperf</a>
+ <a class="current">GetTor</a>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/graphs.html b/website/graphs.html
index ebe212b..4c57b88 100644
--- a/website/graphs.html
+++ b/website/graphs.html
@@ -17,6 +17,15 @@
<a href="papers.html">Papers</a>
<a href="data.html">Data</a>
<a href="tools.html">Tools</a>
+ <br/>
+ <font size="2">
+ <a href="consensus-graphs.html">Network size</a>
+ <a href="new-users-graphs.html">New users</a>
+ <a href="recurring-users-graphs.html">Recurring users</a>
+ <a href="bridge-users-graphs.html">Bridge users</a>
+ <a href="torperf-graphs.html">torperf</a>
+ <a href="gettor-graphs.html">GetTor</a>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/tools.html b/website/tools.html
index 1400dee..c26e210 100644
--- a/website/tools.html
+++ b/website/tools.html
@@ -17,6 +17,12 @@
<a href="papers.html">Papers</a>
<a href="data.html">Data</a>
<a class="current">Tools</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>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
diff --git a/website/torperf-graphs.html b/website/torperf-graphs.html
index cbfa845..adf8918 100644
--- a/website/torperf-graphs.html
+++ b/website/torperf-graphs.html
@@ -13,10 +13,19 @@
<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" height="79"></a></td>
<td class="banner-middle">
<a href="/">Home</a>
- <a class="current">Graphs</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>
+ <br/>
+ <font size="2">
+ <a href="consensus-graphs.html">Network size</a>
+ <a href="new-users-graphs.html">New users</a>
+ <a href="recurring-users-graphs.html">Recurring users</a>
+ <a href="bridge-users-graphs.html">Bridge users</a>
+ <a class="current">torperf</a>
+ <a href="gettor-graphs.html">GetTor</a>
+ </font>
</td>
<td class="banner-right"></td>
</tr>
--
1.6.5
More information about the tor-commits
mailing list