[or-cvs] [metrics-db/master] Add relay search page to navigation.

[karsten at torproject.org]

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Wed, 1 Sep 2010 11:32:02 +0200
Subject: Add relay search page to navigation.
Commit: 3546dfb1998097ba2789bc8a9fb40f46506a4da5

---
 .../ernie/db/ConsensusHealthChecker.java           |   17 +++++++++++++++++
 .../torproject/ernie/db/LoggingConfiguration.java  |   18 ++++++++++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/src/org/torproject/ernie/db/ConsensusHealthChecker.java b/src/org/torproject/ernie/db/ConsensusHealthChecker.java
index 2c6a47d..18a8f71 100644
--- a/src/org/torproject/ernie/db/ConsensusHealthChecker.java
+++ b/src/org/torproject/ernie/db/ConsensusHealthChecker.java
@@ -405,6 +405,7 @@ public class ConsensusHealthChecker {
           + "            <br/>\n"
           + "            <font size=\"2\">\n"
           + "              <a href=\"exonerator.html\">ExoneraTor</a>\n"
+          + "              <a href=\"relaysearch.html\">Relay Search</a>\n"
           + "              <a class=\"current\">Consensus Health</a>\n"
           + "              <a href=\"log.html\">Last Log</a>\n"
           + "            </font>\n"
@@ -825,11 +826,26 @@ public class ConsensusHealthChecker {
       bw.write("      </div>\n"
           + "    </div>\n"
           + "    <div class=\"bottom\" id=\"bottom\">\n"
+          + "      <p>This material is supported in part by the "
+            + "National Science Foundation under Grant No. "
+            + "CNS-0959138. Any opinions, finding, and conclusions "
+            + "or recommendations expressed in this material are "
+            + "those of the author(s) and do not necessarily reflect "
+            + "the views of the National Science Foundation.</p>\n"
           + "      <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>\n"
+          + "      <p>Data on this site is freely available under a "
+            + "<a href=\"http://creativecommons.org/publicdomain/"
+            + "zero/1.0/\">CC0 no copyright declaration</a>: To the "
+            + "extent possible under law, the Tor Project has waived "
+            + "all copyright and related or neighboring rights in "
+            + "the data. Graphs are licensed under a <a "
+            + "href=\"http://creativecommons.org/licenses/by/3.0/"
+            + "us/\">Creative Commons Attribution 3.0 United States "
+            + "License</a>.</p>\n"
           + "    </div>\n"
           + "  </body>\n"
           + "</html>");
@@ -839,3 +855,4 @@ public class ConsensusHealthChecker {
     }
   }
 }
+
diff --git a/src/org/torproject/ernie/db/LoggingConfiguration.java b/src/org/torproject/ernie/db/LoggingConfiguration.java
index deb34de..a71d9fd 100644
--- a/src/org/torproject/ernie/db/LoggingConfiguration.java
+++ b/src/org/torproject/ernie/db/LoggingConfiguration.java
@@ -123,6 +123,7 @@ public class LoggingConfiguration {
               + "            <br/>\n"
               + "            <font size=\"2\">\n"
               + "              <a href=\"exonerator.html\">ExoneraTor</a>\n"
+              + "              <a href=\"relaysearch.html\">Relay Search</a>\n"
               + "              <a href=\"consensus-health.html\">Consensus Health</a>\n"
               + "              <a class=\"current\">Last Log</a>\n"
               + "            </font>\n"
@@ -180,11 +181,28 @@ public class LoggingConfiguration {
               + "      </div>\n"
               + "    </div>\n"
               + "    <div class=\"bottom\" id=\"bottom\">\n"
+
+
+              + "      <p>This material is supported in part by the "
+                + "National Science Foundation under Grant No. "
+                + "CNS-0959138. Any opinions, finding, and conclusions "
+                + "or recommendations expressed in this material are "
+                + "those of the author(s) and do not necessarily reflect "
+                + "the views of the National Science Foundation.</p>\n"
               + "      <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>\n"
+              + "      <p>Data on this site is freely available under a "
+                + "<a href=\"http://creativecommons.org/publicdomain/"
+                + "zero/1.0/\">CC0 no copyright declaration</a>: To the "
+                + "extent possible under law, the Tor Project has waived "
+                + "all copyright and related or neighboring rights in "
+                + "the data. Graphs are licensed under a <a "
+                + "href=\"http://creativecommons.org/licenses/by/3.0/"
+                + "us/\">Creative Commons Attribution 3.0 United States "
+                + "License</a>.</p>\n"
               + "    </div>\n"
               + "  </body>\n"
               + "</html>");
-- 
1.7.1