[metrics-web/master] Update tops and bottoms of new .jsp. - tor-commits

6 Jul 2017

commit 5d45cf97699a4e521a2e09d63595d6bfab6bb2dd
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Sat Mar 18 21:58:08 2017 +0100
Update tops and bottoms of new .jsp.
---
 .../src/main/resources/web/WEB-INF/collector.jsp   | 128 ++--------------
 website/src/main/resources/web/WEB-INF/onionoo.jsp | 169 ++-------------------
 2 files changed, 27 insertions(+), 270 deletions(-)

diff --git a/website/src/main/resources/web/WEB-INF/collector.jsp b/website/src/main/resources/web/WEB-INF/collector.jsp
index 07d6f99..1cd095b 100644
--- a/website/src/main/resources/web/WEB-INF/collector.jsp
+++ b/website/src/main/resources/web/WEB-INF/collector.jsp
@@ -1,88 +1,18 @@
-<!DOCTYPE html>
-<html lang="en" style="min-height:100%;">
-  <head>
+<%@ 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="Sources &ndash; Tor Metrics"/>
+  <jsp:param name="navActive" value="Sources"/>
+</jsp:include>
-    <title>CollecTor</title>
-
-    <meta charset="utf-8">
-    <link href="images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-
-    <!-- yes, we're handheld friendly :) -->
-    <meta name="HandheldFriendly" content="True">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-
-    <!-- icons for mobile devices -->
-    <link rel="apple-touch-icon" href="images/apple-touch-icon-152x152.png">
-    <link rel="shortcut icon" href="images/android-icon.png" sizes="196x196">
-    <meta name="msapplication-square70x70logo" content="images/smalltile.png">
-    <meta name="msapplication-square150x150logo" content="images/mediumtile.png">
-    <meta name="msapplication-wide310x150logo" content="images/widetile.png">
-    <meta name="msapplication-square310x310logo" content="images/largetile.png">
-
-    <!-- jQuery -->
-    <script src="js/jquery-3.1.1.min.js"></script>
-
-    <!-- Bootstrap -->
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <script src="js/bootstrap.min.js"></script>
-
-    <!-- Fonts -->
-    <link rel="stylesheet" href="css/font-awesome.min.css">
-    <link rel="stylesheet" href="fonts/source-sans-pro.css">
-
-    <!-- custom styles and javascript -->
-    <link rel="stylesheet" href="css/style.css">
-    <script src="js/script.js"></script>
-
-  </head>
-
-<body class="noscript" style="background-image:url(images/ajax-loader.gif);background-repeat:no-repeat;background-position:center center;">
-
-<!-- Using evil inline stylesheets to hide the FOUC for slow connections... -->
-
-<div id="wrapper" style="display:none;">
-
-
-<!-- backToTop-Button and Anchor -->
-<noscript>
-<div class="topButton" style="display:block;"><a href="#top"><i class="fa fa-chevron-up" aria-hidden="true"></i></a></div>
-</noscript>
-<script type="text/javascript">
-document.write('<div class="topButton" style="display:none;"><a href="#top"><i class="fa fa-chevron-up" aria-hidden="true"></i></a></div>');
-</script>
-<a id="top"></a>
-
-
-
-<!-- secondary navigation -->
-<nav class="navbar navbar-default navbar-secondary">
-<div class="container-fluid">
-    <input type="checkbox" id="navbar-toggle-checkbox">
-    <div class="navbar-header">
-      <a class="navbar-brand visible-xs" href="/"><img src="images/collector-wordmark-white.png" width="264" height="50" alt="CollecTor"></a>
+    <div class="container">
+      <ul class="breadcrumb">
+        <li><a href="/">Home</a></li>
+        <li><a href="sources.html">Sources</a></li>
+        <li class="active">CollecTor</li>
+      </ul>
     </div>
-  </div>
-</nav>
-<!-- /secondary navigation -->
-
-
-
-<!-- page header for every single page -->
-<div class="page-header hidden-xs">
-  <a href="/"><img src="images/collector-logo.png" width="143" height="117" alt="" id="collector-logo"></a>
-  <a href="/"><img src="images/collector-wordmark-white.png" width="264" height="50" alt="CollecTor" id="collector-wordmark"></a>
-  <div>
-    <p>
-      <i>Your friendly data-collecting<br>
-      service in the Tor network.</i>
-    </p>
-  </div>
-  <div class="clearfix"></div>
-</div>
-<!-- /page header -->
-
     <div class="container">
       <div class="row">
         <div class="col-xs-12">
