[or-cvs] [metrics-web/master 1/2] Add complete footer to ExoneraTor page.

[karsten@xxxxxxxxxxxxxx]

Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Wed, 1 Sep 2010 10:59:40 +0200
Subject: Add complete footer to ExoneraTor page.
Commit: 587528ed7f7ab770b5e640a432172183255f1735

---
 .../torproject/ernie/web/ExoneraTorServlet.java    |   15 +++++++++++++++
 war/WEB-INF/templates/footer.tpl.jsp               |    2 +-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java
index a98677f..2fe07c8 100644
--- a/src/org/torproject/ernie/web/ExoneraTorServlet.java
+++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java
@@ -83,9 +83,24 @@ public class ExoneraTorServlet extends HttpServlet {
         + "      </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>");
diff --git a/war/WEB-INF/templates/footer.tpl.jsp b/war/WEB-INF/templates/footer.tpl.jsp
index 34be7a9..abd7740 100644
--- a/war/WEB-INF/templates/footer.tpl.jsp
+++ b/war/WEB-INF/templates/footer.tpl.jsp
@@ -10,4 +10,4 @@
       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>. 
+      Commons Attribution 3.0 United States License</a>.</p>
-- 
1.7.1