Commit 2daa7fd4 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Add Lunar's bubble graphs to navigation bar.

parent 4d38c655

etc/web.xml

+11 −0
Original line number Diff line number Diff line
@@ -55,6 +55,17 @@ 
    <url-pattern>/performance.html</url-pattern>

  </servlet-mapping>



  <servlet>

    <servlet-name>Bubbles</servlet-name>

    <servlet-class>

      org.torproject.ernie.web.graphs.BubblesServlet

    </servlet-class>

  </servlet>

  <servlet-mapping>

    <servlet-name>Bubbles</servlet-name>

    <url-pattern>/bubbles.html</url-pattern>

  </servlet-mapping>



  <servlet>

    <servlet-name>Research</servlet-name>

    <servlet-class>

src/org/torproject/ernie/web/graphs/BubblesServlet.java

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright 2013 The Tor Project

 * See LICENSE for licensing information */

package org.torproject.ernie.web.graphs;



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 BubblesServlet extends HttpServlet {



  private static final long serialVersionUID = -6011833075497881033L;



  public void doGet(HttpServletRequest request,

      HttpServletResponse response) throws IOException, ServletException {



    /* Forward the request to the JSP that does all the hard work. */

    request.getRequestDispatcher("WEB-INF/bubbles.jsp").forward(request,

        response);

  }

}

web/WEB-INF/banner.jsp

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
        %>class="current"<%} else {%>href="/status.html"<%}%>>Status</a>

    <%if (currentPage.endsWith("graphs.jsp") ||

         currentPage.endsWith("network.jsp") ||

         currentPage.endsWith("bubbles.jsp") ||

         currentPage.endsWith("fast-exits.jsp") ||

         currentPage.endsWith("users.jsp") ||

         currentPage.endsWith("performance.jsp")) {
@@ -27,6 +28,9 @@ 
        <a <%if (currentPage.endsWith("fast-exits.jsp")){

            %>class="current"<%} else {%>href="/fast-exits.html"<%}

            %>>Fast Exits</a>

        <a <%if (currentPage.endsWith("bubbles.jsp")){

            %>class="current"<%} else {%>href="/bubbles.html"<%}

            %>>Bubbles</a>

        <a <%if (currentPage.endsWith("users.jsp")) {

            %>class="current"<%} else {%>href="/users.html"<%}

            %>>Users</a>

web/WEB-INF/error.jsp

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ Maybe you find what you're looking for on our sitemap: 
<ul>

<li><a href="network.html">Network</a></li>

<li><a href="fast-exits.html">Fast Exits</a></li>

<li><a href="bubbles.html">Bubbles</a></li>

<li><a href="users.html">Users</a></li>

<li><a href="performance.html">Performance</a></li>

</ul></li>