[tor-commits] [metrics-web/master] Apply new design to about page.
karsten at torproject.org
karsten at torproject.org
Mon Jan 9 17:03:42 UTC 2017
commit eb4f603c74131a3dda72ca16d491447a24e83c30
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Tue Dec 20 23:09:11 2016 +0100
Apply new design to about page.
---
.../org/torproject/metrics/web/AboutServlet.java | 9 +-
website/web/WEB-INF/about.jsp | 113 ++++++++++-----------
website/web/WEB-INF/top.jsp | 3 +-
3 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/website/src/org/torproject/metrics/web/AboutServlet.java b/website/src/org/torproject/metrics/web/AboutServlet.java
index 3e377c1..0d9232b 100644
--- a/website/src/org/torproject/metrics/web/AboutServlet.java
+++ b/website/src/org/torproject/metrics/web/AboutServlet.java
@@ -6,19 +6,24 @@ package org.torproject.metrics.web;
import java.io.IOException;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-public class AboutServlet extends HttpServlet {
+public class AboutServlet extends AnyServlet {
private static final long serialVersionUID = 97168997894664L;
@Override
+ public void init() throws ServletException {
+ super.init();
+ }
+
+ @Override
public void doGet(HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
/* Forward the request to the JSP that does all the hard work. */
+ request.setAttribute("categories", this.categories);
request.getRequestDispatcher("WEB-INF/about.jsp").forward(request,
response);
}
diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp
index 3e8a309..ca42fda 100644
--- a/website/web/WEB-INF/about.jsp
+++ b/website/web/WEB-INF/about.jsp
@@ -1,61 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <link href="css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
- <link href="css/bootstrap.min.css" type="text/css" rel="stylesheet">
- <link href="images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-</head>
-<body>
- <div class="center">
- <div class="main-column">
- <h2><a href="/"><img src="images/metrics-logo.png" width="153" height="200" alt="Metrics logo"><img src="images/metrics-wordmark.png" width="384" height="50" alt="Metrics wordmark"></a></h2>
- <br>
-
-<p>"Tor metrics are the ammunition that lets Tor and other security
-advocates argue for a more private and secure Internet from a position
-of data, rather than just dogma or perspective."
-<i>- Bruce Schneier (June 1, 2016)</i></p>
-
- <!-- Navigation start -->
- <a href="index.html">Metrics</a> |
- About |
- <a href="news.html">News</a> |
- <a href="tools.html">Tools</a> |
- <a href="research.html">Research</a>
- <br>
- <br>
- <!-- Navigation end -->
-
-<h1>About</h1>
-
-<p>Tor metrics are updated daily to provide transparency for Tor users, give
-feedback for developers, and measure evidence of network anomalies.</p>
-
-<h2>Philosophy</h2>
-
-<p>We only use public, non-sensitive data for metrics. Each metric goes through
-a rigorous review and discussion process before appearing here. We never publish
-statistics—or aggregate statistics—of sensitive data, such as
-unencrypted contents of traffic.</p>
-
-<h2>Contributing</h2>
-
-<p>Collecting and processing new data won't likely happen without your help! If
-you really want to see something measured here, we would be happy to work with
-you. (Link to Trac wiki page)</p>
-
-<h2>Contact</h2>
-
-<p>If you have any questions, contact us at <a
-href="mailto:metrics-team at lists.torproject.org">metrics-team at lists.torproject.org</a>.</p>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<jsp:include page="top.jsp">
+ <jsp:param name="pageTitle" value="About – Tor Metrics"/>
+ <jsp:param name="navActive" value="About"/>
+</jsp:include>
+
+ <div class="container">
+ <ul class="breadcrumb">
+ <li><a href="index.html">Home</a></li>
+ <li class="active">About</li>
+ </ul>
+ </div>
+
+ <div class="container">
+
+ <h1>About</h1>
+
+ <p>Tor metrics are updated daily to provide transparency for Tor users, give feedback for developers, and measure evidence of network anomalies.</p>
+ </div>
+
+ <div class="container">
+
+ <a name="philosophy" id="anchor-philosophy"></a><br>
+
+ <h2>Philosophy</h2>
+
+ <p>We only use public, non-sensitive data for metrics. Each metric goes through a rigorous review and discussion process before appearing here. We never publish statistics—or aggregate statistics—of sensitive data, such as unencrypted contents of traffic.</p>
+
+ <a name="contributing" id="anchor-contributing"></a><br>
+
+ <h2>Contributing</h2>
+
+ <p>Collecting and processing new data won't likely happen without your help! If you really want to see something measured here, we would be happy to work with you. (Link to Trac wiki page)</p>
+
+ <a name="contact" id="anchor-contact"></a><br>
+
+ <h2>Contact</h2>
+
+ <p>If you have any questions, contact us at <a href="mailto:metrics-team at lists.torproject.org">metrics-team at lists.torproject.org</a>.</p>
+
+ <a name="testimonials" id="anchor-testimonials"></a><br>
+
+ <h2>Testimonials</h2>
+ <blockquote>
+ <p class="mb-0">
+ Metrics are a critical part of any security technology. If you don't know how the technology works in practice, you can't find and fix problems. You can't improve the security. You can't make it work better. This isn't glamorous or sexy work, but it's essential. This is especially true for security and privacy, where our preconceived notions of threats and usage are regularly wrong—and knowing what's really going on is the difference between security and insecurity.<br><br>
+ Tor is doing cutting-edge work in the anonymity space, and Tor metrics are already proven to provide critical information for research and development. It's one of the few open data sets available for how, why, where, and when people use anonymizing technologies.<br><br>
+ Tor's metrics project increases the transparency of Tor's work. This helps users understand how Tor works. With good network metrics, you can look back for indicators and anomalies at the time a privacy issue was reported. You can also extrapolate and look forward to prevent related issues in the future. This helps alleviate users' security concerns, and helps others contribute to security issues in the network and browser.<br><br>
+ Finally, Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective. It's where the real world influences Tor.
+ </p>
+ <footer class="blockquote-footer">Bruce Schneier (June 1, 2016)</footer>
+ </blockquote>
</div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
+
+<jsp:include page="bottom.jsp"/>
diff --git a/website/web/WEB-INF/top.jsp b/website/web/WEB-INF/top.jsp
index 93397f0..3c59560 100644
--- a/website/web/WEB-INF/top.jsp
+++ b/website/web/WEB-INF/top.jsp
@@ -100,8 +100,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c
<a href="index.html"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics" id="metrics-wordmark"></a>
<div>
<p>
- <i>“Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective.”</i><br>
- –Bruce Schneier (June 1, 2016)
+ <i>“Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective.”<br><small>— Bruce Schneier (June 1, 2016)</small></i>
</p>
</div>
<div class="clearfix"></div>
More information about the tor-commits
mailing list