@@ -905,36 +835,4 @@ Index files use the following custom JSON data format that might still be extend
</div>
-
-
-  <div class="container-fluid" id="footer">
-
-    <div class="container no-gutter">
-      <div class="col-xs-6">
-        <p>
-           &copy; 2017 The Tor Project
-        </p>
-      </div>
-      <div class="col-xs-6">
-        <p class="pull-right">
-
-           <a href="https://metrics.torproject.org/about.html#contact">Contact</a>
-
-        </p>
-      </div>
-    </div>
-
-    <div class="container small">
-
-        <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. "Tor" and the "Onion Logo" are <a href="https://www.torproject.org/docs/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
-
-    </div>
-
-  </div><!-- /footer -->
-
-
-
-</div><!-- /wrapper -->
-
-</body>
-</html>
+<jsp:include page="bottom.jsp"/>
diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp
index d8fe74a..df1fef0 100644
--- a/website/src/main/resources/web/WEB-INF/onionoo.jsp
+++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp
@@ -1,120 +1,17 @@
-<!DOCTYPE HTML>
-<html lang="en" style="min-height:100%;">
-<head>
-
-  <title>Onionoo</title>
-
-  <meta charset="utf-8">
-  <link href="images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-
-  <!-- yes, we're handheld friendly :) -->
-  <meta name="HandheldFriendly" content="True">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-
-  <!-- icons for mobile devices -->
-  <link rel="apple-touch-icon" href="images/apple-touch-icon-152x152.png">
-  <link rel="shortcut icon" href="images/android-icon.png" sizes="196x196">
-  <meta name="msapplication-square70x70logo" content="images/smalltile.png">
-  <meta name="msapplication-square150x150logo" content="images/mediumtile.png">
-  <meta name="msapplication-wide310x150logo" content="images/widetile.png">
-  <meta name="msapplication-square310x310logo" content="images/largetile.png">
-
-  <!-- jQuery -->
-  <script src="js/jquery-3.1.1.min.js"></script>
-
-  <!-- Bootstrap -->
-  <link rel="stylesheet" href="css/bootstrap.min.css">
-  <script src="js/bootstrap.min.js"></script>
-
-  <!-- Fonts -->
-  <link rel="stylesheet" href="css/font-awesome.min.css">
-  <link rel="stylesheet" href="fonts/source-sans-pro.css">
-
-  <!-- custom styles and javascript -->
-  <link rel="stylesheet" href="css/style.css">
-  <script src="js/script.js"></script>
-
-</head>
-
-<body class="noscript" style="background-image:url(images/ajax-loader.gif);background-repeat:no-repeat;background-position:center center;">
-
-<!-- Using evil inline stylesheets to hide the FOUC for slow connections... -->
-
-<div id="wrapper" style="display:none;">
-
-
-<!-- backToTop-Button and Anchor -->
-<noscript>
-<div class="topButton" style="display:block;"><a href="#top"><i class="fa fa-chevron-up" aria-hidden="true"></i></a></div>
-</noscript>
-<script type="text/javascript">
-document.write('<div class="topButton" style="display:none;"><a href="#top"><i class="fa fa-chevron-up" aria-hidden="true"></i></a></div>');
-</script>
-<a id="top"></a>
-
-
-
-<!-- secondary navigation -->
-<nav class="navbar navbar-default navbar-secondary">
-  <div class="container-fluid visible-xs">
-    <input type="checkbox" id="navbar-toggle-checkbox">
-    <div class="navbar-header">
-      <label for="navbar-toggle-checkbox" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-secondary" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </label>
-      <a class="navbar-brand visible-xs" href="/"><img src="images/onionoo-wordmark-white.png" width="221" height="40" alt="Onionoo"></a>
-    </div>
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-secondary">
-      <ul class="nav navbar-nav navbar-right">
-
-
-        <!-- secondary navigation items -->
-        <li><a href="#general">General</a></li>
-        <li><a href="#versions">Protocol versions</a></li>
-        <li><a href="#methods">Methods</a></li>
-        <li><a href="#responses">Responses</a></li>
-        <li><a href="#summary">Summary documents</a></li>
-        <li><a href="#details">Details documents</a></li>
-        <li><a href="#history">History objects</a></li>
-        <li><a href="#bandwidth">Bandwidth documents</a></li>
-        <li><a href="#weights">Weights documents</a></li>
-        <li><a href="#clients">Clients documents</a></li>
-        <li><a href="#uptime">Uptime documents</a></li>
-        <li><a href="#examples">Example usage</a></li>
-        <!-- /secondary navigation items -->
-
+<%@ 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="Sources &ndash; Tor Metrics"/>
+  <jsp:param name="navActive" value="Sources"/>
+</jsp:include>
+
+    <div class="container">
+      <ul class="breadcrumb">
+        <li><a href="/">Home</a></li>
+        <li><a href="sources.html">Sources</a></li>
+        <li class="active">Onionoo</li>
       </ul>
-    </div><!-- /.navbar-collapse -->
-
-  </div>
-</nav>
-<!-- /secondary navigation -->
-
-
-
-<!-- page header for every single page -->
-<div class="page-header hidden-xs">
-  <a href="/"><img src="images/tor-logo-weiss.png" width="162" height="100" alt="" id="onionoo-logo"></a>
-  <span style="display:inline-block;width:20px;"></span>
-  <a href="/"><img src="images/onionoo-wordmark-white.png" width="221" height="40" alt="Onionoo" id="onionoo-wordmark"></a>
-  <div>
-    <p>
-      <i>The Tor network status protocol providing the<br>
-      data for other applications and websites.</i>
-    </p>
-  </div>
-  <div class="clearfix"></div>
-</div>
-<!-- /page header -->
-
-
-
-
+    </div>
<div class="container">
@@ -2208,42 +2105,4 @@ Please refer to the protocol specification for details.
</div>
-
-
-
-
-
-
-
-  <div class="container-fluid" id="footer">
-
-    <div class="container no-gutter">
-      <div class="col-xs-6">
-        <p>
-           &copy; 2017 The Tor Project
-        </p>
-      </div>
-      <div class="col-xs-6">
-        <p class="pull-right">
-
-           <a href="https://metrics.torproject.org/about.html#contact">Contact</a>
-
-        </p>
-      </div>
-    </div>
-
-    <div class="container small">
-
-        <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. "Tor" and the "Onion Logo" are <a href="https://www.torproject.org/docs/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.</p>
-
-    </div>
-
-  </div><!-- /footer -->
-
-
-
-</div><!-- /wrapper -->
-
-</body>
-</html>
-
+<jsp:include page="bottom.jsp"/>

    