commit a52850fc04bc3cd1de194691dd9280f78df4bf67 Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Oct 24 16:47:32 2017 +0200

Rename Operation section to Services.

Implements #23716. --- website/src/main/resources/etc/web.xml | 11 +++++ .../src/main/resources/web/WEB-INF/operation.jsp | 51 +++++----------------- website/src/main/resources/web/WEB-INF/top.jsp | 2 +- 3 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/website/src/main/resources/etc/web.xml b/website/src/main/resources/etc/web.xml index 830e8e7..fe7d286 100644 --- a/website/src/main/resources/etc/web.xml +++ b/website/src/main/resources/etc/web.xml @@ -262,6 +262,17 @@ </servlet-mapping>

<servlet> + <servlet-name>ServicesServlet</servlet-name> + <servlet-class> + org.torproject.metrics.web.ServicesServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ServicesServlet</servlet-name> + <url-pattern>/services.html</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>DevelopmentServlet</servlet-name> <servlet-class> org.torproject.metrics.web.DevelopmentServlet diff --git a/website/src/main/resources/web/WEB-INF/operation.jsp b/website/src/main/resources/web/WEB-INF/operation.jsp index 3c83925..b86c891 100644 --- a/website/src/main/resources/web/WEB-INF/operation.jsp +++ b/website/src/main/resources/web/WEB-INF/operation.jsp @@ -5,47 +5,16 @@ <jsp:param name="navActive" value="Operation"/> </jsp:include>

- <div class="container"> - <ul class="breadcrumb"> - <li><a href="/">Home</a></li> - <li class="active">Operation</li> - </ul> - </div> - - <div class="container"> - <h1>Operation <a href="#operation" name="operation" class="anchor">#</a></h1> - <p>You're operating a Tor relay or bridge, or you're affected in some way by somebody else operating one? Here you can learn everything about currently running Tor nodes or even about nodes that have been running in the past.</p> - </div> - - <div class="container"> - <h2>Network archive <a href="#archive" name="archive" class="anchor">#</a></h2> - <p>The following tool lets you browse the network archive for relays running in the past.</p> - <ul> - <li><a href="https://exonerator.torproject.org/" target="_blank">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> - </ul> - </div> - - <div class="container"> - <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> - <p>The following tools let you explore currently running relays and bridges.</p> - <ul> - <li><a href="https://atlas.torproject.org/" target="_blank">Atlas</a> displays data about single relays and bridges in the Tor network.</li> - <li><a href="https://compass.torproject.org/" target="_blank">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> - <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> - <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li> - <li><a href="https://onionview.codeplex.com/" target="_blank">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> - <li><a href="https://onionite.now.sh/" target="_blank">Onionite</a> is a Progressive Web App to view information on the individual nodes that make up the Tor network.</li> - </ul> - </div> - - <div class="container"> - <h2>Network health notifications <a href="#health" name="health" class="anchor">#</a></h2> - <p>The following tools inform you of any problems with relays and bridges.</p> - <ul> - <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health" target="_blank">Consensus Issues</a> emails directory authority operators about consensus problems.</li> - <li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies" target="_blank">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> - </ul> - </div> + <div class="jumbotron"> + <div class="text-center"> + <h2> + Operation + </h2> + <p>This page has moved to <code><a href="https://metrics.torproject.org/services.html">https://metrics.torproject.org/services.html</a></code>.</p> + <p>Please update any bookmarks and report any links to this page.</p> + <p>This placeholder page will be removed in the future.</p> + </div><!-- text-center --> + </div><!-- jumbotron -->

<jsp:include page="bottom.jsp"/>

diff --git a/website/src/main/resources/web/WEB-INF/top.jsp b/website/src/main/resources/web/WEB-INF/top.jsp index e5e95eb..f7a702f 100644 --- a/website/src/main/resources/web/WEB-INF/top.jsp +++ b/website/src/main/resources/web/WEB-INF/top.jsp @@ -88,7 +88,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"><i c <li class="visible-xs section-header">More</li> <li <c:if test="${'News'.equals(param.navActive)}"> class="active"</c:if>><a href="/news.html"><i class="fa fa-newspaper-o fa-fw hidden-sm" aria-hidden="true"></i> News</a></li> <li <c:if test="${'Sources'.equals(param.navActive)}"> class="active"</c:if>><a href="/sources.html"><i class="fa fa-archive fa-fw hidden-sm" aria-hidden="true"></i> Sources</a></li> - <li <c:if test="${'Operation'.equals(param.navActive)}"> class="active"</c:if>><a href="/operation.html"><i class="fa fa-cogs fa-fw hidden-sm" aria-hidden="true"></i> Operation</a></li> + <li <c:if test="${'Services'.equals(param.navActive)}"> class="active"</c:if>><a href="/services.html"><i class="fa fa-cogs fa-fw hidden-sm" aria-hidden="true"></i> Services</a></li> <li <c:if test="${'Development'.equals(param.navActive)}"> class="active"</c:if>><a href="/development.html"><i class="fa fa-code fa-fw hidden-sm" aria-hidden="true"></i> Development</a></li> <li <c:if test="${'Research'.equals(param.navActive)}"> class="active"</c:if>><a href="/research.html"><i class="fa fa-university fa-fw hidden-sm" aria-hidden="true"></i> Research</a></li> <li <c:if test="${'About'.equals(param.navActive)}"> class="active"</c:if>><a href="/about.html"><i class="fa fa-lightbulb-o fa-fw hidden-sm" aria-hidden="true"></i> About</a></li>