commit 57893aed03d1d3dcb09b1845e5de89fa72cbd04b Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Dec 20 23:27:09 2016 +0100
Apply new design to research page. --- .../torproject/metrics/web/ResearchServlet.java | 9 +- website/web/WEB-INF/research.jsp | 103 +++++++++------------ 2 files changed, 50 insertions(+), 62 deletions(-)
diff --git a/website/src/org/torproject/metrics/web/ResearchServlet.java b/website/src/org/torproject/metrics/web/ResearchServlet.java index ed415b7..e847ebe 100644 --- a/website/src/org/torproject/metrics/web/ResearchServlet.java +++ b/website/src/org/torproject/metrics/web/ResearchServlet.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 ResearchServlet extends HttpServlet { +public class ResearchServlet extends AnyServlet {
private static final long serialVersionUID = 7380914323836427960L;
@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/research.jsp").forward(request, response); } diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index 901c3e1..3ec2e21 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -1,51 +1,32 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<!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> | - <a href="about.html">About</a> | - <a href="news.html">News</a> | - <a href="tools.html">Tools</a> | - Research - <br> - <br> - <!-- Navigation end --> - -<h1>Research</h1> -<br> - -<p>Tor started out as a research project! We encourage research on all things -Tor.</p> - -<p>Look around the papers section below for some ideas on what others have -researched in the past. Contact <some general email list here, torproject?> if -you want to discuss ideas.</p> - -<h2>Feel free to use our data for your research!</h2> - -<p>If you do, please cite https://metrics.torproject.org/ or the following <a -href="http://freehaven.net/anonbib/#wecsr10measuring-tor%22%3Epaper</a>:</p> - -<pre> +<jsp:include page="top.jsp"> + <jsp:param name="pageTitle" value="Research – Tor Metrics"/> + <jsp:param name="navActive" value="Research"/> +</jsp:include> + + <div class="container"> + <ul class="breadcrumb"> + <li><a href="index.html">Home</a></li> + <li class="active">Research</li> + </ul> + </div> + + <div class="container"> + <h1>Research</h1> + <p>Tor started out as a research project! We encourage research on all things Tor.</p> + <p>Look around the papers section below for some ideas on what others have researched in the past. Contact <a href="mailto:#">[some general email list here, torproject?]</a> if you want to discuss ideas.</p> + + </div> + + <div class="container"> + + <a name="use" id="anchor-use"></a> + + <h2>Feel free to use our data for your research!</h2> + + <p>If you do, please cite <a href="https://metrics.torproject.org/" target="_self">https://metrics.torproject.org/</a> or the following <a href="http://freehaven.net/anonbib/#wecsr10measuring-tor" target="_blank">paper</a>:</p> + <p><pre> @inproceedings{wecsr10measuring-tor, title = {A Case Study on Measuring Statistical Data in the {T}or Anonymity Network}, author = {Karsten Loesing and Steven J. Murdoch and Roger Dingledine}, @@ -55,25 +36,27 @@ href="http://freehaven.net/anonbib/#wecsr10measuring-tor%22%3Epaper</a>:</p> location = {Tenerife, Canary Islands, Spain}, publisher = {Springer}, series = {LNCS}, -} -</pre> +}</pre></p> + <p>Thank you for acknowledging this work through a citation.</p> + + </div>
-<p>Thank you for acknowledging this work through a citation.</p> + <div class="container">
-<h2>Want to collect your own data for research?</h2> + <a name="collect" id="anchor-collect"></a> + <h2>Want to collect your own data for research?</h2> + <p>Look at the <a href="sources.html">sources page</a> for services that collect Tor-related data.</p> + + </div>
-<p>Look at the <a href="tools.html">tools pages</a> for services that collect -Tor-related data.</p>
-<h2>Research Papers</h2> + <div class="container">
-<p>Here are some Tor-related papers. (...)</p> + <a name="research" id="anchor-research"></a> + <h2>Research Papers</h2> + <p>Here are some Tor-related papers. (...) If we're missing yours, let us know!</p>
</div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> + +<jsp:include page="bottom.jsp"/>