[metrics-web/master] Simplify navigation. - tor-commits

26 Jun 2014

commit c854b4c3e49e4dcc9051b1dc7c8397618d6c586a
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Thu Jun 26 14:22:23 2014 +0200
Simplify navigation.
It's not necessary anymore to group pages into graphs, research, and
    formerly status, because it's all about graphs now.  The navigation bar
    and site map on the error page should reflect that.
Old links still work.
---
 website/web/WEB-INF/banner.jsp |   57 +++++++++-------------------------------
 website/web/WEB-INF/error.jsp  |    9 -------
 2 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp
index 3acea7f..0756f7d 100644
--- a/website/web/WEB-INF/banner.jsp
+++ b/website/web/WEB-INF/banner.jsp
@@ -8,51 +8,18 @@
     <% String currentPage = request.getRequestURI(); %>
     <a <% if (currentPage.endsWith("index.jsp")) {
         %>class="current"<%} else {%>href="/index.html"<%}%>>Home</a>
-    <a <% if (currentPage.endsWith("graphs.jsp")) {
-        %>class="current"<%} else {%>href="/graphs.html"<%}%>>Graphs</a>
-    <a <% if (currentPage.endsWith("research.jsp")) {
-        %>class="current"<%} else {%>href="/research.html"<%}%>>Research</a>
-    <%if (currentPage.endsWith("graphs.jsp") ||
-         currentPage.endsWith("network.jsp") ||
-         currentPage.endsWith("bubbles.jsp") ||
-         currentPage.endsWith("users.jsp") ||
-         currentPage.endsWith("performance.jsp")) {
-     %><br>
-      <font size="2">
-        <a <%if (currentPage.endsWith("network.jsp")){
-            %>class="current"<%} else {%>href="/network.html"<%}
-            %>>Network</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>
-        <a <%if (currentPage.endsWith("performance.jsp")) {
-            %>class="current"<%} else {%>href="/performance.html"<%}
-            %>>Performance</a>
-      </font>
-    <%} else if (currentPage.endsWith("research.jsp") ||
-                 currentPage.endsWith("data.jsp") ||
-                 currentPage.endsWith("formats.jsp") ||
-                 currentPage.endsWith("tools.jsp") ||
-                 currentPage.endsWith("stats.jsp")) {
-     %><br>
-      <font size="2">
-        <a <%if (currentPage.endsWith("data.jsp")) {
-            %>class="current"<%} else {%> href="/data.html"<%}
-            %>>Data</a>
-        <a <%if (currentPage.endsWith("formats.jsp")) {
-            %>class="current"<%} else {%> href="/formats.html"<%}
-            %>>Formats</a>
-        <a <%if (currentPage.endsWith("tools.jsp")) {
-            %>class="current"<%} else {%> href="/tools.html"<%}
-            %>>Tools</a>
-        <a <%if (currentPage.endsWith("stats.jsp")) {
-            %>class="current"<%} else {%> href="/stats.html"<%}
-            %>>Statistics</a>
-      </font>
-    <%}%>
+    <a <% if (currentPage.endsWith("network.jsp")) {
+        %>class="current"<%} else {%>href="/network.html"<%}%>>Network</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>
+    <a <% if (currentPage.endsWith("performance.jsp")) {
+        %>class="current"<%} else {%>href="/performance.html"<%}
+        %>>Performance</a>
+    <a <% if (currentPage.endsWith("stats.jsp")) {
+        %>class="current"<%} else {%>href="/stats.html"<%}
+        %>>Statistics</a>
   </td>
   <td class="banner-right"></td>
 </tr>
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index 17ddee3..80ef077 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -41,20 +41,11 @@ when processing your request!</p>
 Maybe you find what you're looking for on our sitemap:
 <ul>
 <li><a href="index.html">Home</a></li>
-<li><a href="graphs.html">Graphs</a>
-<ul>
 <li><a href="network.html">Network</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>
-<li><a href="research.html">Research</a>
-<ul>
-<li><a href="data.html">Data</a></li>
-<li><a href="formats.html">Formats</a></li>
-<li><a href="tools.html">Tools</a></li>
 <li><a href="stats.html">Statistics</a></li>
-</ul></li>
 </ul>
 </p>

    